6 files changed, 75 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/SIunits/readme.txt b/Master/texmf-dist/doc/latex/SIunits/README
index bfb3b2175e0..f9c213c0229 100644
--- a/Master/texmf-dist/doc/latex/SIunits/readme.txt
+++ b/Master/texmf-dist/doc/latex/SIunits/README
@@ -1,3 +1,8 @@
+Note: This package is now maintained by Joseph Wright
+(joseph.wright@morningstar2.co.uk)
+Copyright 2007 Joseph Wright
+-----------------------------------------------------------------------
+
 README for the package SIunits
 
 
diff --git a/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf b/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf
index a3c0ec20aa0..1a0fb0e678f 100644
--- a/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf
+++ b/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf
diff --git a/Master/texmf-dist/source/latex/SIunits/SIunits.dtx b/Master/texmf-dist/source/latex/SIunits/SIunits.dtx
index 1668cb8f102..465394cfc14 100644
--- a/Master/texmf-dist/source/latex/SIunits/SIunits.dtx
+++ b/Master/texmf-dist/source/latex/SIunits/SIunits.dtx
@@ -1,4 +1,8 @@
 % \iffalse meta-comment
+% Note: This package is now maintained by Joseph Wright
+% (joseph.wright@morningstar2.co.uk)
+% Copyright 2007 Joseph Wright
+% ----------------------------------------------------------------------
 %<*ID>
 %%% ====================================================================
 %%%  @LaTeX-package-file{
@@ -24,12 +28,12 @@
 %%% copyright = "Copyright (C) 2001 Marcel Heldoorn.
 %%%
 %%% This program may be distributed and/or modified under the
-%%% conditions of the LaTeX Project Public License, either version 1.2
+%%% conditions of the LaTeX Project Public License, either version 1.3
 %%% of this license or (at your option) any later version.
 %%% The latest version of this license is in
 %%%   http://www.latex-project.org/lppl.txt
-%%% and version 1.2 or later is part of all distributions of LaTeX
-%%% version 1999/12/01 or later.
+%%% and version 1.3 or later is part of all distributions of LaTeX
+%%% version 2003/12/01 or later.
 %%% }
 %%% ====================================================================
 %</ID>
@@ -38,8 +42,8 @@
 %   \iffalse
 %<+package|binary>\def\SIunits@RCS$#1: #2 #3${#2}
 %<+package|binary>\def\filename{SIunits.dtx}%Source File Name
-%<+package|binary>\xdef\fileversion{\SIunits@RCS$Revision: 1.33 $}%Revision generated by CS-RCS
-%<+package|binary>\xdef\filedate{\SIunits@RCS$Date: 2002/08/01 11:20:00 $}%Date generated by CS-RCS
+%<+package|binary>\xdef\fileversion{\SIunits@RCS$Revision: 1.34 $}%Revision generated by CS-RCS
+%<+package|binary>\xdef\filedate{\SIunits@RCS$Date: 2007/11/22 11:20:00 $}%Date generated by CS-RCS
 %<+package|binary>\let\docversion=\fileversion
 %<+package|binary>\let\docdate=\filedate
 %<+package|binary>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
@@ -117,6 +121,10 @@
 %
 %
 \begin{filecontents}{SIunits.ins}
+%% Note: This package is now maintained by Joseph Wright
+%% (joseph.wright@morningstar2.co.uk)
+%% Copyright 2007 Joseph Wright
+%% ---------------------------------------------------------------------
 %%
 %% SIunits.ins will generate the fast loadable files SIunits.sty and
 %% binary.sty, the documentation driver SIunits.drv and the configura-
@@ -126,12 +134,12 @@
 %% Copyright (C) 2001          Marcel Heldoorn
 %%
 %% This program may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.2
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%   http://www.latex-project.org/lppl.txt
-%% and version 1.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
 %%
 %% NOTE:
 %% The LPPL about .ins files:
@@ -149,9 +157,9 @@
 Copyright (c) 1998-2002 Marcel Heldoorn <m.heldoorn@webschool.nl>.
 
 This program may be distributed and/or modified under the conditions of the LaTeX Project
