siunitx 1.0i (14aug08)

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

1 files changed, 17 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 1f78de19621..22ecfac416e 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.0h}
+\newcommand*{\si@svn@ver}{v1.0i}
 \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 118 2008-08-02 06:10:09Z joseph $
+\si@svn@id $Id: siunitx.dtx 121 2008-08-14 14:06:03Z joseph $
 \ProvidesPackage{siunitx}
   [\si@svn@version A comprehensive (SI) units package]
 \begingroup
@@ -3390,18 +3390,24 @@
          \si@fileprefix#1.\si@extension}
          {The configuration file requested could not be
           found}}}}
-\newcommand{\si@inputifexists}[3]{%
-  \IfFileExists{#1}%
-    {#2\@addtofilelist{#1}\@@input \@filef@und}
-    {#3}%
-  \makeatother
-  \normalsize}
+\newif\ifsi@outerinput\si@outerinputtrue
 \let\si@InputIfFileExists\InputIfFileExists
 \AtBeginDocument{
   \renewcommand*{\si@InputIfFileExists}{%
-    \makeatletter
-    \nullfont
-    \si@inputifexists}}
+    \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]{%