diff options
| author | Karl Berry <karl@freefriends.org> | 2008-04-14 23:53:29 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-04-14 23:53:29 +0000 |
| commit | 95b51abe0deb5c649c982d15de8226cd890f87a4 (patch) | |
| tree | e9cdf99694dfd68ffddffa57b4afed25bba19200 /Master | |
| parent | c4f01461002a555bae76bcd7615e3c0ec50be835 (diff) | |
ctable update (13apr08)
git-svn-id: svn://tug.org/texlive/trunk@7413 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
53 files changed, 52 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/ctable/01a.pdf b/Master/texmf-dist/doc/latex/ctable/01a.pdf Binary files differindex 1e9f9d1ed74..36367e14d75 100644 --- a/Master/texmf-dist/doc/latex/ctable/01a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/01a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/01b.pdf b/Master/texmf-dist/doc/latex/ctable/01b.pdf Binary files differindex 7b082484ba7..747c5884c9c 100644 --- a/Master/texmf-dist/doc/latex/ctable/01b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/01b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/02k.pdf b/Master/texmf-dist/doc/latex/ctable/02k.pdf Binary files differindex 6f68866ae08..5b33ae7f070 100644 --- a/Master/texmf-dist/doc/latex/ctable/02k.pdf +++ b/Master/texmf-dist/doc/latex/ctable/02k.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/02l.pdf b/Master/texmf-dist/doc/latex/ctable/02l.pdf Binary files differindex 1c24d04cd60..a1e240fce9a 100644 --- a/Master/texmf-dist/doc/latex/ctable/02l.pdf +++ b/Master/texmf-dist/doc/latex/ctable/02l.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/02m.pdf b/Master/texmf-dist/doc/latex/ctable/02m.pdf Binary files differindex c165593cbb2..e280df64948 100644 --- a/Master/texmf-dist/doc/latex/ctable/02m.pdf +++ b/Master/texmf-dist/doc/latex/ctable/02m.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/03a.pdf b/Master/texmf-dist/doc/latex/ctable/03a.pdf Binary files differindex 534a039c034..85659f1a5e6 100644 --- a/Master/texmf-dist/doc/latex/ctable/03a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/03a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/03b.pdf b/Master/texmf-dist/doc/latex/ctable/03b.pdf Binary files differindex b6eeaa71160..e40929b6f73 100644 --- a/Master/texmf-dist/doc/latex/ctable/03b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/03b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/04a.pdf b/Master/texmf-dist/doc/latex/ctable/04a.pdf Binary files differindex 2ce05883e26..54721655671 100644 --- a/Master/texmf-dist/doc/latex/ctable/04a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/04a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/04b.pdf b/Master/texmf-dist/doc/latex/ctable/04b.pdf Binary files differindex 98dec047bec..737035b36ac 100644 --- a/Master/texmf-dist/doc/latex/ctable/04b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/04b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/05a.pdf b/Master/texmf-dist/doc/latex/ctable/05a.pdf Binary files differindex 0747035eef7..f71bc945119 100644 --- a/Master/texmf-dist/doc/latex/ctable/05a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/05a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/05b.pdf b/Master/texmf-dist/doc/latex/ctable/05b.pdf Binary files differindex d6576e3aa39..8d811e21a98 100644 --- a/Master/texmf-dist/doc/latex/ctable/05b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/05b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/06a.pdf b/Master/texmf-dist/doc/latex/ctable/06a.pdf Binary files differindex 0300a841cdb..eed5ab7d1e7 100644 --- a/Master/texmf-dist/doc/latex/ctable/06a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/06a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/06b.pdf b/Master/texmf-dist/doc/latex/ctable/06b.pdf Binary files differindex 1084982b03e..188538fc1b0 100644 --- a/Master/texmf-dist/doc/latex/ctable/06b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/06b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/07a.pdf b/Master/texmf-dist/doc/latex/ctable/07a.pdf Binary files differindex 73dd7f330cb..341704a61a9 100644 --- a/Master/texmf-dist/doc/latex/ctable/07a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/07a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/07b.pdf b/Master/texmf-dist/doc/latex/ctable/07b.pdf Binary files differindex ccc0a2b2c3d..77550be288a 100644 --- a/Master/texmf-dist/doc/latex/ctable/07b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/07b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/08a.pdf b/Master/texmf-dist/doc/latex/ctable/08a.pdf Binary files differindex 0d4c78f637d..85d546bfec4 100644 --- a/Master/texmf-dist/doc/latex/ctable/08a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/08a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/08b.pdf b/Master/texmf-dist/doc/latex/ctable/08b.pdf Binary files differindex 991ba408ddd..7dc71fee634 100644 --- a/Master/texmf-dist/doc/latex/ctable/08b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/08b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/09b.pdf b/Master/texmf-dist/doc/latex/ctable/09b.pdf Binary files differindex 2f6a7d7d8d0..c3cf5353c4d 100644 --- a/Master/texmf-dist/doc/latex/ctable/09b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/09b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/10a.pdf b/Master/texmf-dist/doc/latex/ctable/10a.pdf Binary files differindex 21786772638..0c19af9a6e2 100644 --- a/Master/texmf-dist/doc/latex/ctable/10a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/10a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/10b.pdf b/Master/texmf-dist/doc/latex/ctable/10b.pdf Binary files differindex 6004d7af309..baa2b6d981c 100644 --- a/Master/texmf-dist/doc/latex/ctable/10b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/10b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/11k.pdf b/Master/texmf-dist/doc/latex/ctable/11k.pdf Binary files differindex 34a740acc5a..47e160fe6b7 100644 --- a/Master/texmf-dist/doc/latex/ctable/11k.pdf +++ b/Master/texmf-dist/doc/latex/ctable/11k.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/11l.pdf b/Master/texmf-dist/doc/latex/ctable/11l.pdf Binary files differindex 5177f26cd7b..13a687e4fd0 100644 --- a/Master/texmf-dist/doc/latex/ctable/11l.pdf +++ b/Master/texmf-dist/doc/latex/ctable/11l.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/11m.pdf b/Master/texmf-dist/doc/latex/ctable/11m.pdf Binary files differindex f391caa5375..66fa526064c 100644 --- a/Master/texmf-dist/doc/latex/ctable/11m.pdf +++ b/Master/texmf-dist/doc/latex/ctable/11m.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/12a.pdf b/Master/texmf-dist/doc/latex/ctable/12a.pdf Binary files differnew file mode 100644 index 00000000000..b747aa65153 --- /dev/null +++ b/Master/texmf-dist/doc/latex/ctable/12a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/12b.pdf b/Master/texmf-dist/doc/latex/ctable/12b.pdf Binary files differnew file mode 100644 index 00000000000..5ea1795a546 --- /dev/null +++ b/Master/texmf-dist/doc/latex/ctable/12b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf Binary files differindex dcc4357a014..5a969fa411a 100644 --- a/Master/texmf-dist/doc/latex/ctable/ctable.pdf +++ b/Master/texmf-dist/doc/latex/ctable/ctable.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s01a.pdf b/Master/texmf-dist/doc/latex/ctable/s01a.pdf Binary files differindex 2a4ea04f706..fa0d1526946 100644 --- a/Master/texmf-dist/doc/latex/ctable/s01a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s01a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s01b.pdf b/Master/texmf-dist/doc/latex/ctable/s01b.pdf Binary files differindex 320845a585d..7e83dea8fc1 100644 --- a/Master/texmf-dist/doc/latex/ctable/s01b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s01b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s02k.pdf b/Master/texmf-dist/doc/latex/ctable/s02k.pdf Binary files differindex 9a9a21b6e81..f238a0dd6c7 100644 --- a/Master/texmf-dist/doc/latex/ctable/s02k.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s02k.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s02l.pdf b/Master/texmf-dist/doc/latex/ctable/s02l.pdf Binary files differindex b2d6f3240d8..ec24d0c5aff 100644 --- a/Master/texmf-dist/doc/latex/ctable/s02l.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s02l.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s02m.pdf b/Master/texmf-dist/doc/latex/ctable/s02m.pdf Binary files differindex 0a117250381..c3b585eeff3 100644 --- a/Master/texmf-dist/doc/latex/ctable/s02m.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s02m.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s03a.pdf b/Master/texmf-dist/doc/latex/ctable/s03a.pdf Binary files differindex 3c0d4c8e914..e298d849f83 100644 --- a/Master/texmf-dist/doc/latex/ctable/s03a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s03a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s03b.pdf b/Master/texmf-dist/doc/latex/ctable/s03b.pdf Binary files differindex fb357dbb1f1..577484dd46b 100644 --- a/Master/texmf-dist/doc/latex/ctable/s03b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s03b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s04a.pdf b/Master/texmf-dist/doc/latex/ctable/s04a.pdf Binary files differindex 60ba5f3aea9..d5c0ca0e252 100644 --- a/Master/texmf-dist/doc/latex/ctable/s04a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s04a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s04b.pdf b/Master/texmf-dist/doc/latex/ctable/s04b.pdf Binary files differindex 9cd93a77f29..d07cbceba54 100644 --- a/Master/texmf-dist/doc/latex/ctable/s04b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s04b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s05a.pdf b/Master/texmf-dist/doc/latex/ctable/s05a.pdf Binary files differindex 451fa11ee9d..990789a887b 100644 --- a/Master/texmf-dist/doc/latex/ctable/s05a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s05a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s05b.pdf b/Master/texmf-dist/doc/latex/ctable/s05b.pdf Binary files differindex 734404f6383..7bfa6f0f117 100644 --- a/Master/texmf-dist/doc/latex/ctable/s05b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s05b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s06a.pdf b/Master/texmf-dist/doc/latex/ctable/s06a.pdf Binary files differindex 1bc589e959a..5e9809b3594 100644 --- a/Master/texmf-dist/doc/latex/ctable/s06a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s06a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s06b.pdf b/Master/texmf-dist/doc/latex/ctable/s06b.pdf Binary files differindex 9abf51013d1..4cf5a03e059 100644 --- a/Master/texmf-dist/doc/latex/ctable/s06b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s06b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s07a.pdf b/Master/texmf-dist/doc/latex/ctable/s07a.pdf Binary files differindex 2ddae507198..e5144caf0c6 100644 --- a/Master/texmf-dist/doc/latex/ctable/s07a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s07a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s07b.pdf b/Master/texmf-dist/doc/latex/ctable/s07b.pdf Binary files differindex 86dba131d12..108024d3811 100644 --- a/Master/texmf-dist/doc/latex/ctable/s07b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s07b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s08a.pdf b/Master/texmf-dist/doc/latex/ctable/s08a.pdf Binary files differindex f2f5861ec5a..68fb5586a0b 100644 --- a/Master/texmf-dist/doc/latex/ctable/s08a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s08a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s08b.pdf b/Master/texmf-dist/doc/latex/ctable/s08b.pdf Binary files differindex 13dba599a92..04cdd7d294a 100644 --- a/Master/texmf-dist/doc/latex/ctable/s08b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s08b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s09b.pdf b/Master/texmf-dist/doc/latex/ctable/s09b.pdf Binary files differindex 040ea37db02..acdcae94a99 100644 --- a/Master/texmf-dist/doc/latex/ctable/s09b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s09b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s10a.pdf b/Master/texmf-dist/doc/latex/ctable/s10a.pdf Binary files differindex 009853d56ed..e289e3e6939 100644 --- a/Master/texmf-dist/doc/latex/ctable/s10a.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s10a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s10b.pdf b/Master/texmf-dist/doc/latex/ctable/s10b.pdf Binary files differindex c0436c52c5a..1d08f414e68 100644 --- a/Master/texmf-dist/doc/latex/ctable/s10b.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s10b.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s11k.pdf b/Master/texmf-dist/doc/latex/ctable/s11k.pdf Binary files differindex 1d31b3ff6a4..dfb4ccebb0f 100644 --- a/Master/texmf-dist/doc/latex/ctable/s11k.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s11k.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s11l.pdf b/Master/texmf-dist/doc/latex/ctable/s11l.pdf Binary files differindex 70e859a5bf5..e540967efb5 100644 --- a/Master/texmf-dist/doc/latex/ctable/s11l.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s11l.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s11m.pdf b/Master/texmf-dist/doc/latex/ctable/s11m.pdf Binary files differindex 6596bb6723a..58bcb425040 100644 --- a/Master/texmf-dist/doc/latex/ctable/s11m.pdf +++ b/Master/texmf-dist/doc/latex/ctable/s11m.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s12a.pdf b/Master/texmf-dist/doc/latex/ctable/s12a.pdf Binary files differnew file mode 100644 index 00000000000..3aee6ee092e --- /dev/null +++ b/Master/texmf-dist/doc/latex/ctable/s12a.pdf diff --git a/Master/texmf-dist/doc/latex/ctable/s12b.pdf b/Master/texmf-dist/doc/latex/ctable/s12b.pdf Binary files differnew file mode 100644 index 00000000000..7bbddd2506d --- /dev/null +++ b/Master/texmf-dist/doc/latex/ctable/s12b.pdf diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx index d136eb73514..b9a26422d28 100644 --- a/Master/texmf-dist/source/latex/ctable/ctable.dtx +++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx @@ -19,7 +19,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{ctable} %<*package> - [2007/09/07 v1.11 ctable package] + [2008/04/13 v1.12 ctable package] %</package> % %<*driver> @@ -77,7 +77,7 @@ %</driver> % \fi % -% \CheckSum{322} +% \CheckSum{348} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -136,6 +136,7 @@ % whitespace, % Removed xspace usage - caused overfull badness % } +% \changes{v1.12}{2008/04/12}{Option notespar added} % % \GetFileInfo{ctable.dtx} % @@ -209,7 +210,7 @@ % |caption={...}|& table caption; the braces are needed only if your % caption contains a comma or an equals sign.\NN[1ex] % -% |cap={...}| & for a short caption to go to the |\tableofcontents|.\NN[1ex] +% |cap={...}| & for a short caption to go to the |\listoftables|.\NN[1ex] % % |captionskip=...| & moves the caption relative to the table; % the default is |0ex|, which puts captions at @@ -267,6 +268,8 @@ % |nosuper| & in the footnote table, typeset footnote markers on % the line, instead of superscripted.\NN[1ex] % +% |notespar| & typeset footnotes in a parapgraph instead of in a table.\NN[1ex] +% % |framerule=...|& draw a frame around the table with the given rule % thickness. The default is |0pt|, so that no frame % will be seen.\NN[1ex] @@ -529,6 +532,12 @@ % \ROW{Y}{s07a}{07a} % \ROW{B}{s07b}{07b} % +% \subsection{\ttfamily\bfseries notespar} +% Footnotes in |ctable| are typeset in a paragraph, instead of a table: +% \medskip\\ +% \ROW{Y}{s12a}{12a} +% \ROW{B}{s12b}{12b} +% % \newpage % \subsection{\ttfamily\bfseries mincapwidth} % |ctable| forces caption and footnotes to stay within the width of the table. @@ -680,6 +689,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}} % \end{macrocode} % a caption will only be generated if the \textsl{caption} option was used: % \begin{macrocode} @@ -695,7 +705,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][]{% @@ -711,6 +726,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 @@ -815,10 +831,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} @@ -828,4 +851,4 @@ % \end{macrocode} % \Finale \endinput -$Id: ctable.dtx,v 1.53 2007/09/07 08:20:19 wybo Exp $ +$Id: ctable.dtx,v 1.58 2008/04/13 15:58:14 wybo Exp $ 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} |