summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/README77
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin579750 -> 579882 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx166
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg82
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty2
7 files changed, 159 insertions, 172 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/README b/Master/texmf-dist/doc/latex/siunitx/README
index 6b3f63d3343..3ac953fd4ce 100644
--- a/Master/texmf-dist/doc/latex/siunitx/README
+++ b/Master/texmf-dist/doc/latex/siunitx/README
@@ -1,44 +1,37 @@
-----------------------------------------------------------------
-The siunitx package --- A comprehensive (SI) units package
-Maintained by Joseph Wright
-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
-----------------------------------------------------------------
+siunitx - A comprehensive (SI) units package
+==============================================
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
ensure that the combined mathematical meaning of the number-unit
-combination is clear. In particular, the SI units system lays
+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
-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.
+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 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
-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 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 . 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
-versions are available in MiKTeX 2.9 and TeX Live 2012
+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 versions are available in MiKTeX 2.9 and TeX Live 2012
(updating the relevant packages online may be necessary).
-LaTeX3, and so siunitx, requires the e-TeX extensions: these
+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
@@ -46,17 +39,17 @@ addition to those needed to use the package. This is mainly
because of the number of demonstration items included in the
text. To compile the documentation without error, you will
need the packages:
- - amsmath
- - booktabs
- - cancel
- - caption
- - cleveref
- - colortbl
- - csquotes
- - datatool
- - helvet
- - mathpazo
- - multirow
- - listings
- - pgfplots
- - xcolor
+ - `amsmath`
+ - `booktabs`
+ - `cancel`
+ - `caption`
+ - `cleveref`
+ - `colortbl`
+ - `csquotes`
+ - `datatool`
+ - `helvet`
+ - `mathpazo`
+ - `multirow`
+ - `listings`
+ - `pgfplots`
+ - `xcolor`
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index e9d7c4c1d0b..c03ddd2ec9f 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 afdbc7fe043..5d8d1412181 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -3,47 +3,40 @@
\iffalse
%</internal>
%<*readme>
-----------------------------------------------------------------
-The siunitx package --- A comprehensive (SI) units package
-Maintained by Joseph Wright
-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
-----------------------------------------------------------------
+siunitx - A comprehensive (SI) units package
+==============================================
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
ensure that the combined mathematical meaning of the number-unit
-combination is clear. In particular, the SI units system lays
+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
-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.
+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 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
-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 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 . 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
-versions are available in MiKTeX 2.9 and TeX Live 2012
+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 versions are available in MiKTeX 2.9 and TeX Live 2012
(updating the relevant packages online may be necessary).
-LaTeX3, and so siunitx, requires the e-TeX extensions: these
+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
@@ -51,20 +44,20 @@ addition to those needed to use the package. This is mainly
because of the number of demonstration items included in the
text. To compile the documentation without error, you will
need the packages:
- - amsmath
- - booktabs
- - cancel
- - caption
- - cleveref
- - colortbl
- - csquotes
- - datatool
- - helvet
- - mathpazo
- - multirow
- - listings
- - pgfplots
- - xcolor
+ - `amsmath`
+ - `booktabs`
+ - `cancel`
+ - `caption`
+ - `cleveref`
+ - `colortbl`
+ - `csquotes`
+ - `datatool`
+ - `helvet`
+ - `mathpazo`
+ - `multirow`
+ - `listings`
+ - `pgfplots`
+ - `xcolor`
%</readme>
%<*internal>
\fi
@@ -613,6 +606,7 @@ This work consists of the file siunitx.dtx
% standard hyphen}
%\changes{v2.5q}{2013/03/10}{Reorder internals to allow for binary units
% in tables}
+%\changes{v2.5r}{2013/07/11}{Update internals to track \pkg{expl3} changes}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -5123,7 +5117,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2013/03/11} {2.5q}
+\ProvidesExplPackage {siunitx} {2013/07/11} {2.5r}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -16550,7 +16544,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2013/03/11} {2.5q}
+\ProvidesExplFile {siunitx-version-1.cfg} {2013/07/11} {2.5r}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -16764,8 +16758,8 @@ This work consists of the file siunitx.dtx
mathminute .meta:n = { math-arcminute = #1 },
mathmu .meta:n = { math-micro = #1 },
mathringA .meta:n = { math-angstrom = #1 },
- mathrm .meta:x =
- { math-rm = \exp_not:c {#1} },
+ mathrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-rm = \exp_not:c {#1} } } },
mathsOmega .meta:n = { math-ohm = #1 },
mathscelsius .meta:n = { math-celsius = #1 },
mathsdegree .meta:n = { math-degree = #1 },
@@ -16775,15 +16769,15 @@ This work consists of the file siunitx.dtx
mathsminute .meta:n = { math-arcminute = #1 },
mathsmu .meta:n = { math-micro = #1 },
mathsringA .meta:n = { math-angstrom = #1 },
- mathsrm .meta:x =
- { math-rm = \exp_not:c {#1} },
+ mathsrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-rm= \exp_not:c {#1} } } },
mathssecond .meta:n = { math-arcsecond = #1 },
- mathssf .meta:x =
- { math-sf = \exp_not:c {#1} },
- mathstt .meta:x =
- { math-tt = \exp_not:c {#1} },
- mathtt .meta:x =
- { math-tt = \exp_not:c {#1} },
+ mathssf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-sf = \exp_not:c {#1} } } },
+ mathstt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-tt = \exp_not:c {#1} } } },
+ mathtt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-tt = \exp_not:c {#1} } } },
negcolor .meta:n = { negative-color = #1 },
negcolour .meta:n = { negative-color = #1 },
noload .code:n = ,
@@ -17019,13 +17013,13 @@ This work consists of the file siunitx.dtx
textmode .default:n = { true },
textmu .meta:n = { text-micro = #1 },
textringA .meta:n = { text-angstrom = #1 },
- textrm .meta:x =
- { text-rm = \exp_not:c {#1} },
+ textrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { text-rm = \exp_not:c {#1} } } },
textsecond .meta:n = { text-arcsecond = #1 },
- textsf .meta:x =
- { text-sf = \exp_not:c {#1} },
- texttt .meta:x =
- { text-tt = \exp_not:c {#1} },
+ textsf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { text-sf = \exp_not:c {#1} } } },
+ texttt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { text-tt = \exp_not:c {#1} } } },
tightpm .meta:n = { tight-spacing = #1 },
tightpm .default:n = { true },
tophrase .meta:n = { range-phrase = #1 },
@@ -17045,18 +17039,18 @@ This work consists of the file siunitx.dtx
trapambigrange .default:n = { true },
unitcolor .meta:n = { unit-color = #1 },
unitcolour .meta:n = { unit-color = #1 },
- unitmathrm .meta:x =
- { unit-math-rm = \exp_not:c {#1} },
- unitmathsf .meta:x =
- { unit-math-sf = \exp_not:c {#1} },
- unitmathsrm .meta:x =
- { unit-math-rm = \exp_not:c {#1} },
- unitmathssf .meta:x =
- { unit-math-sf = \exp_not:c {#1} },
- unitmathstt .meta:x =
- { unit-math-tt = \exp_not:c {#1} },
- unitmathtt .meta:x =
- { unit-math-tt = \exp_not:c {#1} },
+ unitmathrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-rm = \exp_not:c {#1} } } },
+ unitmathsf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-sf = \exp_not:c {#1} } } },
+ unitmathsrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-rm = \exp_not:c {#1} } } },
+ unitmathssf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-sf = \exp_not:c {#1} } } },
+ unitmathstt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-tt = \exp_not:c {#1} } } },
+ unitmathtt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-tt = \exp_not:c {#1} } } },
unitmode .meta:n = { unit-mode = #1 },
unitsep .choice: ,
unitsep /
@@ -17109,18 +17103,18 @@ This work consists of the file siunitx.dtx
unknown .meta:n = { inter-unit-product = \ensuremath {#1} },
valuecolor .meta:n = { number-color = #1 },
valuecolour .meta:n = { number-color = #1 },
- valuemathrm .meta:x =
- { number-math-rm = \exp_not:c {#1} },
- valuemathsf .meta:x =
- { number-math-sf = \exp_not:c {#1} },
- valuemathsrm .meta:x =
- { number-math-rm = \exp_not:c {#1} },
- valuemathssf .meta:x =
- { number-math-sf = \exp_not:c {#1} },
- valuemathstt .meta:x =
- { number-math-tt = \exp_not:c {#1} },
- valuemathtt .meta:x =
- { number-math-tt = \exp_not:c {#1} },
+ valuemathrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-rm = \exp_not:c {#1} } } },
+ valuemathsf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-sf = \exp_not:c {#1} } } },
+ valuemathsrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-rm = \exp_not:c {#1} } } },
+ valuemathssf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-sf = \exp_not:c {#1} } } },
+ valuemathstt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-tt = \exp_not:c {#1} } } },
+ valuemathtt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-tt = \exp_not:c {#1} } } },
valuemode .meta:n = { number-mode = #1 },
valuesep .choice: ,
valuesep /
@@ -17495,7 +17489,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/03/11} {2.5q}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/07/11} {2.5r}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17677,7 +17671,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2013/03/11} {2.5q}
+\ProvidesExplFile {siunitx-binary.cfg} {2013/07/11} {2.5r}
{siunitx: Binary units}
% \end{macrocode}
%
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 ac817958a77..d0df03363f9 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/03/11} {2.5q}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/07/11} {2.5r}
{siunitx: Abbreviated units}
\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
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 11f85bd1a5e..08e73b97cbd 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-binary.cfg} {2013/03/11} {2.5q}
+\ProvidesExplFile {siunitx-binary.cfg} {2013/07/11} {2.5r}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
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 f6cc25df5d1..b3dbbb3ec65 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
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-version-1.cfg} {2013/03/11} {2.5q}
+\ProvidesExplFile {siunitx-version-1.cfg} {2013/07/11} {2.5r}
{siunitx: Version 1 settings}
\keys_define:nn { siunitx } {
addsign .choice: ,
@@ -220,8 +220,8 @@
mathminute .meta:n = { math-arcminute = #1 },
mathmu .meta:n = { math-micro = #1 },
mathringA .meta:n = { math-angstrom = #1 },
- mathrm .meta:x =
- { math-rm = \exp_not:c {#1} },
+ mathrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-rm = \exp_not:c {#1} } } },
mathsOmega .meta:n = { math-ohm = #1 },
mathscelsius .meta:n = { math-celsius = #1 },
mathsdegree .meta:n = { math-degree = #1 },
@@ -231,15 +231,15 @@
mathsminute .meta:n = { math-arcminute = #1 },
mathsmu .meta:n = { math-micro = #1 },
mathsringA .meta:n = { math-angstrom = #1 },
- mathsrm .meta:x =
- { math-rm = \exp_not:c {#1} },
+ mathsrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-rm= \exp_not:c {#1} } } },
mathssecond .meta:n = { math-arcsecond = #1 },
- mathssf .meta:x =
- { math-sf = \exp_not:c {#1} },
- mathstt .meta:x =
- { math-tt = \exp_not:c {#1} },
- mathtt .meta:x =
- { math-tt = \exp_not:c {#1} },
+ mathssf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-sf = \exp_not:c {#1} } } },
+ mathstt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-tt = \exp_not:c {#1} } } },
+ mathtt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { math-tt = \exp_not:c {#1} } } },
negcolor .meta:n = { negative-color = #1 },
negcolour .meta:n = { negative-color = #1 },
noload .code:n = ,
@@ -475,13 +475,13 @@
textmode .default:n = { true },
textmu .meta:n = { text-micro = #1 },
textringA .meta:n = { text-angstrom = #1 },
- textrm .meta:x =
- { text-rm = \exp_not:c {#1} },
+ textrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { text-rm = \exp_not:c {#1} } } },
textsecond .meta:n = { text-arcsecond = #1 },
- textsf .meta:x =
- { text-sf = \exp_not:c {#1} },
- texttt .meta:x =
- { text-tt = \exp_not:c {#1} },
+ textsf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { text-sf = \exp_not:c {#1} } } },
+ texttt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { text-tt = \exp_not:c {#1} } } },
tightpm .meta:n = { tight-spacing = #1 },
tightpm .default:n = { true },
tophrase .meta:n = { range-phrase = #1 },
@@ -501,18 +501,18 @@
trapambigrange .default:n = { true },
unitcolor .meta:n = { unit-color = #1 },
unitcolour .meta:n = { unit-color = #1 },
- unitmathrm .meta:x =
- { unit-math-rm = \exp_not:c {#1} },
- unitmathsf .meta:x =
- { unit-math-sf = \exp_not:c {#1} },
- unitmathsrm .meta:x =
- { unit-math-rm = \exp_not:c {#1} },
- unitmathssf .meta:x =
- { unit-math-sf = \exp_not:c {#1} },
- unitmathstt .meta:x =
- { unit-math-tt = \exp_not:c {#1} },
- unitmathtt .meta:x =
- { unit-math-tt = \exp_not:c {#1} },
+ unitmathrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-rm = \exp_not:c {#1} } } },
+ unitmathsf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-sf = \exp_not:c {#1} } } },
+ unitmathsrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-rm = \exp_not:c {#1} } } },
+ unitmathssf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-sf = \exp_not:c {#1} } } },
+ unitmathstt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-tt = \exp_not:c {#1} } } },
+ unitmathtt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { unit-math-tt = \exp_not:c {#1} } } },
unitmode .meta:n = { unit-mode = #1 },
unitsep .choice: ,
unitsep /
@@ -565,18 +565,18 @@
unknown .meta:n = { inter-unit-product = \ensuremath {#1} },
valuecolor .meta:n = { number-color = #1 },
valuecolour .meta:n = { number-color = #1 },
- valuemathrm .meta:x =
- { number-math-rm = \exp_not:c {#1} },
- valuemathsf .meta:x =
- { number-math-sf = \exp_not:c {#1} },
- valuemathsrm .meta:x =
- { number-math-rm = \exp_not:c {#1} },
- valuemathssf .meta:x =
- { number-math-sf = \exp_not:c {#1} },
- valuemathstt .meta:x =
- { number-math-tt = \exp_not:c {#1} },
- valuemathtt .meta:x =
- { number-math-tt = \exp_not:c {#1} },
+ valuemathrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-rm = \exp_not:c {#1} } } },
+ valuemathsf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-sf = \exp_not:c {#1} } } },
+ valuemathsrm .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-rm = \exp_not:c {#1} } } },
+ valuemathssf .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-sf = \exp_not:c {#1} } } },
+ valuemathstt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-tt = \exp_not:c {#1} } } },
+ valuemathtt .code:n =
+ { \use:x { \keys_set:nn { siunitx } { number-math-tt = \exp_not:c {#1} } } },
valuemode .meta:n = { number-mode = #1 },
valuesep .choice: ,
valuesep /
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index e66935d8d4f..8f4df716d18 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} {2013/03/11} {2.5q}
+\ProvidesExplPackage {siunitx} {2013/07/11} {2.5r}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2012/11/21 }
{ }