1 files changed, 46 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index f1879925288..489ecfeb58e 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{10141}
+%\CheckSum{10144}
 %
 % \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
@@ -304,7 +304,8 @@ dcolumn, rccol and numprint packages.
 %  kibi,byte,molar,Molar,mmHg,mebi,torr,parsec,lightyear,clight,
 %  eVperc,addplot,color,milli,cm,Hz,kg,DeclareRobustCommand,
 %  pascal,dalton,addtolocale,DTLnewdb,DTLnewrow,DTLnewdbentry,
-%  DTLforeach,DTLiffirstrow,DTLmul,newqualifier,hour}}
+%  DTLforeach,DTLiffirstrow,DTLmul,newqualifier,hour,renewunit,
+%  degree}}
 %
 %\title{\currpkg\ --- A comprehensive (SI) units package^^A
 %  \thanks{This file describes version \fileversion, last revised
@@ -2929,6 +2930,19 @@ dcolumn, rccol and numprint packages.
 % allows the normal use of \pkg{cellspace} with standard column types:
 % it does \emph{not} work with the \currpkg\ \texttt{S} or \texttt{s}
 % columns.
+% 
+%\subsection{Using \currpkg\ with the \pkg{mathabx} package}
+%\changes{2008/11/26}{v1.1g}{Respect loading of \pkg{mathabx}}
+% The \pkg{mathabx} package defines its own \cs{second} and 
+% \cs{degree} macros.  This is respected by \currpkg: if you want the
+% \currpkg\ definitions instead, put the lines
+%\begin{LaTeXexample}[noexample]
+%  \makeatletter
+%  \renewunit{\second}{s}
+%  \renewunit[valuesep=none]{\degree}{\si@sym@degree}
+%  \makeatother
+%\end{LaTeXexample}
+% after |\begin{document}|.
 %
 %\iffalse
 %<*bug>
@@ -3339,7 +3353,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/11/25 v1.1f A comprehensive (SI) units package]
+  [2008/11/26 v1.1g A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -10105,7 +10119,7 @@ author.
 \newunit{\metre}{m}
 \newunit{\meter}{\metre}
 \newunit{\mole}{mol}
-\newunit{\second}{s}
+\AtBeginDocument{\provideunit{\second}{s}}
 \newunit{\ampere}{A}
 \newunit{\kelvin}{K}
 \newunit{\candela}{cd}
@@ -10692,7 +10706,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2008/11/25 v1.1f siunitx: SI Multiple prefixes]
+  [2008/11/26 v1.1g siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10796,7 +10810,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2008/11/25 v1.1f siunitx: SI Named units]
+  [2008/11/26 v1.1g siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -10892,7 +10906,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2008/11/25 v1.1f siunitx: SI Prefixed units]
+  [2008/11/26 v1.1g siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -11190,7 +11204,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2008/11/25 v1.1f siunitx: Abbreviated units]
+  [2008/11/26 v1.1g siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11413,7 +11427,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2008/11/25 v1.1f siunitx: SI Additional units]
+  [2008/11/26 v1.1g siunitx: SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
 \newunit{\hectare}{\hecto\are}
@@ -11463,16 +11477,20 @@ author.
 %\begin{macro}{\percent}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2008/11/25 v1.1f siunitx: SI Accepted units]
+  [2008/11/26 v1.1g siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
 \newunit{\dday}{d}
 \ifsi@old@OHM
-  \newunit[valuesep=none]{\Degree}{\si@sym@degree}
+  \AtBeginDocument{
+    \provideunit[valuesep=none]{\Degree}{\si@sym@degree}
+  }
 \else
   \ifsi@gensymb\else
-    \provideunit[valuesep=none]{\degree}{\si@sym@degree}
+    \AtBeginDocument{
+      \provideunit[valuesep=none]{\degree}{\si@sym@degree}
+    }
   \fi
 \fi
 \newunit[valuesep=none]{\arcmin}{\si@sym@minute}
@@ -11512,7 +11530,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2008/11/25 v1.1f siunitx: SI Physically-measured units]
+  [2008/11/26 v1.1g 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%
@@ -11548,7 +11566,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2008/11/25 v1.1f siunitx: Units for synthetic chemists]
+  [2008/11/26 v1.1g siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11569,7 +11587,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2008/11/25 v1.1f siunitx: Units for high-energy physics]
+  [2008/11/26 v1.1g siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11651,7 +11669,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2008/11/25 v1.1f siunitx: Units for astronomy]
+  [2008/11/26 v1.1g siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11674,7 +11692,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2008/11/25 v1.1f siunitx: Binary units]
+  [2008/11/26 v1.1g siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11717,7 +11735,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2008/11/25 v1.1f siunitx: UK locale]
+  [2008/11/26 v1.1g siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11734,7 +11752,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2008/11/25 v1.1f siunitx: USA locale]
+  [2008/11/26 v1.1g siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11751,7 +11769,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2008/11/25 v1.1f siunitx: Germany locale]
+  [2008/11/26 v1.1g siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11768,7 +11786,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2008/11/25 v1.1f siunitx: South Africa locale]
+  [2008/11/26 v1.1g siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11800,7 +11818,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2008/11/25 v1.1f siunitx: Emulation of units]
+  [2008/11/26 v1.1g siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -11870,7 +11888,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2008/11/25 v1.1f siunitx:
+  [2008/11/26 v1.1g siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12319,7 +12337,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2008/11/25 v1.1f siunitx: Emulation of
+  [2008/11/26 v1.1g siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12503,7 +12521,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2008/11/25 v1.1f siunitx: Emulation of
+  [2008/11/26 v1.1g siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -13066,7 +13084,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2008/11/25 v1.1f siunitx: Emulation of
+  [2008/11/26 v1.1g siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13221,7 +13239,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2008/11/25 v1.1f siunitx: Emulation of
+  [2008/11/26 v1.1g siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13283,7 +13301,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2008/11/25 v1.1f siunitx: Emulation of
+  [2008/11/26 v1.1g siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}