From 95b51abe0deb5c649c982d15de8226cd890f87a4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Apr 2008 23:53:29 +0000 Subject: ctable update (13apr08) git-svn-id: svn://tug.org/texlive/trunk@7413 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ctable/ctable.sty | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ctable') diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty index 0de55965a9c..1d6eb0b4e37 100644 --- a/Master/texmf-dist/tex/latex/ctable/ctable.sty +++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ctable} - [2007/09/07 v1.11 ctable package] + [2008/04/13 v1.12 ctable package] \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating,caption} \def\NN{\tabularnewline} \def\FL{\toprule} @@ -67,6 +67,7 @@ \define@key{ctbl}{framebg}{\@ctblbgcolor#1=} \define@key{ctbl}{captionskip}{\@ctblcaptionskip=#1} \define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy} +\define@key{ctbl}{notespar}[]{\def\@ctblnotespar{1}} \def\@ctblCaption{ \ifx\@ctblcap\empty\let\@ctblcap\@ctblcaption\fi \ifx\@ctblcaption\empty\else @@ -79,7 +80,12 @@ \fcolorbox{#1}{#2}{\fboxsep\@ctbloldsep\fboxrule\@ctbloldrule #3}% } \newcommand{\tnote}[2][a]{% - \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}\NN} + \ifx\@ctblnotespar\empty% + \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}\NN + \else% + \@cttextsuperscript{\normalfont\textit{#1}}\,#2 + \fi +} \newcommand{\tmark}[1][a]{% \hbox{\textsuperscript{\normalfont\textit{#1}}}} \newcommand{\ctable}[4][]{% @@ -95,6 +101,7 @@ \def\@ctblend {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}% \def\@ctblbotcap {}% \def\@ctblstarred {}% + \def\@ctblnotespar{}% \definecolor{@ctblframefg}{rgb}{0,0,0}% \definecolor{@ctblframebg}{rgb}{1,1,1}% \@ctblframerule0pt @@ -168,10 +175,17 @@ \centering{\usebox\ctbl@t} % insert the tabular \def\@ctblfootnotes{#3}% \ifx#3\empty\else % append footnotes, if any - \\ - \begin{tabularx}{\hsize}{r@{\,}>{\footnotesize\raggedright}X} - #3% - \end{tabularx}% + \ifx\@ctblnotespar\empty% + \\ + \begin{tabularx}{\hsize}{r@{\,}>{\footnotesize\raggedright}X} + #3% + \end{tabularx}% + \else% + \\[.2ex] + \begin{minipage}{\hsize}\footnotesize\raggedright% + #3% + \end{minipage}% + \fi \fi \ifx\@ctblbotcap\empty\else\vskip\@ctblcaptionskip\@ctblCaption\fi \end{minipage} -- cgit v1.2.3