diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-28 22:22:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-28 22:22:49 +0000 |
commit | ad786c650717fc5d5e0722857abeddeec026f967 (patch) | |
tree | 3a11323ad2aaddb09f8610f603750eeadea4e47d /Master/texmf-dist/tex | |
parent | efa5c33269c326d70cede42675b57ce5c667ccf6 (diff) |
ctable 1.23 (28may12)
git-svn-id: svn://tug.org/texlive/trunk@26694 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/ctable/ctable.sty | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty index 04251fa323e..f5f7304a58e 100644 --- a/Master/texmf-dist/tex/latex/ctable/ctable.sty +++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty @@ -22,8 +22,9 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ctable} - [2011/09/05 v1.21 ctable package] + [2012/05/28 v1.23 ctable package] \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating} +\RequirePackage{etoolbox} \def\NN{\tabularnewline} \def\FL{\toprule} \def\ML{\NN\midrule} @@ -48,6 +49,7 @@ \newdimen\@ctblcaptionskip \newdimen\@defaultctblcaptionskip \newdimen\@ctblmaxwidth \newdimen\@defaultctblmaxwidth \newdimen\@ctblmincapwidth \newdimen\@defaultctblmincapwidth +\newdimen\@ctblfooterwidth \newdimen\@defaultctblfooterwidth \newdimen\@ctblw % the final width \newdimen\@ctblfloatwidth \newdimen\@ctbloldsep @@ -72,6 +74,7 @@ \define@key{suctbl}{left}[]{\let\@defaultctblalign\raggedright} \define@key{suctbl}{maxwidth}{\@defaultctblmaxwidth=#1} \define@key{suctbl}{mincapwidth}{\@defaultctblmincapwidth=#1} +\define@key{suctbl}{footerwidth}[-1pt]{\@defaultctblfooterwidth=#1} \define@key{suctbl}{nonotespar}[]{\let\@defaultctblnotespar\@ctblfalse} \define@key{suctbl}{nosideways}[]{\let\@defaultctblsideways\empty} \define@key{suctbl}{nostar}[]{\def\@defaultctblstarred{}} @@ -97,6 +100,7 @@ width=0pt, maxwidth=0pt, mincapwidth=0pt, + footerwidth=0pt, nosideways, center, nostar, @@ -123,6 +127,7 @@ \define@key{ctbl}{left}[]{\let\@ctblalign\raggedright} \define@key{ctbl}{maxwidth}{\@ctblmaxwidth=#1} \define@key{ctbl}{mincapwidth}{\@ctblmincapwidth=#1} +\define@key{ctbl}{footerwidth}[-1pt]{\@ctblfooterwidth=#1} \define@key{ctbl}{nonotespar}[]{\let\@ctblnotespar\@ctblfalse} \define@key{ctbl}{nosideways}[]{\let\@ctblsideways\empty} \define@key{ctbl}{nostar}[]{\def\@ctblstarred{}} @@ -142,9 +147,14 @@ \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi \@ctblcaption\ \@ctblcontinued\strut} \ifx\@ctblcap\empty - \caption[]{\@ctblcaptionarg} + \begingroup + \edef\x{\endgroup\noexpand\caption[]{\expandonce\@ctblcaptionarg}} + \x \else - \caption[\@ctblcap]{\@ctblcaptionarg} + \begingroup + \edef\x{\endgroup\noexpand\caption[\expandonce\@ctblcap]% + {\expandonce\@ctblcaptionarg}} + \x \fi \fi } @@ -153,7 +163,7 @@ \let\NC@find@X\undefined \newcolumntype{X}{#1}% } -\def\@ctblframe#1#2#3{% +\long\def\@ctblframe#1#2#3{% \@ctbloldsep\fboxsep\fboxsep\@ctblframesep% \@ctbloldrule\fboxrule\fboxrule\@ctblframerule% \fcolorbox{#1}{#2}{\fboxsep\@ctbloldsep\fboxrule\@ctbloldrule #3}% @@ -187,6 +197,7 @@ \@ctblwidth \@defaultctblwidth \@ctblmaxwidth \@defaultctblmaxwidth \@ctblmincapwidth \@defaultctblmincapwidth + \@ctblfooterwidth \@defaultctblfooterwidth \def\@ctblfgactual {@defaultctblframefg} \def\@ctblbgactual {@defaultctblframebg} \def\@ctblbeg {\begin{\@ctblsideways\@ctbltaborfig\@ctblstarred}} @@ -267,11 +278,13 @@ \end{minipage}% \else% \\ - \begin{tabularx}{\hsize}{r@{\,}>{\raggedright}X} + \begin{tabularx}{\ifdim\@ctblfooterwidth=-1pt\@ctblw\else + \ifdim\@ctblfooterwidth=0pt\hsize\else + \@ctblfooterwidth\fi\fi + }{r@{\,}>{\raggedright}X} #3% \end{tabularx}% \fi - } \fi \ifx\@ctblbotcap\@ctbltrue\vskip\@ctblcaptionskip\@ctblCaption\fi |