SIunits 1.35 (24nov07)

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

7 files changed, 88 insertions, 139 deletions

diff --git a/Master/texmf-dist/doc/latex/SIunits/README b/Master/texmf-dist/doc/latex/SIunits/README
index f9c213c0229..2f2249a22a2 100644
--- a/Master/texmf-dist/doc/latex/SIunits/README
+++ b/Master/texmf-dist/doc/latex/SIunits/README
@@ -1,61 +1,36 @@
-Note: This package is now maintained by Joseph Wright
-(joseph.wright@morningstar2.co.uk)
-Copyright 2007 Joseph Wright
------------------------------------------------------------------------
-
-README for the package SIunits
-
-
-License
-=======
-
-The files in this directory (./SIunits) are Copyright 2000-2002 Marcel Heldoorn,
-<SIunits@webschool.nl>.
-
-
-The files associated with the SIunits package (see below for a list) 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. 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.
-
-
-Files distributed with this package
-===================================
-
-SIunits.ins         This is the installation script that will
-                    produce the style file SIunits.sty when
-                    run through LaTeX or TeX.
-SIunits.dtx         Documented source file of the SIunits package.
-SIunits.pdf         Complete manual with source code of SIunits.
-readme.txt          This file.
-
-All files in the SIunits package may be distributed under the
-terms of the LaTeX Project Public License.
-
-
-What is new in this version?
-============================
-
-See page 2 of the documentation (SIunits.pdf).
-
-
-Known problems and limitations
-==============================
-See section 8.2 of the documentation (SIunits.pdf).
-
-
-Bug reports/suggestions
-=======================
-
-Please send customised, renamed files to me by e-mail. In that
-way your improvements/customizations can end up in next version
-of the SIunits package (with your names mentioned, of course).
-
-Please send error reports and suggestions for improvements to:
-
- Marcel Heldoorn
- <SIunits@webschool.nl>
-
-
-                                                    <MH>
+The SIunits package - Consistent application of SI units
+
+----------------------------------------------------------------
+Maintained by Joseph A. Wright
+E-mail: joseph.wright@morningstar2.co.uk
+Originally developed by Marcel Heldoorn
+ (c) 2000-2002 Marcel Heldoorn
+ (c) 2007 Joseph Wright
+Released under the LaTeX Project Public license v1.3 or later
+----------------------------------------------------------------
+
+The Systeme International d'Unites (SI), the modern form of the
+metric system, is the most widely used system of units and measures
+around the world. But despite this there is widespread misuse of the
+system with incorrect names and symbols used as a matter a course -
+even by well educated and trained people who should know better. For
+example how often do we see: mHz, Mhz or mhz written when referring
+to computer clock rates? The correct form is actually MHz. Note
+the capitalisation does matter.
+
+Hence, a clear system for the use of units is needed, satisfying the
+next principles:
+1) the system should consist of measuring units based on unvariable
+  quantities in nature;
+2) all units other than the base units should be derived from these
+  base units; and
+3) multiples and submultiples of the units should be decimal.
+
+The name Systeme International d'Unites (International System of
+Units) with the international abbreviation SI was adopted by the
+Conference Generale des Poids et Mesures (CGPM) in 1960. It is a
+coherent system based on seven base units (CGPM 1960 and 1971).
+
+The SIunits package can be used to standardise the use of units in
+your writings.  Most macros are easily adaptable to personal
+preferences. However, you are welcome to suggest any improvements.
diff --git a/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf b/Master/texmf-dist/doc/latex/SIunits/SIunits.pdf
index 1a0fb0e678f..0500bf11676 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.drv b/Master/texmf-dist/source/latex/SIunits/SIunits.drv
index 60c630a5c4e..f1d41bedccd 100644
--- a/Master/texmf-dist/source/latex/SIunits/SIunits.drv
+++ b/Master/texmf-dist/source/latex/SIunits/SIunits.drv
@@ -1,3 +1,5 @@
+\immediate\write18{makeindex -s gind.ist -o \jobname.ind  \jobname.idx}
+\immediate\write18{makeindex -s gglo.ist -o \jobname.gls  \jobname.glo}
 \documentclass[a4paper]{ltxdoc}
 \IfFileExists{hyperref.sty} {\usepackage{hyperref}}{\relax}
  \IfFileExists{SIunits.sty}
