siunitx 1.1e (18nov08)

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

1 files changed, 58 insertions, 26 deletions

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 774458858ea..6215680d7de 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{10109}
+%\CheckSum{10141}
 %
 % \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
@@ -1201,6 +1201,7 @@ dcolumn, rccol and numprint packages.
 %  \unitinfo{nanomole} & \csindex{nmol} \\
 %  \unitinfo{micromole} & \csindex{micmol} \\
 %  \unitinfo{millimole} & \csindex{mmol} \\
+%  \unitinfo{kilomole} & \csindex{kmol} \\
 %
 %  \tablesubhead{Currents}
 %  \unitinfo{picoampere} & \csindex{pA} \\
@@ -1217,7 +1218,7 @@ dcolumn, rccol and numprint packages.
 %  square kilometre & \csindex{squarekilometre} & \squarekilometre \\
 %
 %  \tablesubhead{Volumes}
-%\changes{v1.1d}{2008/10/29}{New units \cs{micoliter}, \cs{milliliter},
+%\changes{v1.1d}{2008/10/29}{New units \cs{microliter}, \cs{milliliter},
 %  \cs{micL} and \cs{mL}}
 %  \unitinfo{microlitre} & \csindex{micl} \\
 %  \unitinfo{millilitre} & \csindex{ml} \\
@@ -2920,6 +2921,15 @@ dcolumn, rccol and numprint packages.
 %  \end{table}
 %\end{LaTeXexample}
 %
+%\subsection{Using \currpkg\ with the \pkg{cellspace} package}
+% Both \currpkg\ and \pkg{cellspace} use the letter \texttt{S} for a 
+% new column type. This obviously leads to a problem. If both are 
+% loaded, \currpkg\ will retain the \texttt{S} column, and moves the
+% functionality of \pkg{cellspace} to the letter \texttt{C}. This 
+% 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.
+%
 %\iffalse
 %<*bug>
 %\fi
@@ -3323,7 +3333,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/10/29 v1.1d A comprehensive (SI) units package]
+  [2008/11/18 v1.1e A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -4983,6 +4993,7 @@ author.
 %\end{macro}
 %\end{macro}
 %\begin{macro}{\si@textcelsius}
+%\changes{2008/11/18}{v1.1e}{Bug fix in appearance}
 %\begin{macro}{\si@mathscelsius}
 % Finally, degrees Celsius, which may need the degree symbol.
 %    \begin{macrocode}
@@ -4991,7 +5002,7 @@ author.
 \newcommand*{\si@textcelsius}{%
   \si@textdegree\kern-\scriptspace C}
 \newcommand*{\si@mathscelsius}{%
-  \si@mathsdegree\kern-\scriptspace\mathrm{C}}
+  \si@mathsdegree\kern-\scriptspace C}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
@@ -7997,6 +8008,7 @@ author.
 % units (the letter is taken from \cs{si}).
 %
 %\begin{macro}{\NC@list}
+%\changes{2008/11/18}{v1.1e}{Fixed issue with \pkg{cellspace} package}
 % The first part of the job is to create the basic apparatus for the
 % columns using the \pkg{array} package.  To prevent any issues with
 % the content of optional arguments to the new columns, so
@@ -8005,6 +8017,18 @@ author.
 % saving \cs{NC@list}, creating the columns then restoring the list
 % with the appropriate extra parts.
 %    \begin{macrocode}
