siunitx 1.1h

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

1 files changed, 62 insertions, 24 deletions

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 489ecfeb58e..8159294eb20 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{10144}
+%\CheckSum{10226}
 %
 % \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
@@ -3353,7 +3353,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/11/26 v1.1g A comprehensive (SI) units package]
+  [2008/11/31 v1.1h A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -8056,6 +8056,44 @@ author.
 \NC@list\expandafter{\si@tempa}
 %    \end{macrocode}
 %\end{macro}
+%\changes{2008/11/30}{v1.1h}{Fixed problem with \pkg{colortbl} package}
+%\begin{macro}{\@classz}
+% If \pkg{colortbl} is loaded, the \cs{@classz} macro needs to have the
+% original \pkg{array} method for the \texttt{c} column restored.
+%    \begin{macrocode}
+\AtBeginDocument{
+  \@ifpackageloaded{colortbl}{%
+    \renewcommand*{\@classz}{%
+      \@classx
+      \@tempcnta \count@
+      \prepnext@tok
+      \expandafter\CT@extract\the\toks\@tempcnta\columncolor!\@nil
+      \@addtopreamble{%
+        \setbox\z@\hbox\bgroup\bgroup
+          \ifcase\@chnum
+            \hfil\d@llarbegin\insert@column\d@llarend\hfil\or
+            \d@llarbegin\insert@column\d@llarend\hfill\or
+            \hfill\kern\z@\d@llarbegin\insert@column\d@llarend\or
+            $\vcenter\@startpbox{\@nextchar}\insert@column\@endpbox$\or
+            \vtop\@startpbox{\@nextchar}\insert@column\@endpbox\or
+            \vbox\@startpbox{\@nextchar}\insert@column\@endpbox
+          \fi
+        \egroup\egroup
+      \begingroup
+        \CT@setup
+        \CT@column@color
+        \CT@row@color
+        \CT@cell@color
+        \CT@do@color
+      \endgroup
+      \@tempdima\ht\z@
+      \advance\@tempdima\minrowclearance
+      \vrule\@height\@tempdima\@width\z@
+      \unhbox\z@}%
+    \prepnext@tok}%
+  }{}}
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\NC@rewrite@S}
 %\begin{macro}{\NC@rewrite@s}
 %\doarg{keyval options}
@@ -10706,7 +10744,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2008/11/26 v1.1g siunitx: SI Multiple prefixes]
+  [2008/11/31 v1.1h siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10810,7 +10848,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2008/11/26 v1.1g siunitx: SI Named units]
+  [2008/11/31 v1.1h siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -10906,7 +10944,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2008/11/26 v1.1g siunitx: SI Prefixed units]
+  [2008/11/31 v1.1h siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -11204,7 +11242,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2008/11/26 v1.1g siunitx: Abbreviated units]
+  [2008/11/31 v1.1h siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11427,7 +11465,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2008/11/26 v1.1g siunitx: SI Additional units]
+  [2008/11/31 v1.1h siunitx: SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
 \newunit{\hectare}{\hecto\are}
@@ -11477,7 +11515,7 @@ author.
 %\begin{macro}{\percent}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2008/11/26 v1.1g siunitx: SI Accepted units]
+  [2008/11/31 v1.1h siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
@@ -11530,7 +11568,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2008/11/26 v1.1g siunitx: SI Physically-measured units]
+  [2008/11/31 v1.1h 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%
@@ -11566,7 +11604,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2008/11/26 v1.1g siunitx: Units for synthetic chemists]
+  [2008/11/31 v1.1h siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11587,7 +11625,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2008/11/26 v1.1g siunitx: Units for high-energy physics]
+  [2008/11/31 v1.1h siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11669,7 +11707,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2008/11/26 v1.1g siunitx: Units for astronomy]
+  [2008/11/31 v1.1h siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11692,7 +11730,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2008/11/26 v1.1g siunitx: Binary units]
+  [2008/11/31 v1.1h siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11735,7 +11773,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2008/11/26 v1.1g siunitx: UK locale]
+  [2008/11/31 v1.1h siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11752,7 +11790,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2008/11/26 v1.1g siunitx: USA locale]
+  [2008/11/31 v1.1h siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11769,7 +11807,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2008/11/26 v1.1g siunitx: Germany locale]
+  [2008/11/31 v1.1h siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11786,7 +11824,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2008/11/26 v1.1g siunitx: South Africa locale]
+  [2008/11/31 v1.1h siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11818,7 +11856,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2008/11/26 v1.1g siunitx: Emulation of units]
+  [2008/11/31 v1.1h siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -11888,7 +11926,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2008/11/26 v1.1g siunitx:
+  [2008/11/31 v1.1h siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12337,7 +12375,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2008/11/26 v1.1g siunitx: Emulation of
+  [2008/11/31 v1.1h siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12521,7 +12559,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2008/11/26 v1.1g siunitx: Emulation of
+  [2008/11/31 v1.1h siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -13084,7 +13122,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2008/11/26 v1.1g siunitx: Emulation of
+  [2008/11/31 v1.1h siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13239,7 +13277,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2008/11/26 v1.1g siunitx: Emulation of
+  [2008/11/31 v1.1h siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13301,7 +13339,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2008/11/26 v1.1g siunitx: Emulation of
+  [2008/11/31 v1.1h siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}