summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ctable
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-05-01 09:47:00 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-05-01 09:47:00 +0000
commit20e8d98fb75d2ffc940ee5a53effe336030b6017 (patch)
tree392c701b5656e5ac5047ae490ca7e87ffeb6b618 /Master/texmf-dist/source/latex/ctable
parent68e1ceba99c20c0431ffef2bced16aef9522795f (diff)
ctable v1.13
git-svn-id: svn://tug.org/texlive/trunk@7766 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ctable')
-rw-r--r--Master/texmf-dist/source/latex/ctable/ctable.dtx61
1 files changed, 51 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index b9a26422d28..c95d289201d 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>
- [2008/04/13 v1.12 ctable package]
+ [2008/05/01 v1.13 ctable package]
%</package>
%
%<*driver>
@@ -77,7 +77,7 @@
%</driver>
% \fi
%
-% \CheckSum{348}
+% \CheckSum{390}
%
% \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
@@ -137,6 +137,12 @@
% Removed xspace usage - caused overfull badness
% }
% \changes{v1.12}{2008/04/12}{Option notespar added}
+% \changes{v1.13}{2008/05/01}{cap option with empty argument will not be inserted
+% in lot/lof
+% Added option continued, for continuation tables:
+% same number as previous table, ` (continued' added
+% to caption.
+% }
%
% \GetFileInfo{ctable.dtx}
%
@@ -210,7 +216,17 @@
% |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 |\listoftables|.\NN[1ex]
+% |cap={...}| & for a short caption to go to the |\listoftables|.
+% Without the |cap| option, the full caption will go
+% into the |\listoftables|. If |cap| is given an empty
+% value, no entry in the |\listoftables| will be made.
+% This may be useful, for example, with the |continued|
+% option.\NN[1ex]
+%
+% |continued[=...]| & if used, the table will be numbered the same as the
+% previous table. If used without an argument, the caption
+% will be suffixed with ` (continued)', if used with an
+% argument, the suffix will be the argument.\NN[1ex]
%
% |captionskip=...| & moves the caption relative to the table;
% the default is |0ex|, which puts captions at
@@ -517,7 +533,6 @@
% background. Where necessary, the example will show boxes to indicate the page
% and the text body.
%
-% \newpage
% \subsection{\ttfamily\bfseries center, left, right}
% These options align the float in the page; the default is |center|:
% \medskip\\
@@ -538,6 +553,15 @@
% \ROW{Y}{s12a}{12a}
% \ROW{B}{s12b}{12b}
%
+% \subsection{\ttfamily\bfseries continued}
+% The |continued| option suffixes the caption with ` (continued)', and lowers the table
+% number by one, so that it obtains the same number as the previous table.
+% This option can be given an argument to replace the default suffix:
+% \medskip\\
+% \ROW{Y}{s13a}{13a}
+% \ROW{B}{s13b}{13b}
+% \ROW{B}{s13c}{13c}
+%
% \newpage
% \subsection{\ttfamily\bfseries mincapwidth}
% |ctable| forces caption and footnotes to stay within the width of the table.
@@ -668,6 +692,7 @@
\define@key{ctbl}{caption}{\def\@ctblcaption{#1}}
\define@key{ctbl}{cap}{\def\@ctblcap{#1}}
\define@key{ctbl}{label}{\def\@ctbllabel{#1}}
+\define@key{ctbl}{continued}[(continued)]{\def\@ctblcontinued{#1}}
\define@key{ctbl}{pos}{\def\@ctblpos{#1}\def\@ctblbegin{\@ctblbeg[#1]}}
\define@key{ctbl}{width}{\@ctblwidth=#1}
\define@key{ctbl}{maxwidth}{\@ctblmaxwidth=#1}
@@ -691,12 +716,26 @@
\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:
+% A caption will only be generated if the \textsl{caption} option was used.
+% First adapt |\@caption| so that it does not insert empty (short) captions
+% in the lot/lof
% \begin{macrocode}
+\long\def\@caption#1[#2]#3{%
+ \par
+ \ifx#2\empty\else\addcontentsline{\csname ext@#1\endcsname}{#1}%
+ {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}\fi%
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \normalsize
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+ \endgroup}
\def\@ctblCaption{
- \ifx\@ctblcap\empty\let\@ctblcap\@ctblcaption\fi
+ \ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi
\ifx\@ctblcaption\empty\else
- \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption}
+ \caption[\@ctblcap]{\label{\@ctbllabel}\@ctblcaption\ \@ctblcontinued}
\fi
}
\def\@ctblframe#1#2#3{%
@@ -716,10 +755,11 @@
\newcommand{\ctable}[4][]{%
\def\@ctbltaborfig{table}%
\def\@ctblalign {center}%
- \def\@ctblsideways {}%
+ \def\@ctblsideways{}%
+ \def\@ctblcontinued{}%
\def\@ctblpos {}%
\def\@ctblcaption {}%
- \def\@ctblcap {}%
+ \let\@ctblcap\undefined%
\def\@ctbllabel {}%
\def\@ctblbeg {\begin{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
\def\@ctblbegin {\@ctblbeg}%
@@ -825,6 +865,7 @@
% |\@ctblbegin| is now defined as something like |\begin{table}[tbp]|.
% \begin{macrocode}
\@ctblbegin
+ \ifx\@ctblcontinued\empty\else\ContinuedFloat\fi
\begin{\@ctblalign}
\begin{minipage}{\@ctblfloatwidth}\parindent0pt
\ifx\@ctblbotcap\empty\@ctblCaption\vskip\@ctblcaptionskip\fi
@@ -851,4 +892,4 @@
% \end{macrocode}
% \Finale
\endinput
-$Id: ctable.dtx,v 1.58 2008/04/13 15:58:14 wybo Exp $
+$Id: ctable.dtx,v 1.59 2008/04/30 13:18:59 wybo Exp $