+\@ifpackageloaded{cellspace}
+  {\newcolumntype{C}[1]{>{\bcolumn #1\@nil}#1<{\ecolumn}}}
+  {\AtBeginDocument{
+    \@ifpackageloaded{cellspace}
+     {\newcolumntype{C}[1]{>{\bcolumn #1\@nil}#1<{\ecolumn}}%
+      \renewcommand*{\NC@rewrite@S}[1][]{%
+        \edef\si@tempa{\the\@temptokena
+        >{\noexpand\si@tab@begin@S[#1]}c%
+        <{\noexpand\si@tab@end@S}}%
+        \@temptokena\expandafter{\si@tempa}%
+        \NC@find}}
+     {}}}
 \edef\si@tempa{%
   \noexpand\NC@do S\noexpand\NC@do s\the\NC@list}
 \newcolumntype{S}{}
@@ -10662,7 +10686,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2008/10/29 v1.1d siunitx: SI Multiple prefixes]
+  [2008/11/18 v1.1e siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10766,7 +10790,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2008/10/29 v1.1d siunitx: SI Named units]
+  [2008/11/18 v1.1e siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -10862,7 +10886,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2008/10/29 v1.1d siunitx: SI Prefixed units]
+  [2008/11/18 v1.1e siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -10912,6 +10936,8 @@ author.
 %\begin{macro}{\nanomole}
 %\begin{macro}{\micromole}
 %\begin{macro}{\millimole}
+%\begin{macro}{\kilomole}
+%\changes{2008/11/18}{v1.1e}{New unit}
 % Now some moles.
 %    \begin{macrocode}
 \newunit{\femtomole}{\femto\mole}
@@ -10919,12 +10945,14 @@ author.
 \newunit{\nanomole}{\nano\mole}
 \newunit{\micromole}{\micro\mole}
 \newunit{\millimole}{\milli\mole}
+\newunit{\kilomole}{\kilo\mole}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
 %\end{macro}
 %\end{macro}
 %\end{macro}
+%\end{macro}
 %\begin{macro}{\attosecond}
 %\begin{macro}{\femtosecond}
 %\begin{macro}{\picosecond}
@@ -11154,7 +11182,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2008/10/29 v1.1d siunitx: Abbreviated units]
+  [2008/11/18 v1.1e siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11193,6 +11221,8 @@ author.
 %\begin{macro}{\nmol}
 %\begin{macro}{\micmol}
 %\begin{macro}{\mmol}
+%\begin{macro}{\kmol}
+%\changes{2008/11/18}{v1.1e}{New unit}
 % Amounts of substance.
 %    \begin{macrocode}
 \newunit{\fmol}{\femto\mole}
@@ -11200,12 +11230,14 @@ author.
 \newunit{\nmol}{\nano\mole}
 \newunit{\micmol}{\micro\mole}
 \newunit{\mmol}{\milli\mole}
+\newunit{\kmol}{\kilo\mole}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
 %\end{macro}
 %\end{macro}
 %\end{macro}
+%\end{macro}
 %\begin{macro}{\kV}
 %\begin{macro}{\mV}
 % Potentials.
@@ -11373,7 +11405,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2008/10/29 v1.1d siunitx: SI Additional units]
+  [2008/11/18 v1.1e siunitx: SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
 \newunit{\hectare}{\hecto\are}
@@ -11423,7 +11455,7 @@ author.
 %\begin{macro}{\percent}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2008/10/29 v1.1d siunitx: SI Accepted units]
+  [2008/11/18 v1.1e siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
@@ -11472,7 +11504,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2008/10/29 v1.1d siunitx: SI Physically-measured units]
+  [2008/11/18 v1.1e 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%
@@ -11508,7 +11540,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2008/10/29 v1.1d siunitx: Units for synthetic chemists]
+  [2008/11/18 v1.1e siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11529,7 +11561,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2008/10/29 v1.1d siunitx: Units for high-energy physics]
+  [2008/11/18 v1.1e siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11611,7 +11643,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2008/10/29 v1.1d siunitx: Units for astronomy]
+  [2008/11/18 v1.1e siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11634,7 +11666,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2008/10/29 v1.1d siunitx: Binary units]
+  [2008/11/18 v1.1e siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11677,7 +11709,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2008/10/29 v1.1d siunitx: UK locale]
+  [2008/11/18 v1.1e siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11694,7 +11726,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2008/10/29 v1.1d siunitx: USA locale]
+  [2008/11/18 v1.1e siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11711,7 +11743,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2008/10/29 v1.1d siunitx: Germany locale]
+  [2008/11/18 v1.1e siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11728,7 +11760,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2008/10/29 v1.1d siunitx: South Africa locale]
+  [2008/11/18 v1.1e siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11760,7 +11792,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2008/10/29 v1.1d siunitx: Emulation of units]
+  [2008/11/18 v1.1e siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -11830,7 +11862,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2008/10/29 v1.1d siunitx:
+  [2008/11/18 v1.1e siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12279,7 +12311,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2008/10/29 v1.1d siunitx: Emulation of
+  [2008/11/18 v1.1e siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12463,7 +12495,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2008/10/29 v1.1d siunitx: Emulation of
+  [2008/11/18 v1.1e siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -13026,7 +13058,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2008/10/29 v1.1d siunitx: Emulation of
+  [2008/11/18 v1.1e siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13181,7 +13213,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2008/10/29 v1.1d siunitx: Emulation of
+  [2008/11/18 v1.1e siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13243,7 +13275,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2008/10/29 v1.1d siunitx: Emulation of
+  [2008/11/18 v1.1e siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}