4 files changed, 54 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
index ad4c6329a5e..dfdc10080db 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 498ac950689..00931e5e1b8 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 7dd7a6dba5f..e04f3c463d8 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -225,7 +225,7 @@ dcolumn, rccol and numprint packages.
 %</driver>
 % \fi
 %
-%\CheckSum{9495}
+%\CheckSum{9506}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -290,7 +290,8 @@ dcolumn, rccol and numprint packages.
 %\DoNotIndex{\key@ifundefined,\newrobustcmd,\protected,\scriptspace}
 %\DoNotIndex{\usebox,\tw@,\ifinner,\usepackage,\texttt,\textsf}
 %\DoNotIndex{\NC@do,\loop,\l@ngrel@x,\g@addto@macro,\documentclass}
-%\DoNotIndex{\document\,\begin,\=,\@ehb,\\,\listfiles}
+%\DoNotIndex{\document\,\begin,\=,\@ehb,\\,\listfiles,\nullfont}
+%\DoNotIndex{\normalsize}
 %
 %\DoNotIndex{\pascalsecond,\amperemetresecond,\ohmmetre}
 %\DoNotIndex{\newtonmetre,\newtonmetrenp}
@@ -3177,11 +3178,11 @@ author.
 % number, of course.
 %    \begin{macrocode}
 \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]
 %    \end{macrocode}
@@ -9740,33 +9741,46 @@ author.
           found}}}}
 %    \end{macrocode}
 %\end{macro}
-%\begin{macro}{\si@inputifexists}
-%\changes{v1.0g}{2008/07/18}{Loading of configuration files
-%  improved to kill spaces}
+%\begin{macro}{\ifsi@outerinput}
+% At various points, the package needs to know if the
+% currently-read configuration file is the
+% outer one.
+%    \begin{macrocode}
+\newif\ifsi@outerinput\si@outerinputtrue
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\si@InputIfFileExists}
-%\darg{file}
-%\darg{true}
-%\darg{false}
 % To allow reading configuration files after the start of the
-% document, a private copy of \cs{InputIfFileExists} is needed.  In
-% the preamble, this is just a straight copy.  However, in the
-% document body, |@| is made into a letter and printing is killed,
-% while the file is loaded.
+% document, a private copy of \cs{InputIfFileExists} is needed.  The
+% main macro here simply checks if the modified version is needed.
 %    \begin{macrocode}
-\newcommand{\si@inputifexists}[3]{%
-  \IfFileExists{#1}%
-    {#2\@addtofilelist{#1}\@@input \@filef@und}
-    {#3}%
-  \makeatother
-  \normalsize}
 \let\si@InputIfFileExists\InputIfFileExists
 \AtBeginDocument{
   \renewcommand*{\si@InputIfFileExists}{%
-    \makeatletter
-    \nullfont
-    \si@inputifexists}}
+    \ifsi@outerinput
+      \expandafter\si@outerinput
+    \else
+      \expandafter\InputIfFileExists
+    \fi}}
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\si@outerinput}
+%\darg{file}
+%\darg{true-code}
+%\darg{false-code}
+% The outer call to load a file needs to set |@| to a letter and turn
+% of printing using \cs{nullfont}.
+%    \begin{macrocode}
+\newcommand*{\si@outerinput}[3]{%
+  \makeatletter
+  \nullfont
+  \si@outerinputfalse
+  \IfFileExists{#1}%
+    {#2\@addtofilelist{#1}\@@input \@filef@und\normalsize}
+    {#3}%
+  \normalsize
+  \makeatother}
+%    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\requiresiconfigs}
 %\darg{config-file}
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]{%