diff --git a/Master/texmf-dist/source/latex/SIunits/SIunits.dtx b/Master/texmf-dist/source/latex/SIunits/SIunits.dtx
index 465394cfc14..4924b360f3e 100644
--- a/Master/texmf-dist/source/latex/SIunits/SIunits.dtx
+++ b/Master/texmf-dist/source/latex/SIunits/SIunits.dtx
@@ -42,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.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>\xdef\fileversion{\SIunits@RCS$Revision: 1.35 $}%Revision generated by CS-RCS
+%<+package|binary>\xdef\filedate{\SIunits@RCS$Date: 2007/11/24 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]
@@ -194,6 +194,8 @@ Comprehensive TeX Archive Network (CTAN).
 \end{filecontents}
 %</batchfile>
 %<*driver>
+\immediate\write18{makeindex -s gind.ist -o \jobname.ind  \jobname.idx}
+\immediate\write18{makeindex -s gglo.ist -o \jobname.gls  \jobname.glo}
 \documentclass[a4paper]{ltxdoc}
 \IfFileExists{hyperref.sty} {\usepackage{hyperref}}{\relax}
  \IfFileExists{SIunits.sty}
@@ -384,7 +386,7 @@ Comprehensive TeX Archive Network (CTAN).
 %\GetFileInfo{SIunits.sty}
 %    \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}}}
+%\filedate{} \packagemessage}\\{Consistent application of SI units}}
 %\author{Marcel Heldoorn\thanks{Now maintained by Joseph Wright, e-mail: %
 %joseph.wright@morningstar2.co.uk}}
 %\date{File date \filedate}
