ctable 1.9 (5mar07)

git-svn-id: svn://tug.org/texlive/trunk@4011 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 30 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
index dc6188376c7..af3adf8973a 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/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index ecd989cd471..dc7eea5a402 100644
--- a/Master/texmf-dist/source/latex/ctable/ctable.dtx
+++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx
@@ -23,12 +23,12 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{ctable}
 %<*package>
-    [2006/10/12 v1.8 ctable package]
+    [2007/03/04 v1.9 ctable package]
 %</package>
 %
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
-\usepackage{carom,txfonts,ctable}
+\usepackage{carom,txfonts,ctable,makeidx}
 \usepackage[
    verbose,
    pdftex,
@@ -46,7 +46,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{321}
+% \CheckSum{335}
 %
 % \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
@@ -90,6 +90,9 @@
 %                            mincapwidth option added
 %                            Moved newdimen definition outside ctable macro
 %                           }
+% \changes{v1.9}{2007/03/04}{Added option nosuper;
+%                            corrected incorrect positioning when table is wider than 
+%                            mincapwidth }
 %
 % \GetFileInfo{ctable.dtx}
 %
@@ -205,6 +208,9 @@
 %                  when the |twocolumn| option or the |\twocolumn|
 %                  command is active.\NN
 %
+% |nosuper|      & in the footnote table, typeset footnote markers on
+%                  the line, instead of superscripted.\NN
+%
 % |framerule=...|& draw a frame around the table with the given rule
 %                  thickness. The default is |0pt|, so that no frame
 %                  will be seen.\NN
@@ -437,6 +443,8 @@
 \def\LL{\NN\bottomrule}
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
+\let\@cttextsuperscript\@textsuperscript
+\def\@ctcopy#1{\footnotesize #1}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
 \newdimen\@ctblwidth
