siunitx 1.3g (26dec09)

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

25 files changed, 42 insertions, 28 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 71783a0545e..428a37c899f 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/12/16 v1.3f siunitx: Germany locale]
+  [2009/12/25 v1.3g 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 2c3503372ec..6f22b1b36ad 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/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g 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 b49112e5bfc..d84bebf340d 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/12/16 v1.3f siunitx: UK locale]
+  [2009/12/25 v1.3g 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 705524385e8..f695d8d431b 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/12/16 v1.3f siunitx: USA locale]
+  [2009/12/25 v1.3g 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 7badb78e4b8..193fe2820be 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/12/16 v1.3f siunitx: South Africa locale]
+  [2009/12/25 v1.3g 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 da5b76fa72e..e954098cc7e 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/12/16 v1.3f siunitx: Abbreviated units]
+  [2009/12/25 v1.3g 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 746bd8d2139..b9aff0acfcd 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/12/16 v1.3f siunitx: SI Accepted units]
+  [2009/12/25 v1.3g 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 ed6167b7e69..bd678c878ce 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/12/16 v1.3f siunitx: SI Additional units]
+  [2009/12/25 v1.3g siunitx: SI Additional units]
 \provideunit{\angstrom}{\si@sym@ringA}
 \AtBeginDocument{%
   \ifdefined\Saveangstrom
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 4085b3f5dec..8be97c4ac18 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/12/16 v1.3f siunitx: Units for astronomy]
+  [2009/12/25 v1.3g siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %% 
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 2ee81789240..951178ec64b 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/12/16 v1.3f siunitx: Binary units]
+  [2009/12/25 v1.3g 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-chemeng.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg
index 575f4ec8268..bb21a410309 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-chemeng.cfg}
-  [2009/12/16 v1.3f siunitx: Units for chemical engineering]
+  [2009/12/25 v1.3g siunitx: Units for chemical engineering]
 \newunit{\gmol}{g\text{-}mol}
 \newunit{\kgmol}{kg\text{-}mol}
 \newunit{\lbmol}{lb\text{-}mol}
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 d81db73ab4a..424f8a2915e 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/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g 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 ec685470357..5d75a80b3ec 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/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g 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 ace9e706411..cba00e673c7 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/12/16 v1.3f siunitx: Units for astronomy]
+  [2009/12/25 v1.3g siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 %% 
 %% Copyright (C) 2008-2009 by
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 1e918af3a15..afdc8ffd52b 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/12/16 v1.3f siunitx: Units for high-energy physics]
+  [2009/12/25 v1.3g 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 a04706c9ab1..120e4001513 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/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g 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 28200eac696..3e4da3cf2ba 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/12/16 v1.3f siunitx: SI Named units]
+  [2009/12/25 v1.3g 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 54b428e3d0b..7bacddfcd0f 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/12/16 v1.3f siunitx: SI Physically-measured units]
+  [2009/12/25 v1.3g 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 5bcda767bd2..f4f1dc1de24 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/12/16 v1.3f siunitx: SI Multiple prefixes]
+  [2009/12/25 v1.3g 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 44a0fa084d7..a0f5046c12a 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/12/16 v1.3f siunitx: SI Prefixed units]
+  [2009/12/25 v1.3g 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 369bbabcecb..4d87fa3dbad 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/12/16 v1.3f siunitx: Emulation of
+  [2009/12/25 v1.3g 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 a3aedbcfa2c..ba57ff61c24 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/12/16 v1.3f siunitx: Units for synthetic chemists]
+  [2009/12/25 v1.3g 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 03f261ed9f2..8e4a311027e 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/12/16 v1.3f siunitx: Emulation of units]
+  [2009/12/25 v1.3g 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 a1d39fad3f4..894b4360585 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/12/16 v1.3f siunitx:
+  [2009/12/25 v1.3g 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 ead736111c9..80e5028ee35 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/12/16 v1.3f A comprehensive (SI) units package]
+  [2009/12/25 v1.3g A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -2573,6 +2573,11 @@
   \fi
   \si@tab@next}
 \newcommand*{\si@tab@othertok}[1]{%
+  \si@tab@ifonechar{#1}
+    {\si@tab@othertok@aux{#1}}
+    {\si@tab@othertok@aux{{#1}}}%
+}
+\newcommand*{\si@tab@othertok@aux}[1]{%
   \si@log@debug{Found other cell contents `\unexpanded{#1}'}%
   \ifsi@switch
     \si@log@debug{Adding to post-numeral part}%
@@ -2597,13 +2602,22 @@
 \newcommand*{\si@tab@exptest}[1]{%
   \edef\si@tempa{\si@tab@meaning{#1}}%
   \ifx\si@tempa\si@tab@macro
+    \expandafter\si@tab@exptest@aux
+  \else
+    \expandafter\si@tab@othertok
+  \fi
+  {#1}%
+}
+\newcommand*{\si@tab@exptest@aux}[1]{%
+  \ifcsname\expandafter\@gobble\string#1 \endcsname
+    \si@tab@othertok{#1}%
+  \else
     \si@log@debug{Expanding cell contents `\unexpanded{#1}'}%
     \the\si@tab@pretoks
     \si@tab@pretoks{}%
     \protected@edef\si@tab@next{\noexpand\si@tab@gettok@S#1}%
-  \else
-    \si@tab@othertok{#1}%
-  \fi}
+  \fi
+}
 \newcommand*{\si@tab@meaning}[1]{%
   \expandafter\si@tab@strip\meaning#1:->:->\@empty}
 \def\si@tab@strip#1:->#2:->#3\@empty{#1}