@@ -416,54 +418,23 @@ Comprehensive TeX Archive Network (CTAN).
 %The \pkgname{SIunits}\ package can be used to standardise the use of units in your
 %writings. Most macros are easily adaptable to personal preferences. However, you are
 %welcome (and strongly invited\footnote{There is an enormous \LaTeX\ Knowledge Base out
-%there.}) to suggest any improvements. \\*[3mm] {\itshape Enjoy the \pkgname{SIunits}\
-%package!\raisebox{-\baselineskip}[0pt][0pt]{marcel h.}}
+%there.}) to suggest any improvements.
 %\end{abstract}
 %\newpage
 %\section*{What's new?}
+%\subsubsection*{New in version~1.35}
+%\begin{enumerate}
+%  \item Improved \cs{elecronvolt} appearance\footnote{All changes for this version suggested by Philip Ratcliffe}
+%  \item Added \cs{dalton}, \cs{atomicmassunit} units (both formally non-SI)
+%  \item Minor improvements to the documentation
+%\end{enumerate}
 %\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 Bug fix for negative signs in textstyle mode\footnote{Thanks to Stefan Pinnow}
 %  \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.
-%\item Option \opt{italian} added to solve interference problem with the babel package and language italian: Babel defines |\unit|. When using the option \opt{italian}, use |\unita| instead.  Thanks to Lorenzo Cappelletti and Luca Rossato.
-%\end{enumerate}
-%\subsubsection*{New in version~1.\textit{x}}
-%\begin{enumerate}
-%\item \pkgname{binary.sty} style with binary prefixes and units added (see table~\ref{table:bipre});
-%\item \pkgname{binary.sty} can be loaded by using the \opt{binary} package option (see page~\pageref{sec:options});
-%\item unit \cmd{\one} added: the derived unit for a derived quantity of dimension one is also the number one;
-%\item In the |pstricks| package the command |\gray| is defined. This will cause error messages
-%when the |pstricks| package is used in combination with the \pkgname{SIunits}\ package. To prevent
-%errors one can choose two different options:
-%\begin{labeling}{\hspace{15mm}}
-%\item[\opt{pstricks}]This option redefines the \texttt{pstricks} command |\gray| to get the desired
-%\pkgname{SIunits}\ definition of the command.\\ \textbf{Note: }When using this option, the \texttt{pstricks} command
-%|\gray| is \textbf{redefined}.
-%\item[\opt{Gray}]This option defines a new command |\Gray| that can be used instead of the
-%\pkgname{SIunits}\ command |\gray|.\\ \textbf{Note: }When using this option,
-%|\gray| is defined in the \texttt{pstricks} package.
-%\end{labeling}
-%\item   When using the option \opt{textstyle} units are printed in the typeface of the
-%enclosing text, automatically.
-%\item the . (period) was made active in the second argument of the \cmd{\unit} macro: it will act like a unit skip
-%(\cmd{\usk}), \fe  use |\unit{1}{\newton.\metre}| instead of |\unit{1}{\newton\usk\metre}|.
-%\item \cmd{\katal} added: ``\textit{The 21st Conf\'{e}rence G\'{e}n\'{e}rale des Poids et Mesures decides to adopt the special name katal,
-%   symbol \katal, for the SI unit mole per second to express catalytic activity, especially
-%   in the fields of medicine and biochemistry, ...}" (21th CGPM (1999), Resolution 12).
-%\item The ready-to-use units used \cmd{\square} instead of \cmd{\squaren} when using the option \opt{squaren}. \textsf{Fixed!}
-%\item Fixed index and change history generation error.
-%\item Documentation update: implementation of \textit{SI-brochure Supplement 2000}.
-%\item Documentation updated/corrected: table heads.
-%\item E-mail changed: \texttt{SIunits@webschool.nl}
-%\item Solved bug: Defining units using |\addunit| in combination with the \opt{cdot} and \opt{textstyle} options. Thanks to Michael M\"{u}ller.
-%\end{enumerate}
 %\newpage\tableofcontents\newpage
 %\section{Introduction}
 %
@@ -1298,9 +1269,9 @@ Comprehensive TeX Archive Network (CTAN).
 %    \usepackage[options]{SIunits}
 %
 %    \begin{document}
-%    \ldots
+%    ...
 %    \SIunits[options]
-%    \ldots
+%    ...
 %    \end{document}
 %    \end{verbatim}
 %
@@ -1732,23 +1703,8 @@ Comprehensive TeX Archive Network (CTAN).
 %    \item \textsf{David Barlett},
 %    \textit{The Metric System: a concise reference guide:} \\ |http://subnet.virtual-pc.com/ba424872/|
 %    \end{enumerate}
-%    \subsection{Bye}
-%    I hope that some users will find the package
-%    useful and not too bugful. :--) \\Comments and suggestions
-%    for improvements are always most welcome!\\*[3mm]
-%    {\itshape \LaTeX, enjoy it! \raisebox{-\baselineskip}[0pt][0pt]{marcel h.}}
-%    \StopEventually{\vfill\hfill\scriptsize Copyright \copyright 2001 Marcel Heldoorn.
-%    \vspace{1cm}
-%
-%
-%    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.
-%    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.}
-%    \newpage
+%    \StopEventually{}
+%
 %    \section{The Magic Code}
 %    \subsection{Hello world}
 %    \iffalse
@@ -2140,10 +2096,11 @@ Comprehensive TeX Archive Network (CTAN).
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\squared}
+%\changes{v1.35}{2007/11/24}{Bug fix for textstyle mode}
 %    The above example can be realised in a more intuitive way: |\square\metre|: m\(^{2}\).
 %    The same goes for |\cubic| \& |\fourth|: m\(^{3}\) \& m\(^{4}\).
 %    \begin{macrocode}
