siunitx (12mar13)

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

6 files changed, 60 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index b78a56235b4..e9d7c4c1d0b 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 11402bf8c9a..afdbc7fe043 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -609,6 +609,10 @@ This work consists of the file  siunitx.dtx
 %\changes{v2.5o}{2013/01/09}{Update internals to track \pkg{expl3} changes}
 %\changes{v2.5p}{2013/02/01}{Fix printing of \cs{pm} and \cs{mp} when used
 %  as signs in text mode}
+%\changes{v2.5q}{2013/03/10}{Replace active \texttt{-} in numbers with
+%  standard hyphen}
+%\changes{v2.5q}{2013/03/10}{Reorder internals to allow for binary units
+%  in tables}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -5119,7 +5123,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2013/02/01} {2.5p}
+\ProvidesExplPackage {siunitx} {2013/03/11} {2.5q}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -6916,14 +6920,23 @@ This work consists of the file  siunitx.dtx
 %\begin{macro}{\@@_number_in_sign_replace:N}
 % A short spin-out to keep the replacement of tokens clear.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_number_in_sign_replace:N #1 {
-  \tl_replace_all:Nnn #1 { -+ } { \mp }
-  \tl_replace_all:Nnn #1 { +- } { \pm }
-  \tl_replace_all:Nnn #1 { << } { \ll }
-  \tl_replace_all:Nnn #1 { <= } { \le }
-  \tl_replace_all:Nnn #1 { >> } { \gg }
-  \tl_replace_all:Nnn #1 { >= } { \ge }
-}
+\group_begin:
+\char_set_catcode_active:N \*
+\char_set_lccode:nn { `\* } { `\- }
+\tl_to_lowercase:n
+  {
+    \group_end:
+    \cs_new_protected:Npn \@@_number_in_sign_replace:N #1
+      {
+        \tl_replace_all:Nnn #1 { * }  { - }
+        \tl_replace_all:Nnn #1 { -+ } { \mp }
+        \tl_replace_all:Nnn #1 { +- } { \pm }
+        \tl_replace_all:Nnn #1 { << } { \ll }
+        \tl_replace_all:Nnn #1 { <= } { \le }
+        \tl_replace_all:Nnn #1 { >> } { \gg }
+        \tl_replace_all:Nnn #1 { >= } { \ge }
+      }
+  }
 %    \end{macrocode}
 %\end{macro}
 %
@@ -13228,6 +13241,9 @@ This work consists of the file  siunitx.dtx
           { \NC@list { #1 #2 } }
         \exp_after:wN \@@_tmp:w \tex_the:D \NC@list \q_stop
         \cs_undefine:N \NC@find@S
+        \msg_new:nnn { siunitx } { moved-cellspace-column }
+          { Column~type~for~cellspace~package~moved~to~'#1'. }
+        \msg_warning:nnn { siunitx } { moved-cellspace-column } { C }  
       }
       { }
 }
@@ -16508,7 +16524,13 @@ This work consists of the file  siunitx.dtx
   }
 %    \end{macrocode}
 %
-% The master control macro which occurs at the start of the document.
+% Finally apply the settings given at load time.
+%    \begin{macrocode}
+\ProcessKeysOptions { siunitx }
+%    \end{macrocode}
+%    
+% Creating document commands has to happen here so it is after any load-time
+% changes to the units available.
 %    \begin{macrocode}
 \AtBeginDocument {
   \bool_if:NTF \l_@@_create_free_bool
@@ -16517,11 +16539,6 @@ This work consists of the file  siunitx.dtx
 }
 %    \end{macrocode}
 %
-% Finally apply the settings given at load time.
-%    \begin{macrocode}
-\ProcessKeysOptions { siunitx }
-%    \end{macrocode}
-%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
@@ -16533,7 +16550,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2013/02/01} {2.5p}
+\ProvidesExplFile {siunitx-version-1.cfg} {2013/03/11} {2.5q}
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -17478,7 +17495,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/02/01} {2.5p}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/03/11} {2.5q}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -17660,7 +17677,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2013/02/01} {2.5p}
+\ProvidesExplFile {siunitx-binary.cfg} {2013/03/11} {2.5q}
   {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 747fe63b228..ac817958a77 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/02/01} {2.5p}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/03/11} {2.5q}
   {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 3eec40712d1..11f85bd1a5e 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/02/01} {2.5p}
+\ProvidesExplFile {siunitx-binary.cfg} {2013/03/11} {2.5q}
   {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 5e588748eeb..f6cc25df5d1 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/02/01} {2.5p}
+\ProvidesExplFile {siunitx-version-1.cfg} {2013/03/11} {2.5q}
   {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 b89514458f6..e66935d8d4f 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/02/01} {2.5p}
+\ProvidesExplPackage {siunitx} {2013/03/11} {2.5q}
   {A comprehensive (SI) units package}
 \@ifpackagelater { expl3 } { 2012/11/21 }
   { }
@@ -1093,14 +1093,23 @@
 \cs_new_protected:Npn \__siunitx_number_in_protect_aux:N #1 {
   \cs_set_eq:NN #1 \scan_stop:
 }
-\cs_new_protected:Npn \__siunitx_number_in_sign_replace:N #1 {
-  \tl_replace_all:Nnn #1 { -+ } { \mp }
-  \tl_replace_all:Nnn #1 { +- } { \pm }
-  \tl_replace_all:Nnn #1 { << } { \ll }
-  \tl_replace_all:Nnn #1 { <= } { \le }
-  \tl_replace_all:Nnn #1 { >> } { \gg }
-  \tl_replace_all:Nnn #1 { >= } { \ge }
-}
+\group_begin:
+\char_set_catcode_active:N \*
+\char_set_lccode:nn { `\* } { `\- }
+\tl_to_lowercase:n
+  {
+    \group_end:
+    \cs_new_protected:Npn \__siunitx_number_in_sign_replace:N #1
+      {
+        \tl_replace_all:Nnn #1 { * }  { - }
+        \tl_replace_all:Nnn #1 { -+ } { \mp }
+        \tl_replace_all:Nnn #1 { +- } { \pm }
+        \tl_replace_all:Nnn #1 { << } { \ll }
+        \tl_replace_all:Nnn #1 { <= } { \le }
+        \tl_replace_all:Nnn #1 { >> } { \gg }
+        \tl_replace_all:Nnn #1 { >= } { \ge }
+      }
+  }
 \cs_new_protected:Npn \__siunitx_number_in_parse_error:nn #1#2 {
   \__siunitx_error:nx {#1} { \exp_not:n {#2} }
   \tl_map_break:
@@ -5486,6 +5495,9 @@
           { \NC@list { #1 #2 } }
         \exp_after:wN \__siunitx_tmp:w \tex_the:D \NC@list \q_stop
         \cs_undefine:N \NC@find@S
+        \msg_new:nnn { siunitx } { moved-cellspace-column }
+          { Column~type~for~cellspace~package~moved~to~'#1'. }
+        \msg_warning:nnn { siunitx } { moved-cellspace-column } { C }
       }
       { }
 }
@@ -7542,12 +7554,12 @@
     \@onefilewithoptions { siunitx } [ ] [ ]
       \c__siunitx_configuration_ext_tl
   }
+\ProcessKeysOptions { siunitx }
 \AtBeginDocument {
   \bool_if:NTF \l__siunitx_create_free_bool
     { \__siunitx_unit_create_functions: }
     { \__siunitx_unit_create_empty_functions: }
 }
-\ProcessKeysOptions { siunitx }
 %% Copyright (C) 2008-2013 by
 %%   Joseph Wright <joseph.wright@morningstar2.co.uk>
 %%