siunitx (9dec11)

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

4 files changed, 15 insertions, 26 deletions

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