ctable update 1.16

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

1 files changed, 15 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 0ab3d273311..e2dbbb409e9 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -22,15 +22,19 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{ctable}
-    [2009/09/17 v1.15 ctable package]
+    [2010/06/26 v1.16 ctable package]
 \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating}
 \def\NN{\tabularnewline}
 \def\FL{\toprule}
 \def\ML{\NN\midrule}
 \def\LL{\NN\bottomrule}
+\definecolor{@ctblframefg}{rgb}{0,0,0}%
+\definecolor{@ctblframebg}{rgb}{1,1,1}%
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
-\def\@ctbltextsuperscript#1{\ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi}
+\def\@ctbltextsuperscript#1{%
+  \ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi
+}
 \def\@ctbldoinside{\relax}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
@@ -73,7 +77,13 @@
 \def\@ctblCaption{
    \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi
    \ifx\@ctblcaption\empty\else
-      \caption[\@ctblcap]{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi\@ctblcaption\ \@ctblcontinued\strut}
+      \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi
+         \@ctblcaption\ \@ctblcontinued\strut}
+      \ifx\@ctblcap\empty
+         \caption[]{\@ctblcaptionarg}
+      \else
+         \caption[\@ctblcap]{\@ctblcaptionarg}
+      \fi
    \fi
 }
 \newcolumntype{Y}{X}
@@ -109,10 +119,8 @@
    \def\@ctblend     {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
    \def\@ctblbotcap  {}%
    \def\@ctblstarred {}%
-   \def\@ctblnosuper{}
+   \def\@ctblnosuper {}%
    \def\@ctblnotespar{}%
-   \definecolor{@ctblframefg}{rgb}{0,0,0}%
-   \definecolor{@ctblframebg}{rgb}{1,1,1}%
    \@ctblframerule0pt
    \@ctblcaptionskip=0ex
    \@ctblframesep0pt
@@ -194,7 +202,7 @@
                \end{tabularx}%
             \else%
                \\[.2ex]
-               \begin{minipage}{\hsize}\raggedright%
+               \begin{minipage}{\hsize}%
                   #3%
                \end{minipage}%
             \fi