SIstyle 2.1

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

1 files changed, 34 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty b/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty
index 3903be6c4df..b1828606b12 100644
--- a/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty
+++ b/Master/texmf-dist/tex/latex/SIstyle/sistyle.sty
@@ -5,23 +5,33 @@
 %% The original source files were:
 %%
 %% sistyle.dtx  (with options: `package')
-%% Author: Danie Els (dnjels@sun.ac.za)
 %% 
-%% Copyright 2004 by Danie Els. All rights reserved.
+%% -------------------------------------------------------------------
+%%                    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.3 of this
-%% license or (at your option) any later version. The latest version
-%% of the license is in
-%%      http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% 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/
+%% 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 "author-maintained".
+%% This Current Maintainer of this work is Danie Els (dnjels@sun.ac.za)
+%% ---------------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{sistyle}
-   [2004/07/09  v2.0  SI units and numbers (DNJ Els)]
+   [2006/07/11  v2.1  SI units and numbers (DNJ Els)]
 \RequirePackage{amstext}
 \begingroup
    \catcode`\Q=3
@@ -48,9 +58,15 @@
       #1\else #2\fi}
 \newif\ifSIobeybold
 \SIobeyboldfalse
-\newcommand*{\SI@defaultMfam}{\mathrm}
+\newcommand*{\SI@mathrm}{\mathrm}
+\newcommand*{\SI@mathsf}{\mathsf}
+\newcommand*{\SI@mathtt}{\mathtt}
+\newcommand*{\SImathrm}[1]{\renewcommand*{\SI@mathrm}{#1}}
+\newcommand*{\SImathsf}[1]{\renewcommand*{\SI@mathsf}{#1}}
+\newcommand*{\SImathtt}[1]{\renewcommand*{\SI@mathtt}{#1}}
+\newcommand*{\SI@defaultMfam}{\SI@mathrm}
 \newcommand*{\SIdefaultMfam}[1]{\renewcommand*{\SI@defaultMfam}{#1}}
-\newcommand*{\SI@defaultNfam}{\mathrm}
+\newcommand*{\SI@defaultNfam}{\SI@mathrm}
 \newcommand*{\SIdefaultNfam}[1]{\renewcommand*{\SI@defaultNfam}{#1}}
 \newcommand*{\SI@defaultTfam}{\rmfamily}
 \newcommand*{\SIdefaultTfam}[1]{\renewcommand*{\SI@defaultTfam}{#1}}
@@ -65,10 +81,10 @@
    \ifmmode
       \ifdim\displaywidth>0pt\relax%--- DISPLAY MATH ------------
          \ifnum\the\fam=\SI@sffam
-            \let\SI@mfam=\mathsf
+            \let\SI@mfam=\SI@mathsf
             \let\SI@tfam=\sffamily
          \else \ifnum\the\fam=\SI@ttfam
-            \let\SI@mfam=\mathtt
+            \let\SI@mfam=\SI@mathtt
             \let\SI@tfam=\ttfamily
          \else
             \let\SI@mfam=#1%
@@ -78,10 +94,10 @@
                  {\def\SI@bold{\mdseries}}%
       \else%--- INLINE MATH ----------
          \ifx\f@family\temp@sf
-            \let\SI@mfam=\mathsf
+            \let\SI@mfam=\SI@mathsf
             \let\SI@tfam=\sffamily
          \else\ifx\f@family\temp@tt
-            \let\SI@mfam=\mathtt
+            \let\SI@mfam=\SI@mathtt
             \let\SI@tfam=\ttfamily
          \else
             \let\SI@mfam=#1%
@@ -92,10 +108,10 @@
       \fi
    \else%----- NORMAL TEXT --------------
       \ifx\f@family\temp@sf
-         \let\SI@mfam=\mathsf
+         \let\SI@mfam=\SI@mathsf
          \let\SI@tfam=\sffamily
       \else\ifx\f@family\temp@tt
-         \let\SI@mfam=\mathtt
+         \let\SI@mfam=\SI@mathtt
          \let\SI@tfam=\ttfamily
       \else
          \let\SI@mfam=#1%