-\DeclareRobustCommand*{\squared}{\ensuremath{^{\mathrm{2}}}}
+\DeclareRobustCommand*{\squared}{\ensuremath{^{\SI@fstyle{2}}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\cubic}
@@ -2152,8 +2109,9 @@ Comprehensive TeX Archive Network (CTAN).
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\cubed}
+%\changes{v1.35}{2007/11/24}{Bug fix for textstyle mode}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}
+\DeclareRobustCommand*{\cubed}{\ensuremath{^{\SI@fstyle{3}}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\fourth}
@@ -2187,18 +2145,19 @@ Comprehensive TeX Archive Network (CTAN).
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpsquared}
+%\changes{v1.35}{2007/11/24}{Bug fix for textstyle mode}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\mathrm{\SIminus2}}}}
+\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\SI@fstyle{\SIminus2}}}}
 %    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\rpcubic}
+%    \end%    \begin{macro}{\rpcubic}
 %    \begin{macrocode}
 \DeclareRobustCommand*{\rpcubic}[1]{\power{#1}{\SIminus3}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpcubed}
+%\changes{v1.35}{2007/11/24}{Bug fix for textstyle mode}
 %    \begin{macrocode}
-\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\mathrm{\SIminus3}}}}
+\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\SI@fstyle{\SIminus3}}}}
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\rpfourth}
@@ -2713,16 +2672,25 @@ Comprehensive TeX Archive Network (CTAN).
 %    \end{macro}
 %    \paragraph{Energy} electronvolt --- \electronvolt
 %    \begin{macro}{\electronvolt}
+%\changes{v1.35}{2007/11/23}{Improved appearance}
 %    \begin{macrocode}
-\addunit{\electronvolt}{e\volt}
+\addunit{\electronvolt}{e\kern-0.05ex\volt}
 %    \end{macrocode}
 %    \end{macro}
 %    \paragraph{Unified atomic mass unit} atomic mass --- \atomicmass
 %    \begin{macro}{\atomicmass}
+%    \begin{macro}{\atomicmassunit}
+%\changes{v1.35}{2007/11/23}{New unit}
+%    \begin{macro}{\dalton}
+%\changes{v1.35}{2007/11/23}{New unit}
 %    \begin{macrocode}
 \addunit{\atomicmass}{u}
+\addunit{\atomicmassunit}{u}
+\addunit{\dalton}{Da}
 %    \end{macrocode}
 %    \end{macro}
+%    \end{macro}
+%    \end{macro}
 %    \paragraph{Area} are --- \are; hectare --- \hectare; barn --- \barn
 %    \begin{macro}{\are}
 %    \begin{macrocode}
@@ -3090,6 +3058,7 @@ Comprehensive TeX Archive Network (CTAN).
 \addunit{\kilogrampersecondcubicmetre}{\kilogram\per\second\usk\cubicmetre}
 \addunit{\kilogrampersecondcubicmetrenp}{\kilogram\usk\reciprocal\second\usk\rpcubic\metre}
 %    \end{macrocode}
+
 %  \subsection{Option handling}
 %  \changes{v0.99}{1999/07/23}{LaTeX2e option handling implemented.}
 %    \DescribeMacro{Options}
diff --git a/Master/texmf-dist/source/latex/SIunits/SIunits.ins b/Master/texmf-dist/source/latex/SIunits/SIunits.ins
index 28db400d00b..765f406c8f9 100644
--- a/Master/texmf-dist/source/latex/SIunits/SIunits.ins
+++ b/Master/texmf-dist/source/latex/SIunits/SIunits.ins
@@ -1,6 +1,6 @@
 %% LaTeX2e file `SIunits.ins'
 %% generated by the `filecontents' environment
-%% from source `SIunits' on 2007/11/22.
+%% from source `SIunits' on 2007/11/24.
 %%
 %% Note: This package is now maintained by Joseph Wright
 %% (joseph.wright@morningstar2.co.uk)
diff --git a/Master/texmf-dist/tex/latex/SIunits/SIunits.sty b/Master/texmf-dist/tex/latex/SIunits/SIunits.sty
index 7179336a1df..65cefad8627 100644
--- a/Master/texmf-dist/tex/latex/SIunits/SIunits.sty
+++ b/Master/texmf-dist/tex/latex/SIunits/SIunits.sty
@@ -20,8 +20,8 @@
 %% 
 \def\SIunits@RCS$#1: #2 #3${#2}
 \def\filename{SIunits.dtx}%Source File Name
