summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ctable
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-14 23:53:29 +0000
committerKarl Berry <karl@freefriends.org>2008-04-14 23:53:29 +0000
commit95b51abe0deb5c649c982d15de8226cd890f87a4 (patch)
treee9cdf99694dfd68ffddffa57b4afed25bba19200 /Master/texmf-dist/source/latex/ctable
parentc4f01461002a555bae76bcd7615e3c0ec50be835 (diff)
ctable update (13apr08)
git-svn-id: svn://tug.org/texlive/trunk@7413 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ctable')
-rw-r--r--Master/texmf-dist/source/latex/ctable/ctable.dtx41
1 files changed, 32 insertions, 9 deletions
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}}}&#2\NN}
+ \ifx\@ctblnotespar\empty%
+ \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}&#2\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 $