siunitx 2.2e (23may11)

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

5 files changed, 22 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index f9699369fd3..8eb3eaa104d 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 5f7cfdb38c4..685ca5bb90b 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -284,6 +284,7 @@ This work consists of the file  siunitx.dtx
 %          DTLnewdbentry,
 %          DTLnewrow,
 %          farad,
+%          fontspec,
 %          gram,
 %          gray,
 %          henry,
@@ -336,6 +337,7 @@ This work consists of the file  siunitx.dtx
 %          tesla,
 %          texorpdfstring,
 %          text,
+%          textmu,
 %          toprule,
 %          tothe,
 %          translate,
@@ -532,6 +534,8 @@ This work consists of the file  siunitx.dtx
 %  using the \opt{output-exponent-marker} option}
 %\changes{v2.2c}{2011/04/20}{Fix bad interaction with \pkg{cellspace} package}
 %\changes{v2.2d}{2011/04/28}{Fix the \opt{strict} option}
+%\changes{v2.2e}{2011/05/23}{Fix incorrect interpretation of complex numbers with
+%  no real part.}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -3943,6 +3947,14 @@ This work consists of the file  siunitx.dtx
 %  \ \ text-micro \ = \SIUnitSymbolMicro \\
 %  \}
 %\end{flushleft}
+% It may also be desirable in these cases to select a fixed font
+% using the \pkg{fontspec} package, for example
+%\begin{LaTeXdemo}[code only]
+%  \sisetup{
+%    math-micro = \fontspec{Minion Pro} \textmu,
+%    text-micro = \fontspec{Minion Pro} \textmu
+%  }
+%\end{LaTeXdemo}
 %
 %\subsection{Scaled document fonts with \texorpdfstring{\XeTeX}{XeTeX}}
 %
@@ -4775,7 +4787,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2011/04/28} {2.2d}
+\ProvidesExplPackage {siunitx} {2011/05/23} {2.2e}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -6856,9 +6868,10 @@ This work consists of the file  siunitx.dtx
       \prop_if_in:NnT \l_siunitx_number_in_prop
         { complex-decimal-marker }
         { \bool_set_true:N \l_siunitx_number_in_decimal_bool }
-      \prop_if_in:NnT \l_siunitx_number_in_prop
+      \prop_if_in:NnTF \l_siunitx_number_in_prop
         { complex-sign }
         { \bool_set_true:N \l_siunitx_number_in_sign_bool }
+        { \prop_del:Nn \l_siunitx_number_in_prop { mantissa } }
     }
 }
 \cs_new_protected_nopar:Npn \siunitx_number_in_complex_aux:nn #1#2 {
@@ -15621,7 +15634,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %    
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2011/04/28} {2.2d} 
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/05/23} {2.2e} 
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -16837,7 +16850,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2011/04/28} {2.2d}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/05/23} {2.2e}
   {siunitx: Binary units}
 %    \end{macrocode}
 %
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 d1691b19e49..c97c82b8ede 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} {2011/04/28} {2.2d}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/05/23} {2.2e}
   {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 52bf20f2630..1d135b166ca 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} {2011/04/28} {2.2d}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/05/23} {2.2e}
   {siunitx: Version 1 settings}
 \keys_set:nn { siunitx }
   { load-configurations = { abbreviations , binary } }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 4f9ecaba8e7..a993d2f8160 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}
-\ProvidesExplPackage {siunitx} {2011/04/28} {2.2d}
+\ProvidesExplPackage {siunitx} {2011/05/23} {2.2e}
   {A comprehensive (SI) units package}
 \cs_if_exist:NTF \msg_set:nnnn
   {
@@ -1318,9 +1318,10 @@
       \prop_if_in:NnT \l_siunitx_number_in_prop
         { complex-decimal-marker }
         { \bool_set_true:N \l_siunitx_number_in_decimal_bool }
-      \prop_if_in:NnT \l_siunitx_number_in_prop
+      \prop_if_in:NnTF \l_siunitx_number_in_prop
         { complex-sign }
         { \bool_set_true:N \l_siunitx_number_in_sign_bool }
+        { \prop_del:Nn \l_siunitx_number_in_prop { mantissa } }
     }
 }
 \cs_new_protected_nopar:Npn \siunitx_number_in_complex_aux:nn #1#2 {