-Public License, either version 1.2 of this license or (at your option) any later version.
+Public License, either version 1.3 of this license or (at your option) any later version.
 The latest version of this license is in http://www.latex-project.org/lppl.txt and
-version 1.2 or later is part of all distributions of LaTeX version 1999/12/01 or later.
+version 1.3a or later is part of all distributions of LaTeX version 2003/12/01 or later.
 
 For error reports in case of UNCHANGED versions see the readme.txt file.
 
@@ -377,9 +385,9 @@ Comprehensive TeX Archive Network (CTAN).
 %    \changes{\fileversion}{\filedate}{Current version submitted to CTAN}
 %\title{The \pkgname{SIunits}\ package\thanks{This file has version number \fileversion{}, last revised
 %\filedate{} \packagemessage}\\{\large support for the \textsf{International System of Units}}}
-%\author{Marcel Heldoorn\thanks{Mail: Kennedylaan 24, NL-3844~BC Harderwijk, The~Netherlands}\\
-%\texttt{SIunits@webschool.nl}}
-%\date{File date \filedate{} ---  Printed \today}
+%\author{Marcel Heldoorn\thanks{Now maintained by Joseph Wright, e-mail: %
+%joseph.wright@morningstar2.co.uk}}
+%\date{File date \filedate}
 %\maketitle
 %
 %\begin{abstract}
