6 files changed, 68 insertions, 65 deletions
diff --git a/Master/texmf-dist/doc/latex/SIstyle/README b/Master/texmf-dist/doc/latex/SIstyle/README
index 600b101529e..ceeffcd35c0 100644
--- a/Master/texmf-dist/doc/latex/SIstyle/README
+++ b/Master/texmf-dist/doc/latex/SIstyle/README
@@ -2,7 +2,7 @@
               for SI units and number typesetting
 
                      Author:   Danie Els
-                     Copyright (c) 2004-2006 Danie Els
+                     Copyright (c) 2004-2008 Danie Els
                      Licence:  LaTeX Project Public License
 
 DESCRIPTION
@@ -48,7 +48,7 @@ INSTALLATION
 
     -- USER DOCUMENTATION --
 
-       <texmf>\doc\latex\SIstyle\SIstyle-2.3.pdf
+       <texmf>\doc\latex\SIstyle\SIstyle-2.3a.pdf
 
        The user manual for SIstyle package was produced by executing:
 
diff --git a/Master/texmf-dist/doc/latex/SIstyle/SIstyle-2.3.pdf b/Master/texmf-dist/doc/latex/SIstyle/SIstyle-2.3.pdf
deleted file mode 100644
index 1cb855e6bad..00000000000
--- a/Master/texmf-dist/doc/latex/SIstyle/SIstyle-2.3.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/SIstyle/SIstyle-2.3a.pdf b/Master/texmf-dist/doc/latex/SIstyle/SIstyle-2.3a.pdf
new file mode 100644
index 00000000000..d03bb641abe
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/SIstyle/SIstyle-2.3a.pdf
diff --git a/Master/texmf-dist/source/latex/SIstyle/sistyle.dtx b/Master/texmf-dist/source/latex/SIstyle/sistyle.dtx
index bb0b447a4cf..d9c5872b8ad 100644
--- a/Master/texmf-dist/source/latex/SIstyle/sistyle.dtx
+++ b/Master/texmf-dist/source/latex/SIstyle/sistyle.dtx
@@ -1,36 +1,32 @@
-% \iffalse
+% \iffalse  meta-comment
+%
+% sistyle.dtx
+% Copyright (C) 2004--2008 Danie Els
+%
 % -------------------------------------------------------------------
 %                    The SIstyle package
 %              for SI units and number typesetting
 % -------------------------------------------------------------------
-%
-% File:   sistyle.dtx
-% Author: Danie Els (dnjels@sun.ac.za)
-%
-% Documentation  and Source file for this package to use with LaTeX2e
-%
-%       Copyright (C) 2004-2006 Danie Els
-%       All rights reserved.
-%
 % This work may be distributed and/or modified under the conditions
 % of the LaTeX Project Public License, either version 1.3c of this
 % license or (at your option) any later version. The latest version
-% of the license is in
-%      http://www.latex-project.org/lppl
+% of this license is in
+%      http://www.latex-project.org/lppl.txt
 % and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 %
