ctable (20dec13)

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

1 files changed, 11 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 7aa8c10e1c9..240ba6f304c 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -22,11 +22,19 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{ctable}
-    [2013/06/15 v1.26 ctable package for \
+    [2013/12/19 v1.27 ctable package for \
      flexible typesetting of table and figure floats using key/value directives]
 \RequirePackage{ifpdf,xcolor,xkeyval,array,tabularx,booktabs,rotating}
 \ifpdf
   \RequirePackage{transparent}
+  \AtBeginDocument{
+    \@ifpackageloaded{tikz}{
+      \PackageWarning{ctable}{
+        Transparency disabled: incompatible with tikz package
+      }
+      \def\transparent#1{}
+    }{}
+  }
 \else
   \PackageWarningNoLine{ctable}{\MessageBreak
     Transparency disabled: pdfTeX is not running in PDF mode
@@ -300,8 +308,8 @@
       \@ctblalign
       \begin{minipage}{\@ctblfloatwidth}\parindent0pt
          \ifx\@ctblbotcap\@ctblfalse\@ctblCaption\vskip\@ctblcaptionskip\fi
-         \ifx\@ctblbotcap\undefined\begin{sidecaption}[\@ctblcap]{\@ctblcaption}[ label ]\fi
-         \centering{\usebox\ctbl@t} % insert the tabular
+         \ifx\@ctblbotcap\undefined\begin{sidecaption}[\@ctblcap]{\@ctblcaption}[\@ctbllabel]\fi
+         \centering{\usebox\ctbl@t}% insert the tabular
          \def\@ctblfootnotes{#3}%
          \ifx#3\empty\else{% append footnotes, if any
             \@ctblcurftwidth=\ifdim\@ctblfooterwidth=-1pt\@ctblw\else