siunitx 1.1e (18nov08)

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

1 files changed, 14 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 59baa61a8ea..5a1b87680d0 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/10/29 v1.1d A comprehensive (SI) units package]
+  [2008/11/18 v1.1e A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -848,7 +848,7 @@
 \newcommand*{\si@textcelsius}{%
   \si@textdegree\kern-\scriptspace C}
 \newcommand*{\si@mathscelsius}{%
-  \si@mathsdegree\kern-\scriptspace\mathrm{C}}
+  \si@mathsdegree\kern-\scriptspace C}
 \si@opt@cmdkeys{textringA,mathsringA}
 \si@opt@key{mathringA}{\sisetup{mathsringA=#1}}
 \newcommand*{\si@textringA}{\AA}
@@ -2448,6 +2448,18 @@
     \fi}%
   \renewcommand*{\si@num@decimalhook}{\expandafter\aftergroup
     \csname si@ang@kill#1\endcsname}}%
+\@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}{}