-% This work has the LPPL maintenance status `maintained'.
+% This work has the LPPL maintenance status 'maintained'.
 %
 % This Current Maintainer of this work is Danie Els (dnjels@sun.ac.za)
 %
-% This package consists of the files sistyle.dtx and sistyle.ins as
-% well as the derived file sistyle.sty. See the file 'readme.txt'
-% for a list of all the files as well as directions for the
-% installation of this package.
+% This package consists of the files: sistyle.dtx
+%                                     sistyle.ins
+%              and the derived file:  sistyle.sty
 % -------------------------------------------------------------------
 % \fi
 %
+%
+%
 % \CheckSum{830}
 %
 % \CharacterTable
@@ -57,14 +53,14 @@
 %<package>\ProvidesPackage{sistyle}
 %<driver>\ProvidesFile{sistyle.drv}
 %\ProvidesFile{sistyle.dtx}
-   [2006/12/20  v2.3  SI units and numbers (DNJ Els)]
+   [2008/07/16  v2.3a  SI units and numbers (DNJ Els)]
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
 \usepackage{calc}
 \usepackage{amsmath}
-\usepackage[T1]{fontenc}
+%\usepackage[T1]{fontenc}
 \usepackage{textcomp}
-\usepackage{lmodern}
+%\usepackage{lmodern}
 \usepackage{sistyle}
   \SIdefaultNfam{\mathnormal}
   \SIdefaultMfam{\mathrm}
@@ -93,6 +89,7 @@
 % \changes{v2.1}{2006/07/09}{Add user definable commands for \cs{mathrm}, \cs{mathsf}, \cs{mathtt}}
 % \changes{v2.2}{2006/12/14}{Correct bug in \cs{ang} when French package is loaded}
 % \changes{v2.3}{2006/12/20}{Make \cs{ang} work in side commands when ; is active}
+% \changes{v2.3a}{2008/07/16}{Final version}
 %
 %
 %  \DoNotIndex{\,}
@@ -342,6 +339,21 @@
 %    that the user makes a thorough study of SP 811 or the equivalent
 %    specification for his or her country.
 % \end{abstract}
+% \vspace{1cm}
+%
+% \begin{center}
+% \begin{tabular}{|p{0.6\hsize}|}
+% \hline
+%      \texttt{SIstyle v2.3} is the final version of this package.
+%      No new features will be added in the future. The packages
+%      will be maintained and bugs will be fixed.\\ \\
+%
+%      All future development will be done in the \texttt{siunitx}
+%      package.\\
+% \hline
+% \end{tabular}
+% \end{center}
+%
 %
 %^^A==== Contents ===================================================
 %
diff --git a/Master/texmf-dist/source/latex/SIstyle/sistyle.ins b/Master/texmf-dist/source/latex/SIstyle/sistyle.ins
index aeb623357ff..5c5e15ff476 100644
--- a/Master/texmf-dist/source/latex/SIstyle/sistyle.ins
+++ b/Master/texmf-dist/source/latex/SIstyle/sistyle.ins
@@ -1,66 +1,57 @@
+% sistyle.ins
+% Copyright (C) 2004--2008 Danie Els
+%
 % -------------------------------------------------------------------
 %                    The SIstyle package
 %              for SI units and number typesetting
 % -------------------------------------------------------------------
-%
-% File:   sistyle.ins
-% Author: Danie Els (dnjels@sun.ac.za)
-%
-% This file will generate fast loadable files and documentation
-% driver files from the doc files in this package when run through
-% LaTeX or TeX.
-%
-%       Copyright (C) 2004-2006 Danie Els
-%       All rights reserved.
-%
 % This work may be distributed and/or modified under the conditions
 % of the LaTeX Project Public License, either version 1.3c of this
 % license or (at your option) any later version. The latest version
-% of the license is in
-%       http://www.latex-project.org/lppl
+% of this license is in
+%      http://www.latex-project.org/lppl.txt
 % and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 %
-% This work has the LPPL maintenance status "author-maintained".
+% This work has the LPPL maintenance status 'maintained'.
 %
-% The Current Maintainer of this work Danie Els (dnjels@sun.ac.za).
+% This Current Maintainer of this work is Danie Els (dnjels@sun.ac.za)
 %
-% This package consists of the files sistyle.dtx and sistyle.ins as
-% well as the derived file sistyle.sty. See the file 'readme.txt'
-% for a list of all the files as well as directions for the
-% installation of this package.
+% This package consists of the files: sistyle.dtx
+%                                     sistyle.ins
+%              and the derived file:  sistyle.sty
 % -------------------------------------------------------------------
 
 
 \def\batchfile{sistyle.ins}
-\def\filedate{2006/07/11}
+\def\filedate{2008/07/16}
 \input docstrip.tex
 \keepsilent
 
 \declarepreamble\DNJEpreamble
 
+Copyright (C) 2004--2008 Danie Els
+
 -------------------------------------------------------------------
                    The SIstyle package
              for SI units and number typesetting
 -------------------------------------------------------------------
-
-Author: Danie Els
-
-        Copyright (C) 2004-2006 Danie Els
-        All rights reserved.
-
 This work may be distributed and/or modified under the conditions
 of the LaTeX Project Public License, either version 1.3c of this
-license or (at your option) any later version.  The latest version
-of this license is in:
-       http://www.latex-project.org/lppl/
+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.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
-This work has the LPPL maintenance status `maintained'.
+This work has the LPPL maintenance status 'maintained'.
 
 This Current Maintainer of this work is Danie Els (dnjels@sun.ac.za)
----------------------------------------------------------------------
+
+This package consists of the files: sistyle.dtx
+                                    sistyle.ins
+             and the derived file:  sistyle.sty
+-------------------------------------------------------------------
 
 \endpreamble
 
diff --git a/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty b/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty
index 1526f83297b..b5e77609f80 100644
--- a/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty
+++ b/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty
@@ -6,32 +6,32 @@
 %%
 %% sistyle.dtx  (with options: `package')
 %% 
+%% Copyright (C) 2004--2008 Danie Els
+%% 
 %% -------------------------------------------------------------------
 %%                    The SIstyle package
 %%              for SI units and number typesetting
 %% -------------------------------------------------------------------
-%% 
-%% Author: Danie Els
-%% 
-%%         Copyright (C) 2004-2006 Danie Els
-%%         All rights reserved.
-%% 
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3c of this
-%% license or (at your option) any later version.  The latest version
-%% of this license is in:
-%%        http://www.latex-project.org/lppl/
+%% 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.3c or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 %% 
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status 'maintained'.
 %% 
 %% This Current Maintainer of this work is Danie Els (dnjels@sun.ac.za)
-%% ---------------------------------------------------------------------
+%% 
+%% This package consists of the files: sistyle.dtx
+%%                                     sistyle.ins
+%%              and the derived file:  sistyle.sty
+%% -------------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{sistyle}
-   [2006/12/20  v2.3  SI units and numbers (DNJ Els)]
+   [2008/07/16  v2.3a  SI units and numbers (DNJ Els)]
 \RequirePackage{amstext}
 \newif\ifSI@eTeX
 \SI@eTeXfalse