siunitx (31jul13)

git-svn-id: svn://tug.org/texlive/trunk@31333 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 13 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index c03ddd2ec9f..3d2df09da55 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 5d8d1412181..13b425c4aa3 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -607,6 +607,7 @@ This work consists of the file  siunitx.dtx
 %\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}
+%\changes{v2.5s}{2013/07/31}{Update internals to track \pkg{expl3} changes}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -5117,7 +5118,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2013/07/11} {2.5r}
+\ProvidesExplPackage {siunitx} {2013/07/31} {2.5s}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -16544,7 +16545,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2013/07/11} {2.5r}
+\ProvidesExplFile {siunitx-version-1.cfg} {2013/07/31} {2.5s}
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -16764,8 +16765,8 @@ This work consists of the file  siunitx.dtx
   mathscelsius   .meta:n    = { math-celsius            = #1          },
   mathsdegree    .meta:n    = { math-degree             = #1          },
   mathsecond     .meta:n    = { math-arcsecond          = #1          },
-  mathsf         .meta:x    =
-    { math-sf                 = \exp_not:c {#1}                       },
+  mathsf         .code:n    =
+    { \use:x { \keys_set:nn { siunitx } { math-sf = \exp_not:c {#1} } } },
   mathsminute    .meta:n    = { math-arcminute          = #1          },
   mathsmu        .meta:n    = { math-micro              = #1          },
   mathsringA     .meta:n    = { math-angstrom           = #1          },
@@ -17489,7 +17490,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/07/11} {2.5r}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/07/31} {2.5s}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -17671,7 +17672,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2013/07/11} {2.5r}
+\ProvidesExplFile {siunitx-binary.cfg} {2013/07/31} {2.5s}
   {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 d0df03363f9..2dc0547ceeb 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/07/11} {2.5r}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/07/31} {2.5s}
   {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 08e73b97cbd..c40077c9823 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/07/11} {2.5r}
+\ProvidesExplFile {siunitx-binary.cfg} {2013/07/31} {2.5s}
   {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 b3dbbb3ec65..98fd50d08f2 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/07/11} {2.5r}
+\ProvidesExplFile {siunitx-version-1.cfg} {2013/07/31} {2.5s}
   {siunitx: Version 1 settings}
 \keys_define:nn { siunitx } {
   addsign        .choice: ,
@@ -226,8 +226,8 @@
   mathscelsius   .meta:n    = { math-celsius            = #1          },
   mathsdegree    .meta:n    = { math-degree             = #1          },
   mathsecond     .meta:n    = { math-arcsecond          = #1          },
-  mathsf         .meta:x    =
-    { math-sf                 = \exp_not:c {#1}                       },
+  mathsf         .code:n    =
+    { \use:x { \keys_set:nn { siunitx } { math-sf = \exp_not:c {#1} } } },
   mathsminute    .meta:n    = { math-arcminute          = #1          },
   mathsmu        .meta:n    = { math-micro              = #1          },
   mathsringA     .meta:n    = { math-angstrom           = #1          },
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 8f4df716d18..6c83ee336ee 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/07/11} {2.5r}
+\ProvidesExplPackage {siunitx} {2013/07/31} {2.5s}
   {A comprehensive (SI) units package}
 \@ifpackagelater { expl3 } { 2012/11/21 }
   { }