siunitx update (4feb09)

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

24 files changed, 33 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
index 4c763012003..939f5744393 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-DE.cfg}
-  [2009/02/01 v1.2d siunitx: Germany locale]
+  [2009/02/04 v1.2e siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
index 33250b9a910..119aa33ade6 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-SIunits.cfg}
-  [2009/02/01 v1.2d siunitx: Emulation of
+  [2009/02/04 v1.2e siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
index 152c32d2225..f70e3cebf9e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-UK.cfg}
-  [2009/02/01 v1.2d siunitx: UK locale]
+  [2009/02/04 v1.2e siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
index 212a12ff572..af33e99d12a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-USA.cfg}
-  [2009/02/01 v1.2d siunitx: USA locale]
+  [2009/02/04 v1.2e siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
index ef6ef410c39..064bce3c963 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-ZA.cfg}
-  [2009/02/01 v1.2d siunitx: South Africa locale]
+  [2009/02/04 v1.2e siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
index d494d4ba04a..def0d971651 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-abbr.cfg}
-  [2009/02/01 v1.2d siunitx: Abbreviated units]
+  [2009/02/04 v1.2e siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
index 49f6967289f..bfd768c8d58 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-accepted.cfg}
-  [2009/02/01 v1.2d siunitx: SI Accepted units]
+  [2009/02/04 v1.2e siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
index b0094e689d6..28ec40a14ec 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-addn.cfg}
-  [2009/02/01 v1.2d siunitx: SI Additional units]
+  [2009/02/04 v1.2e siunitx: SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
 \newunit{\hectare}{\hecto\are}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
index e56b1e405e2..79b37a15dfb 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-astro.cfg}
-  [2009/02/01 v1.2d siunitx: Units for astronomy]
+  [2009/02/04 v1.2e siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
index da20984809a..3574df57bf0 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-binary.cfg}
-  [2009/02/01 v1.2d siunitx: Binary units]
+  [2009/02/04 v1.2e siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
index 37408e6094c..0b4c70dbcc7 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-fancynum.cfg}
-  [2009/02/01 v1.2d siunitx: Emulation of
+  [2009/02/04 v1.2e siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
index 44f7f5c5482..476c24c3333 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-fancyunits.cfg}
-  [2009/02/01 v1.2d siunitx: Emulation of
+  [2009/02/04 v1.2e siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
index 6c682d3641e..2c679ccb62e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-geophys.cfg}
-  [2009/02/01 v1.2d siunitx: Units for astronomy]
+  [2009/02/04 v1.2e siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
index 2d35fdc9775..5d158f2602c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-hep.cfg}
-  [2009/02/01 v1.2d siunitx: Units for high-energy physics]
+  [2009/02/04 v1.2e siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 \provideunit{\micron}{\micro\metre}
 \newunit{\mrad}{\milli\rad}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
index 9279e498ceb..36d9abed5db 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-hepunits.cfg}
-  [2009/02/01 v1.2d siunitx: Emulation of
+  [2009/02/04 v1.2e siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
index 8ef8213bb64..c4605cab712 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-named.cfg}
-  [2009/02/01 v1.2d siunitx: SI Named units]
+  [2009/02/04 v1.2e siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
index 749ac3091c4..d0b34e1bc9c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-physical.cfg}
-  [2009/02/01 v1.2d siunitx: SI Physically-measured units]
+  [2009/02/04 v1.2e siunitx: SI Physically-measured units]
 \newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}%
 \newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}%
 \newunit{\electronvolt}{e\protect\si@eVspacea V\protect%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
index 78d3e5d97c8..5bb1420b0a7 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-prefix.cfg}
-  [2009/02/01 v1.2d siunitx: SI Multiple prefixes]
+  [2009/02/04 v1.2e siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
index 254b702610e..e5a724b33f1 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-prefixed.cfg}
-  [2009/02/01 v1.2d siunitx: SI Prefixed units]
+  [2009/02/04 v1.2e siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\picometre}{\pico\metre}
 \newunit{\nanometre}{\nano\metre}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
index 4ed7d1241c7..341477a9b2f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-sistyle.cfg}
-  [2009/02/01 v1.2d siunitx: Emulation of
+  [2009/02/04 v1.2e siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
index f98c0c81649..1d0a1c23d41 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-synchem.cfg}
-  [2009/02/01 v1.2d siunitx: Units for synthetic chemists]
+  [2009/02/04 v1.2e siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
index 907ecb264be..36f870a1833 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
@@ -15,7 +15,7 @@
 %% 
 \si@ifloaded{units}{\endinput}{}
 \ProvidesFile{si-units.cfg}
-  [2009/02/01 v1.2d siunitx: Emulation of units]
+  [2009/02/04 v1.2e siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
index b5f4c60dd7d..17e1609480a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 %% 
 \ProvidesFile{si-unitsdef.cfg}
-  [2009/02/01 v1.2d siunitx:
+  [2009/02/04 v1.2e siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index dca05ce9a21..0c4377ca094 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2009/02/01 v1.2d A comprehensive (SI) units package]
+  [2009/02/04 v1.2e A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -2734,10 +2734,8 @@
       {\ensuremath{{\si@decimalsymbol}}}%
   \fi
   \protected@edef\si@num@out{\si@num@out\si@tab@expout}%
-  \setbox\si@tab@prebox=\hbox
-    {\expandafter\si@out@num\expandafter{\si@tab@out}}%
-  \setbox\si@tab@postbox=\hbox
-    {\expandafter\si@out@num\expandafter{\si@num@out}}%
+  \setbox\si@tab@prebox=\hbox{\si@out@num{\si@tab@out}}%
+  \setbox\si@tab@postbox=\hbox{\si@out@num{\si@num@out}}%
   \ifdim\wd\si@tab@prebox>\wd\si@tab@postbox\relax
     \setbox\si@tab@postbox=\hbox to\wd\si@tab@prebox%
       {\unhbox\si@tab@postbox\hfill}%
@@ -2800,7 +2798,7 @@
     \advance\si@tab@postdim\si@tab@expdim\relax
   \fi
   \setbox\si@tab@prebox=\hbox to\si@tab@predim{\hss\hfill
-    \expandafter\si@out@num\expandafter{\si@tab@out}}%
+    \si@out@num{\si@tab@out}}%
   \ifx\@empty\si@num@out\@empty
     \setbox\si@tab@postbox=\hbox to\si@tab@postdim{\hfil}%
   \else
@@ -2808,8 +2806,8 @@
       \protected@edef\si@num@out{\si@num@out\si@tab@expout}%
     \fi
     \setbox\si@tab@postbox=\hbox to\si@tab@postdim
-      {\ensuremath{{\si@decimalsymbol}}\expandafter\si@out@num
-        \expandafter{\si@num@out}\hfil}%
+      {\ensuremath{{\si@decimalsymbol}}\si@out@num
+        {\si@num@out}\hfil}%
   \fi
   \ifx\@empty\si@tab@expout\@empty
     \ifsi@tabalignexp
@@ -2818,8 +2816,7 @@
   \else
     \ifsi@tabalignexp
       \setbox\si@tab@expbox=\hbox to\si@tab@expdim
-        {\expandafter\si@out@num\expandafter{\si@tab@expout}%
-           \hfil}%
+        {\si@out@num{\si@tab@expout}\hfil}%
     \fi
   \fi}
 \newcommand*{\si@tab@sepcorr}[2]{%
@@ -2903,9 +2900,9 @@
 \def\si@SI[#1]#2[#3]#4{%
   \begingroup
     \let\fg\SIfg
-    \si@ifnotmtarg{#1}
-      {\sisetup{#1}%
-       \renewcommand*{\si@unt@SIopts}{#1}}%
+    \sisetup{#1}%
+    \renewcommand*{\si@unt@SIopts}{#1}%
+    \si@fam@mode
     \si@unt@numfalse
     \si@xspacefalse
     \si@ifnotmtarg{#3}