@@ -413,7 +421,14 @@ Comprehensive TeX Archive Network (CTAN).
 %\end{abstract}
 %\newpage
 %\section*{What's new?}
-%\subsubsection*{New in version~\fileversion{}}
+%\subsubsection*{New in version~1.34}
+%\begin{enumerate}
+%  \item Maintainer is now Joseph Wright (\href{mailto:joseph.wright@morningstar2.co.uk}%
+%    {\texttt{joseph.wright@morningstar2.co.uk}})
+%  \item Bug fix for negative signs in textstyle mode
+%  \item License changed to LPPL 1.3 or later
+%\end{enumerate}
+%\subsubsection*{New in version~1.33}
 %\begin{enumerate}
 %\item Adaptive spacing of |\degree|, |\paminute|, |\arcminute|, |\pasecond| and |\arcsecond|: no space between quantity and unit.
 %\item Solved bug: extra space in ready to use ready-to-use units when using \opt{textstyle} option. Thanks to Svend Tollak Munkejord.
@@ -2146,11 +2161,19 @@ Comprehensive TeX Archive Network (CTAN).
 \DeclareRobustCommand*{\fourth}[1]{\power{#1}{4}}
 %    \end{macrocode}
 %    \end{macro}
+%\begin{macro}{\SIminus}
+%\changes{v1.34}{2007/11/22}{New macro}
+% To allow text-mode and maths-mode use, the appearance of the minus
+% sign needs to be controlled by a macro.
+%    \begin{macrocode}
+\DeclareRobustCommand*{\SIminus}{-}
+%    \end{macrocode}
+%\end{macro}
 %    The macros |\reciprocal|, |\rpsquare|, |\rpsquared|, |\rpcubic|, |\rpcubed| and |\rpfourth| provide the reciprocal (negative power): e.\,g.
 %    m\(^{-1}\), m\(^{-2}\), m\(^{-3}\) and m\(^{-4}\). |\rp| is a short form for |\reciprocal|.
 %    \begin{macro}{\reciprocal}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\reciprocal}[1]{\power{#1}{-1}}
+\DeclareRobustCommand*{\reciprocal}[1]{\power{#1}{\SIminus1}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rp}
@@ -2160,27 +2183,27 @@ Comprehensive TeX Archive Network (CTAN).
 %    \end{macro}
 %    \begin{macro}{\rpsquare}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpsquare}[1]{\power{#1}{-2}}
+\DeclareRobustCommand*{\rpsquare}[1]{\power{#1}{\SIminus2}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpsquared}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\mathrm{-2}}}}
+\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\mathrm{\SIminus2}}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpcubic}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpcubic}[1]{\power{#1}{-3}}
+\DeclareRobustCommand*{\rpcubic}[1]{\power{#1}{\SIminus3}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpcubed}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\mathrm{-3}}}}
+\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\mathrm{\SIminus3}}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpfourth}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpfourth}[1]{\power{#1}{-4}}
+\DeclareRobustCommand*{\rpfourth}[1]{\power{#1}{\SIminus4}}
 %    \end{macrocode}
 %    \end{macro}
 %    \subsection{SI decimal \textit{prefixes}}
@@ -3103,6 +3126,7 @@ Comprehensive TeX Archive Network (CTAN).
 %    \begin{macrocode}
 \DeclareOption{textstyle}{\renewcommand\SI@fstyle[1]{\@text{\protect#1}}%
 \@textstyletrue%
+\renewcommand*{\SIminus}{--}%
 \typeout{Option `textstyle' provided!}}
 %    \end{macrocode}
 %    \subsection{compatibility options}
diff --git a/Master/texmf-dist/source/latex/SIunits/SIunits.ins b/Master/texmf-dist/source/latex/SIunits/SIunits.ins
index f76ae845c76..28db400d00b 100644
--- a/Master/texmf-dist/source/latex/SIunits/SIunits.ins
+++ b/Master/texmf-dist/source/latex/SIunits/SIunits.ins
@@ -1,7 +1,11 @@
 %% LaTeX2e file `SIunits.ins'
 %% generated by the `filecontents' environment
-%% from source `SIunits' on 2002/08/01.
+%% from source `SIunits' on 2007/11/22.
 %%
+%% Note: This package is now maintained by Joseph Wright
+%% (joseph.wright@morningstar2.co.uk)
+%% Copyright 2007 Joseph Wright
+%% ---------------------------------------------------------------------
 %%
 %% SIunits.ins will generate the fast loadable files SIunits.sty and
 %% binary.sty, the documentation driver SIunits.drv and the configura-
@@ -11,12 +15,12 @@
 %% Copyright (C) 2001          Marcel Heldoorn
 %%
 %% This program may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.2
+%% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%   http://www.latex-project.org/lppl.txt
-%% and version 1.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
 %%
 %% NOTE:
 %% The LPPL about .ins files:
@@ -34,9 +38,9 @@
 Copyright (c) 1998-2002 Marcel Heldoorn <m.heldoorn@webschool.nl>.
 
 This program may be distributed and/or modified under the conditions of the LaTeX Project
-Public License, either version 1.2 of this license or (at your option) any later version.
+Public License, either version 1.3 of this license or (at your option) any later version.
 The latest version of this license is in http://www.latex-project.org/lppl.txt and
-version 1.2 or later is part of all distributions of LaTeX version 1999/12/01 or later.
+version 1.3a or later is part of all distributions of LaTeX version 2003/12/01 or later.
 
 For error reports in case of UNCHANGED versions see the readme.txt file.
 
diff --git a/Master/texmf-dist/tex/latex/SIunits/SIunits.sty b/Master/texmf-dist/tex/latex/SIunits/SIunits.sty
index 93925130f0e..7179336a1df 100644
--- a/Master/texmf-dist/tex/latex/SIunits/SIunits.sty
+++ b/Master/texmf-dist/tex/latex/SIunits/SIunits.sty
@@ -9,9 +9,9 @@
 %% Copyright (c) 1998-2002 Marcel Heldoorn <m.heldoorn@webschool.nl>.
 %% 
 %% This program may be distributed and/or modified under the conditions of the LaTeX Project
-%% Public License, either version 1.2 of this license or (at your option) any later version.
+%% Public License, either version 1.3 of this license or (at your option) any later version.
 %% The latest version of this license is in http://www.latex-project.org/lppl.txt and
-%% version 1.2 or later is part of all distributions of LaTeX version 1999/12/01 or later.
+%% version 1.3a or later is part of all distributions of LaTeX version 2003/12/01 or later.
 %% 
 %% For error reports in case of UNCHANGED versions see the readme.txt file.
 %% 
@@ -20,8 +20,8 @@
 %% 
 \def\SIunits@RCS$#1: #2 #3${#2}
 \def\filename{SIunits.dtx}%Source File Name
-\xdef\fileversion{\SIunits@RCS$Revision: 1.33 $}%Revision generated by CS-RCS
-\xdef\filedate{\SIunits@RCS$Date: 2002/08/01 11:20:00 $}%Date generated by CS-RCS
+\xdef\fileversion{\SIunits@RCS$Revision: 1.34 $}%Revision generated by CS-RCS
+\xdef\filedate{\SIunits@RCS$Date: 2007/11/22 11:20:00 $}%Date generated by CS-RCS
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
@@ -170,13 +170,14 @@
 \DeclareRobustCommand*{\cubic}[1]{\power{#1}{3}}
 \DeclareRobustCommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}
 \DeclareRobustCommand*{\fourth}[1]{\power{#1}{4}}
-\DeclareRobustCommand*{\reciprocal}[1]{\power{#1}{-1}}
+\DeclareRobustCommand*{\SIminus}{-}
+\DeclareRobustCommand*{\reciprocal}[1]{\power{#1}{\SIminus1}}
 \DeclareRobustCommand*{\rp}{\reciprocal}
-\DeclareRobustCommand*{\rpsquare}[1]{\power{#1}{-2}}
-\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\mathrm{-2}}}}
-\DeclareRobustCommand*{\rpcubic}[1]{\power{#1}{-3}}
-\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\mathrm{-3}}}}
-\DeclareRobustCommand*{\rpfourth}[1]{\power{#1}{-4}}
+\DeclareRobustCommand*{\rpsquare}[1]{\power{#1}{\SIminus2}}
+\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\mathrm{\SIminus2}}}}
+\DeclareRobustCommand*{\rpcubic}[1]{\power{#1}{\SIminus3}}
+\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\mathrm{\SIminus3}}}}
+\DeclareRobustCommand*{\rpfourth}[1]{\power{#1}{\SIminus4}}
 \addprefix{\yocto}{y}
 \addprefix{\zepto}{z}
 \addprefix{\atto}{a}
@@ -533,6 +534,7 @@
 \DeclareOption{thinqspace}{\@thinqspace{Option `thinqspace' provided!}}
 \DeclareOption{textstyle}{\renewcommand\SI@fstyle[1]{\@text{\protect#1}}%
 \@textstyletrue%
+\renewcommand*{\SIminus}{--}%
 \typeout{Option `textstyle' provided!}}
 \DeclareOption{amssymb}{\@redefsquaretrue%
 \typeout{Option `amssymb' provided!}}
diff --git a/Master/texmf-dist/tex/latex/SIunits/binary.sty b/Master/texmf-dist/tex/latex/SIunits/binary.sty
index 5ef6a51bd3a..2af61aaae88 100644
--- a/Master/texmf-dist/tex/latex/SIunits/binary.sty
+++ b/Master/texmf-dist/tex/latex/SIunits/binary.sty
@@ -9,9 +9,9 @@
 %% Copyright (c) 1998-2002 Marcel Heldoorn <m.heldoorn@webschool.nl>.
 %% 
 %% This program may be distributed and/or modified under the conditions of the LaTeX Project
-%% Public License, either version 1.2 of this license or (at your option) any later version.
+%% Public License, either version 1.3 of this license or (at your option) any later version.
 %% The latest version of this license is in http://www.latex-project.org/lppl.txt and
-%% version 1.2 or later is part of all distributions of LaTeX version 1999/12/01 or later.
+%% version 1.3a or later is part of all distributions of LaTeX version 2003/12/01 or later.
 %% 
 %% For error reports in case of UNCHANGED versions see the readme.txt file.
 %% 
@@ -20,8 +20,8 @@
 %% 
 \def\SIunits@RCS$#1: #2 #3${#2}
 \def\filename{SIunits.dtx}%Source File Name
-\xdef\fileversion{\SIunits@RCS$Revision: 1.33 $}%Revision generated by CS-RCS
-\xdef\filedate{\SIunits@RCS$Date: 2002/08/01 11:20:00 $}%Date generated by CS-RCS
+\xdef\fileversion{\SIunits@RCS$Revision: 1.34 $}%Revision generated by CS-RCS
+\xdef\filedate{\SIunits@RCS$Date: 2007/11/22 11:20:00 $}%Date generated by CS-RCS
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]