summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-27 16:31:52 +0000
committerKarl Berry <karl@freefriends.org>2013-06-27 16:31:52 +0000
commitd44ded1db743bde915c9777d65bd2f695c153618 (patch)
tree7f451056beb29d59a48ee32a9d4227bf5848a1d0 /Master
parented725d5c234420505cc81dafaf4dd600a0c4b000 (diff)
ctable (16jun13)
git-svn-id: svn://tug.org/texlive/trunk@30980 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ctable/README33
-rw-r--r--Master/texmf-dist/doc/latex/ctable/ctable.pdfbin823322 -> 823265 bytes
-rwxr-xr-xMaster/texmf-dist/doc/latex/ctable/inst17
-rw-r--r--Master/texmf-dist/source/latex/ctable/ctable.dtx274
-rw-r--r--Master/texmf-dist/tex/latex/ctable/ctable.sty14
5 files changed, 197 insertions, 141 deletions
diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README
index 9dc512cd01b..c59511fcb35 100644
--- a/Master/texmf-dist/doc/latex/ctable/README
+++ b/Master/texmf-dist/doc/latex/ctable/README
@@ -1,19 +1,20 @@
-This is version 1.25 of the ctable package
-License: LPPL
+-------------------------------------------------------------------------------------
+ctable --- Flexible typesetting of table and figure floats using key/value directives
+Author: Wybo Dekker
+E-mail: wybo@dekkerdocumenten.nl
+License: Released under the LaTeX Project Public License v1.3c or later
+See: http://www.latex-project.org/lppl.txt
+-------------------------------------------------------------------------------------
-ctable.sty provides commands to easily typeset centered or left or
-right aligned tables and (multiple-)figure floats, with footnotes.
-Instead of an environment, a command with 4 arguments is used; the
-first is optional and is used for key,value pairs generating
-variations on the defaults and offering a route for future
-extensions.
+Short description:
+ctable.sty provides commands to easily typeset centered or left or right
+aligned tables and (multiple-)figure floats, with footnotes. Instead of an
+environment, a command with 4 arguments is used; the first is optional and
+is used for key,value pairs generating variations on the defaults and
+offering a route for future extensions.
-changes of v1.25 relative to v1.24:
-- url's to CTAN corrected
+Installation:
+Execute the inst script with the --help option for more information.
-changes of v1.24 relative to v1.23:
-- require xcolor instead of color
-- added option bgopacity
-- added option sidecap (for memoir only)
-
-$Id: README,v 1.15 2013/05/24 10:12:54 wybo Exp $
+Changes in version 1.26:
+ footerwidth option was inactive when notespar option was active
diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
index e4c87a92ee7..6feca72a6be 100644
--- a/Master/texmf-dist/doc/latex/ctable/ctable.pdf
+++ b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ctable/inst b/Master/texmf-dist/doc/latex/ctable/inst
index 7c5a60a8651..afdd96cd19b 100755
--- a/Master/texmf-dist/doc/latex/ctable/inst
+++ b/Master/texmf-dist/doc/latex/ctable/inst
@@ -19,7 +19,7 @@ function help {
Usage: inst [option]
Options:
-h, --help Print this help
- -c, --clean Clean up, but keep $NAME.{sty,pdf}
+ -c, --clean Clean up, but keep $NAME.{sty,pdf} and README
-C, --Clean Clean up all files that can be regenerated
-z, --zip Create zip for CTAN (developer only)
EOD
@@ -32,7 +32,7 @@ function clean {
}
function Clean {
clean
- rm -f {$NAME,doc/*}.{sty,cls,pdf}
+ rm -f {$NAME,doc/*}.{sty,cls,pdf} README
}
function makeall {
@@ -77,8 +77,15 @@ function makeall {
echo $NAME successfully installed
fi
texlog_extract $NAME
+ readme
}
+function readme { # generate the README file
+ sed -n "/^%<\*readme>/,/^%<\/readme>/p;/\\\\changes{v$version}/,/^% }/p" $NAME.dtx |
+ sed "s/^%//;s/\\\\\\\\$//;/<.readme>/d;/^ }/d;s/ \\\\changes.*/Changes in version $version:/" >README
+}
+
+
function mkzip {
# is cvs up to date?
cvs -Q status 2>&1 |grep Status:|grep -v Up-to-date
@@ -111,9 +118,6 @@ function mkzip {
cvs-date: $cvsdate
EOD
- # is README updated?
- grep "v$version relative to" README >/dev/null || die README not updated - quitting...
-
# normally packdate and cvsdate are equal, because I make the zip right after updating CVS:
if [ $packdate != $cvsdate ]; then
echo package and cvs dates differ
@@ -129,6 +133,7 @@ function mkzip {
echo " created: $zip"
}
+version=`grep " v[0-9.]\+ $NAME package" $NAME.dtx |sed 's/.* v\([0-9.]\+\) .*/\1/' `
if ! options=$(getopt -o hcCz \
-l help,clean,Clean,zip -- "$@"); then exit 1; fi
@@ -148,5 +153,5 @@ done
makeall
-# $Id: inst,v 1.31 2013/04/28 12:25:00 wybo Exp $
+# $Id: inst,v 1.33 2013/06/14 21:12:34 wybo Exp $
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index bdfc2167e99..b3bd0aaceac 100644
--- a/Master/texmf-dist/source/latex/ctable/ctable.dtx
+++ b/Master/texmf-dist/source/latex/ctable/ctable.dtx
@@ -1,25 +1,38 @@
% \iffalse meta-comment
-%
-% Copyright (C) 2005 by Wybo Dekker <wybo@dekkerdocumenten.nl>
-% -------------------------------------------------------
-%
-% This file may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
-% of this license or (at your option) any later version.
-% The latest version of this license is in:
-%
-% http://www.latex-project.org/lppl.txt
-%
-% \fi
-%
-% \iffalse
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+-------------------------------------------------------------------------------------
+ctable --- Flexible typesetting of table and figure floats using key/value directives
+Author: Wybo Dekker
+E-mail: wybo@dekkerdocumenten.nl
+License: Released under the LaTeX Project Public License v1.3c or later
+See: http://www.latex-project.org/lppl.txt
+-------------------------------------------------------------------------------------
+
+Short description:
+ctable.sty provides commands to easily typeset centered or left or right
+aligned tables and (multiple-)figure floats, with footnotes. Instead of an
+environment, a command with 4 arguments is used; the first is optional and
+is used for key,value pairs generating variations on the defaults and
+offering a route for future extensions.
+
+Installation:
+Execute the inst script with the --help option for more information.
+
+%</readme>
+%<*internal>
+\fi
+%</internal>
%<*driver>
\ProvidesFile{ctable.dtx}
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{ctable}
%<*package>
- [2013/05/24 v1.25 Easy, key=value directed, option-rich, typesetting of floats]
+ [2013/06/15 v1.26 ctable package for \
+ flexible typesetting of table and figure floats using key/value directives]
%</package>
%
%<*driver>
@@ -97,92 +110,126 @@
% Right brace \} Tilde \~}
%
%
-% \changes{v1.00}{2000/06/01}{First release.}
-% \changes{v1.01}{2001/03/17}{Making use of booktabs package}
-% \changes{v1.02}{2002/06/24}{Using keyval to reduce args to 4}
-% \changes{v1.03}{2002/07/16}{Many syntactic corrections,
-% thanks to Johannes Braams}
-% \changes{v1.04}{2003/08/11}{Caption, if empty, will not be typeset
-% rotate option added
-% star option added to use table* and figure*
-% environments}
-% \changes{v1.06}{2004/03/20}{left, right and center options added
-% frame{sep,rule,fg,bg} options added
-% error in width-setting corrected}
-% \changes{v1.05}{2003/10/03}{maxwidth option added}
-% \changes{v1.06a}{2004/04/01}{two errors corrected:
-% made setting fboxsep and fboxrule only temporary
-% removed superfluous space after tabulars}
-% \changes{v1.06b}{2004/06/19}{Added several % at eol to remove superfluous
-% whitespace occurring sometimes}
-% \changes{v1.07}{2005/08/09}{Added option sideways, option rotate now obsolete;
-% added option captionskip}
-% \changes{v1.08}{2006/04/10}{Standardized file setup following
-% http://www.ctan.org/tex-archive/info/dtxtut/dtxtut.pdf
-% mincapwidth option added
-% Moved newdimen definition outside ctable macro
-% }
-% \changes{v1.09}{2007/03/04}{Added option nosuper;
-% corrected incorrect positioning when table is wider than
-% mincapwidth}
-% \changes{v1.10}{2007/08/17}{Footnote markers now stay superscript with nosuper.
-% Documentation: added many examples for the options.
-% Corrected some unwanted white space in captions.
-% Caption package included to correct booktabs
-% errors in caption position. And for later use of
-% its facilities. *Captionskip option redefined*: 0pt
-% value now corresponds to LaTeX defaults
-% }
-% \changes{v1.11}{2007/09/07}{Added some percent signs at EOL to prevent
-% whitespace,
-% 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.
-% }
-% \changes{v1.14}{2009/09/15}{nosuper propagation to later tables prohibited
-% added option doinside
-% use of (obsolete) carom.sty for docs discontinued
-% empty labels not created
-% newcolumntype warnings removed
-% caption package not needed anymore
-% }
-% \changes{v1.15}{2009/09/17}{removed whitespace before tables,
-% corrected marginpars in the documentation
-% }
-% \changes{v1.16}{2010/06/26}{option cap={} did not suppress lot/lof entry
-% notespar option now generates fully justified notes
-% }
-% \changes{v1.17}{2010/10/30}{option cap={} did not suppress lot/lof entry
-% notespar option now generates fully justified notes
-% }
-% \changes{v1.18}{2011/04/15}{added setupctable for option defaults
-% added complement for several options (topcap, nosideways, et cetera
-% }
-% \changes{v1.19}{2011/05/01}{sideways option did not work anymore; corrected
-% }
-% \changes{v1.20}{2011/08/24}{added options captionsleft, captionsright, captionsinside;
-% (for setupctable only)
-% }
-% \changes{v1.21}{2011/09/05}{better documentation for sideways, captionsleft/right/inside
-% options
-% }
-% \changes{v1.22}{2012/05/25}{allow empty lines in last (tabular) argument
-% corrected error from hyperref's nameref calls
-% (thanks Marco Daniel!)
-% }
-% \changes{v1.23}{2012/05/28}{footerwidth option added
-% }
-% \changes{v1.24}{2013/04/28}{require xcolor instead of color
-% added option bgopacity
-% added option sidecap (for memoir only)
-% }
-% \changes{v1.25}{2013/05/24}{url's to CTAN corrected
-% }
+% \changes{v1.00}{2000/06/01}{
+% first release.
+% }
+% \changes{v1.01}{2001/03/17}{
+% making use of booktabs package
+% }
+% \changes{v1.02}{2002/06/24}{
+% using keyval to reduce args to 4
+% }
+% \changes{v1.03}{2002/07/16}{
+% many syntactic corrections, thanks to Johannes Braams
+% }
+% \changes{v1.04}{2003/08/11}{
+% - caption, if empty, will not be typeset\\
+% - rotate option added\\
+% - star option added to use table* and figure*\\
+% - environments
+% }
+% \changes{v1.06}{2004/03/20}{
+% - left, right and center options added\\
+% - frame{sep,rule,fg,bg} options added\\
+% - error in width-setting corrected
+% }
+% \changes{v1.05}{2003/10/03}{
+% maxwidth option added
+% }
+% \changes{v1.06a}{2004/04/01}{
+% - made setting fboxsep and fboxrule only temporary\\
+% - removed superfluous space after tabulars
+% }
+% \changes{v1.06b}{2004/06/19}{
+% added several % at eol to remove superfluous whitespace occurring
+% sometimes
+% }
+% \changes{v1.07}{2005/08/09}{
+% - added option sideways, option rotate now obsolete\\
+% - added option captionskip
+% }
+% \changes{v1.08}{2006/04/10}{
+% - standardized file setup following
+% http://www.ctan.org/tex-archive/info/dtxtut/dtxtut.pdf\\
+% - mincapwidth option added\\
+% - moved newdimen definition outside ctable macro
+% }
+% \changes{v1.09}{2007/03/04}{
+% - added option nosuper\\
+% - corrected incorrect positioning when table is wider than mincapwidth
+% }
+% \changes{v1.10}{2007/08/17}{
+% - footnote markers now stay superscript with nosuper\\
+% - documentation: added many examples for the options\\
+% - corrected some unwanted white space in captions\\
+% - caption package included to correct booktabs errors in caption
+% position. And for later use of its facilities\\
+% - *captionskip option redefined*: 0pt value now corresponds to LaTeX
+% default
+% }
+% \changes{v1.11}{2007/09/07}{
+% - added some percent signs at EOL to prevent whitespace\\
+% - 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
+% }
+% \changes{v1.14}{2009/09/15}{
+% - nosuper propagation to later tables prohibited\\
+% - added option doinside\\
+% - use of (obsolete) carom.sty for docs discontinued\\
+% - empty labels not created\\
+% - newcolumntype warnings removed\\
+% - caption package not needed anymore
+% }
+% \changes{v1.15}{2009/09/17}{
+% - removed whitespace before tables\\
+% - corrected marginpars in the documentation
+% }
+% \changes{v1.16}{2010/06/26}{
+% - option cap={} did not suppress lot/lof entry\\
+% - notespar option now generates fully justified notes
+% }
+% \changes{v1.17}{2010/10/30}{
+% doinside option propagated in subsequent ctable calls
+% }
+% \changes{v1.18}{2011/04/15}{
+% - added setupctable for option defaults\\
+% - added complement for several options (topcap, nosideways, et cetera)
+% }
+% \changes{v1.19}{2011/05/01}{
+% sideways option did not work anymore; corrected
+% }
+% \changes{v1.20}{2011/08/24}{
+% added options captionsleft, captionsright, captionsinside; (for
+% setupctable only)
+% }
+% \changes{v1.21}{2011/09/05}{
+% better documentation for sideways, captionsleft/right/inside options
+% }
+% \changes{v1.22}{2012/05/25}{
+% - allow empty lines in last (tabular) argument\\
+% - corrected error from hyperref's nameref calls (thanks Marco Daniel!)
+% }
+% \changes{v1.23}{2012/05/28}{
+% footerwidth option added
+% }
+% \changes{v1.24}{2013/04/28}{
+% - require xcolor instead of color\\
+% - added option bgopacity\\
+% - added option sidecap (for memoir only)
+% }
+% \changes{v1.25}{2013/05/24}{
+% url's to CTAN corrected
+% }
+% \changes{v1.26}{2013/06/15}{
+% footerwidth option was inactive when notespar option was active
+% }
%
% \GetFileInfo{ctable.dtx}
%
@@ -336,7 +383,7 @@
% |mincapwidth| option, presumably because the table is very narrow, footnotes
% are given the same width as the caption. With small footnotes this may not
% be what you want; this option can be used to give the footnotes their own width.
-% Without an argument, they will be type set within the width of of the table.
+% Without an argument, they will be typeset within the width of of the table.
%
% \DescribeMacro{framebg={\slshape r g b}\hfill}
% set the background color of the frame (the color inside the frame) to the
@@ -995,6 +1042,7 @@
}
\newcommand{\tmark}[1][a]{%
\hbox{\textsuperscript{\normalfont\textit{#1}}}}
+\newdimen\@ctblcurftwidth
\newcommand{\ctable}[4][]{%
\let\@ctbltaborfig \@defaultctbltaborfig
\let\@ctblalign \@defaultctblalign
@@ -1146,14 +1194,6 @@
\centering{\usebox\ctbl@t} % insert the tabular
\def\@ctblfootnotes{#3}%
\ifx#3\empty\else{% append footnotes, if any
- \footnotesize
- \ifx\@ctblnotespar\@ctbltrue%
- \\[.2ex]
- \begin{minipage}{\hsize}%
- #3%
- \end{minipage}%
- \else%
- \\
% \end{macrocode}
% Footnotes: if the |footerwidth| is 0pt (the default), typeset the footer as
% wide as the caption (which may be wider than the table because of the
@@ -1161,10 +1201,18 @@
% make it as wide as the table; otherwise, give it the width set by the
% |footerwidth| option.
% \begin{macrocode}
- \begin{tabularx}{\ifdim\@ctblfooterwidth=-1pt\@ctblw\else
+ \@ctblcurftwidth=\ifdim\@ctblfooterwidth=-1pt\@ctblw\else
\ifdim\@ctblfooterwidth=0pt\hsize\else
\@ctblfooterwidth\fi\fi
- }{r@{\,}>{\raggedright}X}
+ \footnotesize
+ \ifx\@ctblnotespar\@ctbltrue%
+ \\[.2ex]
+ \begin{minipage}{\@ctblcurftwidth}%
+ #3%
+ \end{minipage}%
+ \else%
+ \\
+ \begin{tabularx}{\@ctblcurftwidth}{r@{\,}>{\raggedright}X}
#3%
\end{tabularx}%
\fi
@@ -1178,4 +1226,4 @@
% \end{macrocode}
% \Finale
\endinput
-$Id: ctable.dtx,v 1.85 2013/05/24 10:13:04 wybo Exp $
+$Id: ctable.dtx,v 1.86 2013/06/14 21:06:55 wybo Exp $
diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 2434838dcbc..7aa8c10e1c9 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -22,7 +22,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{ctable}
- [2013/05/24 v1.25 Easy, key=value directed, option-rich, typesetting of floats]
+ [2013/06/15 v1.26 ctable package for \
+ flexible typesetting of table and figure floats using key/value directives]
\RequirePackage{ifpdf,xcolor,xkeyval,array,tabularx,booktabs,rotating}
\ifpdf
\RequirePackage{transparent}
@@ -192,6 +193,7 @@
}
\newcommand{\tmark}[1][a]{%
\hbox{\textsuperscript{\normalfont\textit{#1}}}}
+\newdimen\@ctblcurftwidth
\newcommand{\ctable}[4][]{%
\let\@ctbltaborfig \@defaultctbltaborfig
\let\@ctblalign \@defaultctblalign
@@ -302,18 +304,18 @@
\centering{\usebox\ctbl@t} % insert the tabular
\def\@ctblfootnotes{#3}%
\ifx#3\empty\else{% append footnotes, if any
+ \@ctblcurftwidth=\ifdim\@ctblfooterwidth=-1pt\@ctblw\else
+ \ifdim\@ctblfooterwidth=0pt\hsize\else
+ \@ctblfooterwidth\fi\fi
\footnotesize
\ifx\@ctblnotespar\@ctbltrue%
\\[.2ex]
- \begin{minipage}{\hsize}%
+ \begin{minipage}{\@ctblcurftwidth}%
#3%
\end{minipage}%
\else%
\\
- \begin{tabularx}{\ifdim\@ctblfooterwidth=-1pt\@ctblw\else
- \ifdim\@ctblfooterwidth=0pt\hsize\else
- \@ctblfooterwidth\fi\fi
- }{r@{\,}>{\raggedright}X}
+ \begin{tabularx}{\@ctblcurftwidth}{r@{\,}>{\raggedright}X}
#3%
\end{tabularx}%
\fi