siunitx 1.0g (19jul08)

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

23 files changed, 46 insertions, 27 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 2f7b9d01d04..49ee9df1974 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}
-  [\csname si@svn@version\endcsname siunitx: Germany locale]
+  [\si@svn@version 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 d6237983a9c..7a087396d85 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}
-  [\csname si@svn@version\endcsname siunitx: Emulation of
+  [\si@svn@version 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 98aff00edb6..1063b7d81a3 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}
-  [\csname si@svn@version\endcsname siunitx: UK locale]
+  [\si@svn@version 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 b8c5a064809..cd5127e1988 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}
-  [\csname si@svn@version\endcsname siunitx: USA locale]
+  [\si@svn@version 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 f2f0e09f749..b9f23c63be3 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version siunitx:
    South Africa locale]
 \sisetup{
   unitsep=cdot,
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 5764f6af24c..f13994ff4ac 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}
-  [\csname si@svn@version\endcsname siunitx: Abbreviated units]
+  [\si@svn@version 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 ffe8a8ca0ab..4f009470a99 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}
-  [\csname si@svn@version\endcsname siunitx: SI Accepted units]
+  [\si@svn@version 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 89dc4487117..a92aeb38c9a 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version siunitx:
    SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
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 de516883511..5cf80b83e20 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version 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 110791abbcc..9e0ad9a2c74 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}
-  [\csname si@svn@version\endcsname siunitx: Binary units]
+  [\si@svn@version 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 b60266bbc01..c1f7a3251f3 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}
-  [\csname si@svn@version\endcsname Emulation of siunitx:
+  [\si@svn@version Emulation of siunitx:
      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 b784816341a..14bcf8aae2f 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}
-  [\csname si@svn@version\endcsname Emulation of siunitx:
+  [\si@svn@version Emulation of siunitx:
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}
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 4e33ed98e37..073f61a32ee 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}
-  [\csname si@svn@version\endcsname siunitx: Units for
+  [\si@svn@version siunitx: Units for
     high-energy physics]
 \requiresiconfigs{prefix,named}
 \provideunit{\micron}{\micro\metre}
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 42b38b74b46..a3c608ccc44 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}
-  [\csname si@svn@version\endcsname Emulation of siunitx:
+  [\si@svn@version Emulation of siunitx:
      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 ef8fe1c3f06..bba45ded73f 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}
-  [\csname si@svn@version\endcsname siunitx: SI Named units]
+  [\si@svn@version 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 f0f9b580d6e..2ef31fa2444 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version siunitx:
    SI Physically-measured units]
 \newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}%
 \newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}%
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 882b6985870..c2a72e82a5c 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version siunitx:
    SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
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 5dce06ba0c8..9d2015b6c2f 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version siunitx:
    SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\picometre}{\pico\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 aca37d6e003..67bef67b2da 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}
-  [\csname si@svn@version\endcsname siunitx: Emulation of
+  [\si@svn@version 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 05f3f96d111..c19f49a351f 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}
-  [\csname si@svn@version\endcsname siunitx: Units for
+  [\si@svn@version siunitx: Units for
      synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
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 d1514fdc9e4..ab02762f2f5 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}
-  [\csname si@svn@version\endcsname siunitx: Emulation of units]
+  [\si@svn@version 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 6d1575dd091..350775acc71 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}
-  [\csname si@svn@version\endcsname siunitx:
+  [\si@svn@version 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 1ee1f2571b2..32ed37f6ef9 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,11 +14,11 @@
 %%  ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\newcommand*{\si@svn@ver}{v1.0f}
+\newcommand*{\si@svn@ver}{v1.0g}
 \def\si@svn@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
   \newcommand*{\si@svn@version}{%
     #5/#6/#7\space\si@svn@ver\space}}
-\si@svn@id $Id: siunitx.dtx 106 2008-07-17 10:38:08Z joseph $
+\si@svn@id $Id: siunitx.dtx 113 2008-07-19 05:41:59Z joseph $
 \ProvidesPackage{siunitx}
   [\si@svn@version A comprehensive (SI) units package]
 \begingroup
@@ -62,6 +62,7 @@
 \newbox\si@tempboxb
 \newbox\si@tempboxc
 \newbox\si@tempboxd
+\newtoks{\si@temptoks}
 \newcommand*{\si@blockpkgs}{SIunits,sistyle,siunits,SIstyle,%
   unitsdef,fancyunits}
 \newcommand*{\si@checkpkgs}{units,hepunits,fancynum}
@@ -97,7 +98,6 @@
   \else
     \edef#1{#1,#2}%
   \fi}
-\newtoks{\si@temptoks}
 \newcommand*{\si@addtocsname}[2]{%
   \@ifundefined{#1}
     {\expandafter\gdef\csname #1\endcsname{#2}}
@@ -2600,6 +2600,7 @@
     {\si@SI[#1]{#2}}
     {\si@SI[#1]{#2}[]}}
 \si@newrobustcmd*{\si}[2][]{\si@SI[#1]{}[]{#2}}
+
 \newcommand*{\newunit}[3][]{%
   \si@ifdefinable{#2}
     {\si@unt@defunit[#1]{#2}{#3}}
@@ -3287,7 +3288,7 @@
 \newcommand*{\si@loc@load}[1]{%
   \let\si@loc@sisetup\sisetup
   \renewcommand*{\sisetup}[1]{%
-    \expandafter\gdef\csname si@loc@#1\endcsname{##1}}
+    \expandafter\gdef\csname si@loc@#1\endcsname{##1}}%
   \si@loadfile{#1}%
   \let\sisetup\si@loc@sisetup}
 \newcommand*{\si@loc@set}[1]{%
@@ -3391,12 +3392,30 @@
   \si@ifl@aded\si@extension{\si@fileprefix#1}}
 \newcommand*{\si@loadfile}[1]{%
   \si@ifloaded{#1}{}
-    {\InputIfFileExists{\si@fileprefix#1.\si@extension}
+    {\si@InputIfFileExists{\si@fileprefix#1.\si@extension}
       {}
       {\si@log@err{Failed to load file
          \si@fileprefix#1.\si@extension}
          {The configuration file requested could not be
           found}}}}
+\newif\ifsi@outerinput\si@outerinputtrue
+\let\si@InputIfFileExists\InputIfFileExists
+\AtBeginDocument{
+  \renewcommand*{\si@InputIfFileExists}{%
+    \ifsi@outerinput
+      \expandafter\si@outerinput
+    \else
+      \expandafter\InputIfFileExists
+    \fi}}
+\newcommand*{\si@outerinput}[3]{%
+  \makeatletter
+  \nullfont
+  \si@outerinputfalse
+  \IfFileExists{#1}%
+    {#2\@addtofilelist{#1}\@@input \@filef@und\normalsize}
+    {#3}%
+  \normalsize
+  \makeatother}
 \newcommand*{\requiresiconfigs}[1]{%
   \@for\si@tempb:=#1\do{\si@loadfile{\si@tempb}}}
 \newcommand*{\si@loademfile}[1]{%