-\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
+\xdef\fileversion{\SIunits@RCS$Revision: 1.35 $}%Revision generated by CS-RCS
+\xdef\filedate{\SIunits@RCS$Date: 2007/11/24 11:20:00 $}%Date generated by CS-RCS
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
@@ -166,17 +166,17 @@
       \square{#1}%
      \fi %\if@defsquaren
     }
-\DeclareRobustCommand*{\squared}{\ensuremath{^{\mathrm{2}}}}
+\DeclareRobustCommand*{\squared}{\ensuremath{^{\SI@fstyle{2}}}}
 \DeclareRobustCommand*{\cubic}[1]{\power{#1}{3}}
-\DeclareRobustCommand*{\cubed}{\ensuremath{^{\mathrm{3}}}}
+\DeclareRobustCommand*{\cubed}{\ensuremath{^{\SI@fstyle{3}}}}
 \DeclareRobustCommand*{\fourth}[1]{\power{#1}{4}}
 \DeclareRobustCommand*{\SIminus}{-}
 \DeclareRobustCommand*{\reciprocal}[1]{\power{#1}{\SIminus1}}
 \DeclareRobustCommand*{\rp}{\reciprocal}
 \DeclareRobustCommand*{\rpsquare}[1]{\power{#1}{\SIminus2}}
-\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\mathrm{\SIminus2}}}}
+\DeclareRobustCommand*{\rpsquared}{\ensuremath{^{\SI@fstyle{\SIminus2}}}}
 \DeclareRobustCommand*{\rpcubic}[1]{\power{#1}{\SIminus3}}
-\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\mathrm{\SIminus3}}}}
+\DeclareRobustCommand*{\rpcubed}{\ensuremath{^{\SI@fstyle{\SIminus3}}}}
 \DeclareRobustCommand*{\rpfourth}[1]{\power{#1}{\SIminus4}}
 \addprefix{\yocto}{y}
 \addprefix{\zepto}{z}
@@ -397,8 +397,10 @@
 \addunit{\arad}{rd}
 \addunit{\rem}{rem}
 \addunit{\roentgen}{R}
-\addunit{\electronvolt}{e\volt}
+\addunit{\electronvolt}{e\kern-0.05ex\volt}
 \addunit{\atomicmass}{u}
+\addunit{\atomicmassunit}{u}
+\addunit{\dalton}{Da}
 \addunit{\are}{a}
 \addunit{\hectare}{\hecto\are}
 \addunit{\barn}{b}
@@ -525,6 +527,7 @@
 \addunit{\rpcubicmetrepersecond}{\cubicmetre\usk\reciprocal\second}
 \addunit{\kilogrampersecondcubicmetre}{\kilogram\per\second\usk\cubicmetre}
 \addunit{\kilogrampersecondcubicmetrenp}{\kilogram\usk\reciprocal\second\usk\rpcubic\metre}
+
 \DeclareOption{cdot}{\@cdot{Option `cdot' provided!}}
 \DeclareOption{thickspace}{\@thickspace{Option `thickspace' provided!}}
 \DeclareOption{mediumspace}{\@mediumspace{Option `mediumspace' provided!}}
diff --git a/Master/texmf-dist/tex/latex/SIunits/binary.sty b/Master/texmf-dist/tex/latex/SIunits/binary.sty
index 2af61aaae88..a98416bd328 100644
--- a/Master/texmf-dist/tex/latex/SIunits/binary.sty
+++ b/Master/texmf-dist/tex/latex/SIunits/binary.sty
@@ -20,8 +20,8 @@
 %% 
 \def\SIunits@RCS$#1: #2 #3${#2}
 \def\filename{SIunits.dtx}%Source File Name
-\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
+\xdef\fileversion{\SIunits@RCS$Revision: 1.35 $}%Revision generated by CS-RCS
+\xdef\filedate{\SIunits@RCS$Date: 2007/11/24 11:20:00 $}%Date generated by CS-RCS
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]