@@ -484,6 +492,7 @@
 \define@key{ctbl}{framefg}{\@ctblfgcolor#1=}%
 \define@key{ctbl}{framebg}{\@ctblbgcolor#1=}%
 \define@key{ctbl}{captionskip}{\@ctblcaptionskip=#1}%
+\define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy}%
 %    \end{macrocode}
 % a caption will only be generated if the \textsl{caption} option was used:
 %    \begin{macrocode}
@@ -499,9 +508,9 @@
    \fcolorbox{#1}{#2}{\fboxsep\@ctbloldsep\fboxrule\@ctbloldrule #3}%
 }
 \newcommand{\tnote}[2][a]{%
-   \hbox{\@textsuperscript{\normalfont\textit{#1}}}&#2\NN}
+   \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}&#2\NN}
 \newcommand{\tmark}[1][a]{%
-   \hbox{\@textsuperscript{\normalfont\textit{#1\xspace}}}}
+   \hbox{\@cttextsuperscript{\normalfont\textit{#1\xspace}}}}
 \newcommand{\ctable}[4][]{%
    \def\@ctbltaborfig{table}%
    \def\@ctblalign   {center}%
@@ -607,12 +616,12 @@
 %    \begin{macrocode}
    \@ctblw=\wd\ctbl@t
 %    \end{macrocode}
-% If mincapwidth was set, 
+% If mincapwidth was set wider than the table, 
 % make only as wide as needed for the caption so that any footnotes 
 % stay within the caption width
 %    \begin{macrocode}
-   \ifdim\@ctblmincapwidth=0pt\@ctblww=\@ctblw\else%
-     \settowidth{\@ctblww}{Table 1: \@ctblcaption}
+   \ifdim\@ctblmincapwidth<\@ctblw\@ctblww=\@ctblw\else%
+     \settowidth{\@ctblww}{\tablename\ \thetable: \@ctblcaption}
      \ifdim\@ctblww>\@ctblmincapwidth\@ctblww=\@ctblmincapwidth\fi%
    \fi
 %    \end{macrocode}
@@ -638,4 +647,4 @@
 %    \end{macrocode}
 % \Finale
 \endinput
-$Id: ctable.dtx,v 1.36 2006/10/12 11:17:43 wybo Exp $
+$Id: ctable.dtx,v 1.41 2007/03/04 16:06:51 wybo Exp $
diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 02ed078f5ac..8fa817c192c 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -23,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{ctable}
-    [2006/10/12 v1.8 ctable package]
+    [2007/03/04 v1.9 ctable package]
 \RequirePackage{xspace,color,xkeyval,array,tabularx,booktabs,rotating}
 \def\NN{\tabularnewline}
 \def\FL{\toprule}
@@ -31,6 +31,8 @@
 \def\LL{\NN\bottomrule}
 \def\@ctblfgcolor#1 #2 #3={\definecolor{@ctblframefg}{rgb}{#1,#2,#3}}
 \def\@ctblbgcolor#1 #2 #3={\definecolor{@ctblframebg}{rgb}{#1,#2,#3}}
+\let\@cttextsuperscript\@textsuperscript
+\def\@ctcopy#1{\footnotesize #1}
 \newdimen\@ctblframesep
 \newdimen\@ctblframerule
 \newdimen\@ctblwidth
@@ -67,6 +69,7 @@
 \define@key{ctbl}{framefg}{\@ctblfgcolor#1=}%
 \define@key{ctbl}{framebg}{\@ctblbgcolor#1=}%
 \define@key{ctbl}{captionskip}{\@ctblcaptionskip=#1}%
+\define@key{ctbl}{nosuper}[]{\let\@cttextsuperscript\@ctcopy}%
 \def\@ctblCaption{
    \ifx\@ctblcap\empty\let\@ctblcap\@ctblcaption\fi
    \ifx\@ctblcaption\empty\else
@@ -79,9 +82,9 @@
    \fcolorbox{#1}{#2}{\fboxsep\@ctbloldsep\fboxrule\@ctbloldrule #3}%
 }
 \newcommand{\tnote}[2][a]{%
-   \hbox{\@textsuperscript{\normalfont\textit{#1}}}&#2\NN}
+   \hbox{\@cttextsuperscript{\normalfont\textit{#1}}}&#2\NN}
 \newcommand{\tmark}[1][a]{%
-   \hbox{\@textsuperscript{\normalfont\textit{#1\xspace}}}}
+   \hbox{\@cttextsuperscript{\normalfont\textit{#1\xspace}}}}
 \newcommand{\ctable}[4][]{%
    \def\@ctbltaborfig{table}%
    \def\@ctblalign   {center}%
@@ -149,8 +152,8 @@
       \fi
    \fi
    \@ctblw=\wd\ctbl@t
-   \ifdim\@ctblmincapwidth=0pt\@ctblww=\@ctblw\else%
-     \settowidth{\@ctblww}{Table 1: \@ctblcaption}
+   \ifdim\@ctblmincapwidth<\@ctblw\@ctblww=\@ctblw\else%
+     \settowidth{\@ctblww}{\tablename\ \thetable: \@ctblcaption}
      \ifdim\@ctblww>\@ctblmincapwidth\@ctblww=\@ctblmincapwidth\fi%
    \fi
    \@ctblbegin
diff --git a/Master/texmf-dist/tpm/ctable.tpm b/Master/texmf-dist/tpm/ctable.tpm
index cf0014ff88e..89c2d506a79 100644
--- a/Master/texmf-dist/tpm/ctable.tpm
+++ b/Master/texmf-dist/tpm/ctable.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/ctable.zip">
     <TPM:Name>ctable</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/10/13 19:46:38</TPM:Date>
+    <TPM:Date>2007/03/04 16:07:00</TPM:Date>
     <TPM:Version>1.5</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Easily typeset centered tables.</TPM:Title>
@@ -19,12 +19,12 @@ the defaults and offering a route for future extensions.
     <TPM:Size>130181</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="7469">
+    <TPM:RunFiles size="7628">
 texmf-dist/tex/latex/ctable/ctable.sty
 texmf-dist/tpm/ctable.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="95206">texmf-dist/doc/latex/ctable/ctable.pdf</TPM:DocFiles>
-    <TPM:SourceFiles size="27506">
+    <TPM:DocFiles size="91635">texmf-dist/doc/latex/ctable/ctable.pdf</TPM:DocFiles>
+    <TPM:SourceFiles size="28005">
 texmf-dist/source/latex/ctable/ctable.dtx
 texmf-dist/source/latex/ctable/ctable.ins
     </TPM:SourceFiles>