summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/README6
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin571052 -> 571833 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx90
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.ins8
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg6
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty23
8 files changed, 59 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/README b/Master/texmf-dist/doc/latex/siunitx/README
index ff3caf89b03..4f35f3d0659 100644
--- a/Master/texmf-dist/doc/latex/siunitx/README
+++ b/Master/texmf-dist/doc/latex/siunitx/README
@@ -5,7 +5,6 @@ E-mail: joseph.wright@morningstar2.co.uk
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
-
Physical quantities have both numbers and units, and each
physical quantity should be expressed as the product of a number
and a unit. Typesetting physical quantities requires care to
@@ -14,7 +13,6 @@ combination is clear. In particular, the SI units system lays
down a consistent set of units with rules on how these are to be
used. However, different countries and publishers have differing
conventions on the exact appearance of numbers (and units).
-
The siunitx package provides a set of tools for authors to
typeset quantities in a consistent way. The package has
an extended set of configuration options which make it possible
@@ -22,10 +20,8 @@ to follow varying typographic conventions with the same input
syntax. The package includes automated processing of numbers
and units, and the ability to control tabular alignment of
numbers.
-
Installation
------------
-
The package is supplied in dtx format and as a pre-extracted zip
file, siunitx.tds.zip. The later is most convenient for most
users: simply unzip this in your local texmf directory and run
@@ -33,7 +29,6 @@ texhash to update the database of file locations. If you want to
unpack the dtx yourself, running "tex siunitx.dtx" will extract
the package whereas "latex siunitx.dtx" will extract it and also
typeset the documentation.
-
The package requires LaTeX3 support as provided in the l3kernel
and l3packages bundles. Both of these are available on CTAN
(http://www.ctan.org/) as ready-to-install zip files. Suitable
@@ -41,7 +36,6 @@ versions are available in MiKTeX 2.9 and TeX Live 2011
(updating the relevant packages online may be necessary).
LaTeX3, and so siunitx, requires the e-TeX extensions: these
are available on all modern TeX systems.
-
Typesetting the documentation requires a number of packages in
addition to those needed to use the package. This is mainly
because of the number of demonstration items included in the
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index d5ac7171775..ec8714bd8fe 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 440bbecc291..13544b01d9d 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -10,7 +10,6 @@ E-mail: joseph.wright@morningstar2.co.uk
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
-
Physical quantities have both numbers and units, and each
physical quantity should be expressed as the product of a number
and a unit. Typesetting physical quantities requires care to
@@ -19,7 +18,6 @@ combination is clear. In particular, the SI units system lays
down a consistent set of units with rules on how these are to be
used. However, different countries and publishers have differing
conventions on the exact appearance of numbers (and units).
-
The siunitx package provides a set of tools for authors to
typeset quantities in a consistent way. The package has
an extended set of configuration options which make it possible
@@ -27,10 +25,8 @@ to follow varying typographic conventions with the same input
syntax. The package includes automated processing of numbers
and units, and the ability to control tabular alignment of
numbers.
-
Installation
------------
-
The package is supplied in dtx format and as a pre-extracted zip
file, siunitx.tds.zip. The later is most convenient for most
users: simply unzip this in your local texmf directory and run
@@ -38,7 +34,6 @@ texhash to update the database of file locations. If you want to
unpack the dtx yourself, running "tex siunitx.dtx" will extract
the package whereas "latex siunitx.dtx" will extract it and also
typeset the documentation.
-
The package requires LaTeX3 support as provided in the l3kernel
and l3packages bundles. Both of these are available on CTAN
(http://www.ctan.org/) as ready-to-install zip files. Suitable
@@ -46,7 +41,6 @@ versions are available in MiKTeX 2.9 and TeX Live 2011
(updating the relevant packages online may be necessary).
LaTeX3, and so siunitx, requires the e-TeX extensions: these
are available on all modern TeX systems.
-
Typesetting the documentation requires a number of packages in
addition to those needed to use the package. This is mainly
because of the number of demonstration items included in the
@@ -86,21 +80,17 @@ E-mail: joseph.wright@morningstar2.co.uk
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
---------------------------------------------------------------
-
\endpreamble
\postamble
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
@@ -376,7 +366,7 @@ This work consists of the file siunitx.dtx
%^^A It is achieved by temporarily disabling \@latex@warning@no@line
%\let\latex@addmarginpar\@addmarginpar
%\let\latex@warning@no@line\@latex@warning@no@line
-%\def\@addmarginpar{^^A
+%\def\@addmarginpar{^^A
% \let\@latex@warning@no@line\@gobble
% \latex@addmarginpar
% \let\@latex@warning@no@line\latex@warning@no@line
@@ -547,7 +537,10 @@ This work consists of the file siunitx.dtx
% characters}
%\changes{v2.4a}{2011/12/04}{Use a more cautious approach to changing
% settings at the start of the document}
-%\changes{v2.4b}{2011/12/04}{Erroneous doubled \texttt{\#} corrected}
+%\changes{v2.4b}{2011/12/06}{Erroneous doubled \texttt{\#} corrected}
+%\changes{v2.4c}{2011/12/09}{Erroneous check for text mode sanserif font fixed}
+%\changes{v2.4d}{2011/12/09}{Fix for edge-case user commands in captions
+% where the command clashes with a unit name}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -2619,7 +2612,7 @@ This work consists of the file siunitx.dtx
% \DescribeNamedUnit{gigaelectronvolt}{GeV} \\
% \DescribeNamedUnit{teraelectronvolt}{TeV} \\
% \DescribeNamedUnit{kilowatt hour}{kWh} \\
-%
+%
% \midrule
%
% \DescribeNamedUnit{farad}{F} \\
@@ -2629,7 +2622,7 @@ This work consists of the file siunitx.dtx
% \midrule
%
% \DescribeNamedUnit{kelvin}{K} \\
-%
+%
% \midrule
%
% \DescribeNamedUnit{decibel}{dB} \\
@@ -2644,7 +2637,7 @@ This work consists of the file siunitx.dtx
% normally given prefixes which use powers of two, rather than the
% powers of ten used by the SI prefixes. As these binary prefixes are
% closely related to the SI prefixes, they are defined by \pkg{siunitx}
-% but do have to be loaded using \opt{binary-units = true} (or
+% but do have to be loaded using \opt{binary-units = true} (or
% simply \opt{binary-units})
% (\cref{tab:unit:binary}). The units \cs{bit} and \cs{byte} are
% then also available.
@@ -3820,10 +3813,10 @@ This work consists of the file siunitx.dtx
% Notice that these names capitalise the unit name (to make reading
% the macro name easier!).\footnote{The function
% \cs{SIUnitSymbolAngstrom} uses the name without accents.}
-%
+%
% \changes{v2.4a}{2011/12/04}{Use UTF-8 symbols with \XeTeX{} and \LuaTeX{}
% if \pkg{fontspec} is loaded}
-% When using \XeTeX{} or \LuaTeX{}, if \pkg{fontspec} is loaded these options
+% When using \XeTeX{} or \LuaTeX{}, if \pkg{fontspec} is loaded these options
% are redefined to use UTF-8 characters directly.
%
%\subsection{Other options}
@@ -3870,7 +3863,7 @@ This work consists of the file siunitx.dtx
% As units are always declared, overwriting any existing definition,
% units may safely be created in the configuration file even when also
% included in individual \LaTeX{} document headers.
-%
+%
% Installing a local configuration file on your system is very much like doing
% a local installation of a package. The exact method depends on the \TeX{}
% system in use. For advice on this, a good start is the
@@ -4057,7 +4050,7 @@ This work consists of the file siunitx.dtx
%\end{LaTeXdemo}
%
% \subsection{A left-aligned column visually centred under a heading}
-%
+%
% When you have a column of non-related numbers, the usual advice is to
% make these left-aligned and then centre the resulting column under the
% heading. With the \pkg{dcolumn} package, that would be done with
@@ -4639,9 +4632,9 @@ This work consists of the file siunitx.dtx
% as this manual, where the text and math mode numerals are (deliberately)
% different. To restore the previous behaviour, set
% \opt{literal-superscript-as-power = false}.
-%
+%
% \subsection{Upgrading from version 2.3}
-%
+%
% The number of options which assume that the input is given in math mode
% has been significantly reduced. As most material can be typeset in either
% math or text mode, the \enquote{intrinsic} math mode options could lead to
@@ -4997,7 +4990,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2011/12/06} {2.4b}
+\ProvidesExplPackage {siunitx} {2011/12/09} {2.4d}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -6085,9 +6078,9 @@ This work consists of the file siunitx.dtx
}
}
\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
@@ -6098,9 +6091,9 @@ This work consists of the file siunitx.dtx
\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 } }
}
}
@@ -6286,11 +6279,11 @@ This work consists of the file siunitx.dtx
}
}
\cs_set_eq:NN \l_peek_search_token \siunitx_print_text_super:n
- \cs_set:Npn \peek_true:w
- {
- \tex_afterassignment:D \peek_true_aux:w
+ \cs_set:Npn \peek_true:w
+ {
+ \tex_afterassignment:D \peek_true_aux:w
\cs_set_eq:NN \peek_tmp:w
- }
+ }
\cs_set:Npn \peek_true_aux:w { \siunitx_print_text_sub_super:n }
\cs_set:Npn \peek_false:w { \ensuremath { @ { \text {#1} } } }
\peek_after:Nw \peek_execute_branches_meaning:
@@ -7470,7 +7463,6 @@ This work consists of the file siunitx.dtx
\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
@@ -8292,7 +8284,7 @@ This work consists of the file siunitx.dtx
{ \int_eval:n { \l_siunitx_tmpb_tl + 1 } }
\bool_if:NF \l_siunitx_round_half_up_bool
{
- \int_compare:nNnT
+ \int_compare:nNnT
{ 0 \tl_tail:V \l_siunitx_tmpa_tl } = \c_zero
{
\int_if_odd:nT \l_siunitx_tmpb_tl
@@ -8301,7 +8293,7 @@ This work consists of the file siunitx.dtx
{ \int_eval:n { \l_siunitx_tmpb_tl - 1 } }
}
}
- }
+ }
}
{ \tl_set:Nn \l_siunitx_tmpb_tl { 1 } }
\prop_put:NnV \l_siunitx_number_in_prop
@@ -8451,7 +8443,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
% The logic here has to deal with the (simpler) rounding up method and the
% case where there is a need to check for rounding to an even number. The
-% later is only required when the discarded part is exactly equal to
+% later is only required when the discarded part is exactly equal to
% half of the least-significant digit. So there is a somewhat complex check
% for that, along with a somewhat simpler check when carrying out the
% rounding.
@@ -9036,14 +9028,14 @@ This work consists of the file siunitx.dtx
}
\prop_get:NVNTF \l_siunitx_prefix_reverse_prop \l_siunitx_tmpa_tl
\l_siunitx_tmpb_tl
- {
+ {
\prop_del:Nn \l_siunitx_number_in_prop { exponent }
\use:c
{
siunitx_ \exp_after:wN \token_to_str:N \l_siunitx_tmpb_tl
_function:w
}
- \siunitx_unit_format:
+ \siunitx_unit_format:
}
{
\msg_error:nnx { siunitx } { non-convertible-exponent }
@@ -12743,7 +12735,7 @@ This work consists of the file siunitx.dtx
\int_compare:nNnTF { \tl_length:n {#1} } = \c_two
{ \siunitx_list_numbers_aux:nn #1 }
{ \siunitx_combined_output:n {#1} }
- }
+ }
\tl_put_right:NV \l_siunitx_list_tl \l_siunitx_list_separator_final_tl
\tl_put_right:NV \l_siunitx_list_tl \l_siunitx_list_current_tl
}
@@ -12922,8 +12914,8 @@ This work consists of the file siunitx.dtx
10 \exp_not:N \PrintSuperscript
{ \int_use:N \l_siunitx_process_fixed_int }
}
- \siunitx_print:nV { number } \l_siunitx_tmpa_tl
- }
+ \siunitx_print:nV { number } \l_siunitx_tmpa_tl
+ }
}
% \end{macrocode}
% \end{macro}
@@ -13856,7 +13848,7 @@ This work consists of the file siunitx.dtx
\siunitx_table_column_end:n { \l_siunitx_table_text_align_skip }
}
{
- \siunitx_table_column_begin:n { \l_siunitx_table_number_align_skip }
+ \siunitx_table_column_begin:n { \l_siunitx_table_number_align_skip }
\siunitx_detect_font:
\bool_if:NTF \l_siunitx_table_parse_only_bool
{ \siunitx_table_print_S_no_alignment: }
@@ -15012,7 +15004,7 @@ This work consists of the file siunitx.dtx
{ \text { \AA } }
{ \tex_char:D \c_siunitx_angstrom_int }
\siunitx_option_unchanged:Nnn \l_siunitx_celsius_math_tl
- { { } ^ { \circ } \kern - \scriptspace \text { C } }
+ { { } ^ { \circ } \kern - \scriptspace \text { C } }
{ \tex_char:D \c_siunitx_celsius_int }
\siunitx_option_unchanged:Nnn \l_siunitx_degree_math_tl
{ { } ^ { \circ } }
@@ -15029,7 +15021,7 @@ This work consists of the file siunitx.dtx
\siunitx_option_unchanged:Nnn \l_siunitx_celsius_text_tl
{
\ensuremath
- { { } ^ { \circ } \kern - \scriptspace \text { C } }
+ { { } ^ { \circ } \kern - \scriptspace \text { C } }
}
{ \tex_char:D \c_siunitx_celsius_int }
\siunitx_option_unchanged:Nnn \l_siunitx_degree_text_tl
@@ -15516,7 +15508,13 @@ This work consists of the file siunitx.dtx
}
}
\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
+ }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -16181,7 +16179,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/12/06} {2.4b}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/12/09} {2.4d}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -17126,7 +17124,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/12/06} {2.4b}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/12/09} {2.4d}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17308,7 +17306,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2011/12/06} {2.4b}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/12/09} {2.4d}
{siunitx: Binary units}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
index a57f66aca5a..3233c86a4f1 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
@@ -12,7 +12,6 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
\input docstrip.tex
\keepsilent
\askforoverwritefalse
@@ -24,21 +23,17 @@ E-mail: joseph.wright@morningstar2.co.uk
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
---------------------------------------------------------------
-
\endpreamble
\postamble
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
@@ -58,16 +53,13 @@ This work consists of the file siunitx.dtx
\endbatchfile
%% 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
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
index 3ca6ae1d2a6..2ea47d1d4f0 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
@@ -12,8 +12,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/12/06} {2.4b}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/12/09} {2.4d}
{siunitx: Abbreviated units}
\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
@@ -104,16 +103,13 @@
\DeclareSIUnit \ms { \milli \second }
%% 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
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
index 90778a62cd3..57c2dd8e92f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
@@ -12,8 +12,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
-\ProvidesExplFile {siunitx-binary.cfg} {2011/12/06} {2.4b}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/12/09} {2.4d}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
@@ -27,16 +26,13 @@
\DeclareSIUnit \byte { B }
%% 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
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
index 923c9e21d4c..195ace64f18 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
@@ -12,8 +12,7 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/12/06} {2.4b}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/12/09} {2.4d}
{siunitx: Version 1 settings}
\keys_define:nn { siunitx } {
addsign .choice: ,
@@ -732,16 +731,13 @@
{ \keys_set:nn { siunitx } { version-1-compatibility } }
%% 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
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