siunitx update (13oct08)

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

1 files changed, 34 insertions, 25 deletions

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 6ee9a86e7c9..0be5011f084 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -222,7 +222,7 @@ dcolumn, rccol and numprint packages.
 %</driver>
 % \fi
 %
-%\CheckSum{10072}
+%\CheckSum{10084}
 %
 % \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
@@ -3314,7 +3314,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/09/28 v1.1a A comprehensive (SI) units package]
+  [2008/10/13 v1.1b A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -9686,6 +9686,7 @@ author.
 %\end{macro}
 %\end{macro}
 %\begin{macro}{\si@unt@addtostack}
+%\changes{v1.1b}{2008/10/12}{Added warning for multiple prefixes}
 %\darg{type}
 %\darg{token}
 % By indicating the type of data to be added to the stack, problems
@@ -9699,6 +9700,11 @@ author.
 %    \begin{macrocode}
   \expandafter\ifx
     \csname si@unt@lastadd\si@unt@checkstack\endcsname\si@tempa
+      \renewcommand*{\si@tempa}{prefix}%
+      \expandafter\ifx\csname si@unt@lastadd\si@unt@checkstack
+        \endcsname\si@tempa
+        \si@log@warn{Two prefixes found: only first printed}%
+      \fi
     \expandafter\@gobbletwo
   \else
     \expandafter\si@unt@preplussp
@@ -10066,6 +10072,7 @@ author.
 %\end{macro}
 %\end{macro}
 %\begin{macro}{\Square}
+%\changes{v1.1b}{2008/10/12}{Only defined if not otherwise available}
 %\begin{macro}{\ssquare}
 %\begin{macro}{\squared}
 %\begin{macro}{\cubic}
@@ -10073,7 +10080,9 @@ author.
 % Unlike multiples (which can be skipped if needed), the basic powers
 % are also always defined.
 %    \begin{macrocode}
-\newpower{\Square}{2}
+\AtBeginDocument{
+  \@ifundefined{Square}{%
+    \newpower{\Square}{2}}{}}
 \newpower{\ssquare}{2}
 \newpower[post]{\squared}{2}
 \newpower{\cubic}{3}
@@ -10636,7 +10645,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2008/09/28 v1.1a siunitx: SI Multiple prefixes]
+  [2008/10/13 v1.1b siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10740,7 +10749,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2008/09/28 v1.1a siunitx: SI Named units]
+  [2008/10/13 v1.1b siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -10836,7 +10845,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2008/09/28 v1.1a siunitx: SI Prefixed units]
+  [2008/10/13 v1.1b siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -11122,7 +11131,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2008/09/28 v1.1a siunitx: Abbreviated units]
+  [2008/10/13 v1.1b siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11334,7 +11343,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2008/09/28 v1.1a siunitx: SI Additional units]
+  [2008/10/13 v1.1b siunitx: SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
 \newunit{\hectare}{\hecto\are}
@@ -11383,7 +11392,7 @@ author.
 %\begin{macro}{\percent}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2008/09/28 v1.1a siunitx: SI Accepted units]
+  [2008/10/13 v1.1b siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
@@ -11432,7 +11441,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2008/09/28 v1.1a siunitx: SI Physically-measured units]
+  [2008/10/13 v1.1b siunitx: SI Physically-measured units]
 \newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}%
 \newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}%
 \newunit{\electronvolt}{e\protect\si@eVspacea V\protect%
@@ -11468,7 +11477,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2008/09/28 v1.1a siunitx: Units for synthetic chemists]
+  [2008/10/13 v1.1b siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11489,7 +11498,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2008/09/28 v1.1a siunitx: Units for high-energy physics]
+  [2008/10/13 v1.1b siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11571,7 +11580,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2008/09/28 v1.1a siunitx: Units for astronomy]
+  [2008/10/13 v1.1b siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11594,7 +11603,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2008/09/28 v1.1a siunitx: Binary units]
+  [2008/10/13 v1.1b siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11637,7 +11646,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2008/09/28 v1.1a siunitx: UK locale]
+  [2008/10/13 v1.1b siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11654,7 +11663,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2008/09/28 v1.1a siunitx: USA locale]
+  [2008/10/13 v1.1b siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11671,7 +11680,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2008/09/28 v1.1a siunitx: Germany locale]
+  [2008/10/13 v1.1b siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11688,7 +11697,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2008/09/28 v1.1a siunitx: South Africa locale]
+  [2008/10/13 v1.1b siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11720,7 +11729,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2008/09/28 v1.1a siunitx: Emulation of units]
+  [2008/10/13 v1.1b siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -11790,7 +11799,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2008/09/28 v1.1a siunitx:
+  [2008/10/13 v1.1b siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12239,7 +12248,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2008/09/28 v1.1a siunitx: Emulation of
+  [2008/10/13 v1.1b siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12423,7 +12432,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2008/09/28 v1.1a siunitx: Emulation of
+  [2008/10/13 v1.1b siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -12986,7 +12995,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2008/09/28 v1.1a siunitx: Emulation of
+  [2008/10/13 v1.1b siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13141,7 +13150,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2008/09/28 v1.1a siunitx: Emulation of
+  [2008/10/13 v1.1b siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13203,7 +13212,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2008/09/28 v1.1a siunitx: Emulation of
+  [2008/10/13 v1.1b siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}