summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ctable
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2010-06-30 11:36:16 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2010-06-30 11:36:16 +0000
commitc0404d22fc3919480d33204c2053503a47a3354e (patch)
treedb8c53e131f98a58cf06a9fe4a9d2001fa3e3006 /Master/texmf-dist/source/latex/ctable
parentca6a098e2e1413be5291b8ada623a166843ef436 (diff)
ctable update 1.16
git-svn-id: svn://tug.org/texlive/trunk@19192 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ctable')
-rw-r--r--Master/texmf-dist/source/latex/ctable/ctable.dtx65
1 files changed, 39 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index f32bb859426..e165b8d8a2a 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>
- [2009/09/17 v1.15 ctable package]
+ [2010/06/26 v1.16 ctable package]
%</package>
%
%<*driver>
@@ -30,7 +30,9 @@
verbose,
pdftex,
paper=a4paper,
+ margin=20mm,
bottom=30mm,
+ left=50mm,
nohead
]{geometry}
\usepackage{hyperref}
@@ -41,16 +43,15 @@
\def\URL#1{http://www.ctan.org/tex-archive/help/Catalogue/entries/#1.html}
\def\REF#1{\href{\URL{#1}}{\texttt{#1}}}
\parindent0pt\parskip1ex
-\newcommand{\ROW}[3]{\noindent\parskip0pt%
- %\fboxsep0pt
+\newcommand{\ROW}[3]{\parskip0pt%
\colorbox{#1}{%
\parbox{.98\hsize}{%
- \rule{0pt}{1.5ex}\\
- \parbox{.5\hsize}{\includegraphics{#2}}
- \parbox{.5\hsize}{\centering{\includegraphics{#3}}}
- \\\rule{0pt}{1.5ex}
- }
- }\par
+ \rule{0pt}{1.5ex}\\%%
+ \parbox{.5\hsize}{\includegraphics{#2}}%%
+ \parbox{.5\hsize}{\centering{\includegraphics{#3}}}%%
+ \\\rule{0pt}{1.5ex}%%
+ }%%
+ }\par%%
}
\AtBeginDocument{\RecordChanges}
\AtEndDocument{\PrintChanges}
@@ -78,7 +79,7 @@
%</driver>
% \fi
%
-% \CheckSum{387}
+% \CheckSum{396}
%
% \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
@@ -154,6 +155,9 @@
% \changes{v1.15}{2009/09/17}{removed whitespace before tables,
% corrected marginpars in the documentation
% }
+% \changes{v1.16}{2009/11/02}{option cap={} did not suppress lot/lof entry
+% notespar option now generates fully justified notes
+% }
%
% \GetFileInfo{ctable.dtx}
%
@@ -194,11 +198,11 @@
% to typeset it, and one or more |X| column specifiers should be specified.
% Otherwise tabular will be used.
%
-% This package defines the commands |\ctable|,
-% |\tnote| and |\tmark|, as well as four |\tabularnewline| generating
+% This package defines the commands |\ctable|, |\tnote| and
+% |\tmark|, and four |\tabularnewline| generating
% commands. The latter generate reasonable amounts of whitespace
-% around horizontal rules and are also useful for tabulars outside
-% this package.
+% around horizontal rules and are also useful for tabulars
+% outside this package.
%
% Since the |ctable| package imports the \REF{array} and \REF{booktabs}
% packages, all commands from those packages are available as well.
@@ -450,7 +454,7 @@
% caption = Example with a specified width of 100mm,
% label = width,
% width = 100mm,
-% pos = h,
+% pos = ht,
% left
% ]{c>{\raggedright}Xc>{\raggedright}X}{
% \tnote{footnotes are placed under the table}
@@ -471,7 +475,7 @@
% caption = Example with a specified width of 100mm,
% label = width,
% width = 100mm,
-% pos = h,
+% pos = ht,
% left
% ]{c>{\raggedright}Xc>{\raggedright}X}{
% \tnote{footnotes are placed under the table}
@@ -631,9 +635,13 @@
\def\FL{\toprule}
\def\ML{\NN\midrule}
\def\LL{\NN\bottomrule}
+\definecolor{@ctblframefg}{rgb}{0,0,0}%
+\definecolor{@ctblframebg}{rgb}{1,1,1}%
\def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
\def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
-\def\@ctbltextsuperscript#1{\ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi}
+\def\@ctbltextsuperscript#1{%
+ \ifx\@ctblnosuper\empty\@textsuperscript{#1}\else{\footnotesize#1}\fi
+}
\def\@ctbldoinside{\relax}
\newdimen\@ctblframesep
\newdimen\@ctblframerule
@@ -685,14 +693,21 @@
\define@key{ctbl}{notespar}[]{\def\@ctblnotespar{1}}
\define@key{ctbl}{doinside}{\def\@ctbldoinside{#1}}
% \end{macrocode}
-% 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
+% A caption will only be generated if the \textsl{caption} option was used, with a
+% non-empty value. If so, it goes in the lot/lof, unless the \textsl{cap} option
+% specified a different (probably shorter) value for it. A \textsl{cap} option with
+% an empty value inhibits a tof/lof entry.
% \begin{macrocode}
\def\@ctblCaption{
\ifx\@ctblcap\undefined\let\@ctblcap\@ctblcaption\fi
\ifx\@ctblcaption\empty\else
- \caption[\@ctblcap]{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi\@ctblcaption\ \@ctblcontinued\strut}
+ \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi
+ \@ctblcaption\ \@ctblcontinued\strut}
+ \ifx\@ctblcap\empty
+ \caption[]{\@ctblcaptionarg}
+ \else
+ \caption[\@ctblcap]{\@ctblcaptionarg}
+ \fi
\fi
}
% \end{macrocode}
@@ -733,10 +748,8 @@
\def\@ctblend {\end{\@ctblsideways\@ctbltaborfig\@ctblstarred}}%
\def\@ctblbotcap {}%
\def\@ctblstarred {}%
- \def\@ctblnosuper{}
+ \def\@ctblnosuper {}%
\def\@ctblnotespar{}%
- \definecolor{@ctblframefg}{rgb}{0,0,0}%
- \definecolor{@ctblframebg}{rgb}{1,1,1}%
\@ctblframerule0pt
\@ctblcaptionskip=0ex
\@ctblframesep0pt
@@ -849,7 +862,7 @@
\end{tabularx}%
\else%
\\[.2ex]
- \begin{minipage}{\hsize}\raggedright%
+ \begin{minipage}{\hsize}%
#3%
\end{minipage}%
\fi
@@ -862,4 +875,4 @@
% \end{macrocode}
% \Finale
\endinput
-$Id: ctable.dtx,v 1.65 2009-09-16 23:09:29 wybo Exp $
+$Id: ctable.dtx,v 1.68 2010-06-26 21:04:57 wybo Exp $