summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-26 22:16:59 +0000
committerKarl Berry <karl@freefriends.org>2011-08-26 22:16:59 +0000
commit87f1685a45c8f23851013817d1ead13ff8c20677 (patch)
tree4a98703ca02562e84e35589e6e68b8ab2737d15e /Master
parent48c3c8df1244c0c6ee27db4ee499ea2595100537 (diff)
ctable (24aug11)
git-svn-id: svn://tug.org/texlive/trunk@23702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ctable/06a6
-rw-r--r--Master/texmf-dist/doc/latex/ctable/06b6
-rw-r--r--Master/texmf-dist/doc/latex/ctable/14a9
-rw-r--r--Master/texmf-dist/doc/latex/ctable/README10
-rw-r--r--Master/texmf-dist/doc/latex/ctable/ctable.pdfbin826270 -> 962755 bytes
-rwxr-xr-xMaster/texmf-dist/doc/latex/ctable/inst22
-rw-r--r--Master/texmf-dist/source/latex/ctable/ctable.dtx58
-rw-r--r--Master/texmf-dist/tex/latex/ctable/ctable.sty7
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
9 files changed, 87 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/ctable/06a b/Master/texmf-dist/doc/latex/ctable/06a
index aa8115c6afa..fcc6c0459fd 100644
--- a/Master/texmf-dist/doc/latex/ctable/06a
+++ b/Master/texmf-dist/doc/latex/ctable/06a
@@ -1,6 +1,4 @@
-\ctable[
- framerule = .1pt,
- maxwidth=3cm
+\ctable[framerule=.1pt, maxwidth=3cm
]{lX}{}{\FL 1 & first row\LL}
-$Id: 06a,v 1.1 2007-07-22 15:30:56 wybo Exp $
+$Id: 06a,v 1.2 2011-08-24 14:03:08 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/06b b/Master/texmf-dist/doc/latex/ctable/06b
index 009ec4da9d2..44697a9180f 100644
--- a/Master/texmf-dist/doc/latex/ctable/06b
+++ b/Master/texmf-dist/doc/latex/ctable/06b
@@ -1,6 +1,4 @@
-\ctable[
- framerule = .1pt,
- maxwidth=3cm
+\ctable[framerule=.1pt, maxwidth=3cm
]{lX}{}{\FL 1 & test\LL}
-$Id: 06b,v 1.1 2007-07-22 15:30:56 wybo Exp $
+$Id: 06b,v 1.2 2011-08-24 14:03:14 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/14a b/Master/texmf-dist/doc/latex/ctable/14a
new file mode 100644
index 00000000000..10febdbe5d3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ctable/14a
@@ -0,0 +1,9 @@
+\ctable[
+ caption=Doinside,
+ doinside = \scriptsize]{l}{
+}{\FL
+ This table has all rows \NN
+ set at script size \LL
+}
+
+$Id: 14a,v 1.1 2011-08-24 14:02:37 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README
index d1ddeceda49..fa000349e15 100644
--- a/Master/texmf-dist/doc/latex/ctable/README
+++ b/Master/texmf-dist/doc/latex/ctable/README
@@ -1,4 +1,4 @@
-This is version 1.18 of the ctable package
+This is version 1.20 of the ctable package
License: LPPL
ctable.sty provides commands to easily typeset centered or left or
@@ -8,6 +8,12 @@ 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.20 relative to v1.19:
+- added (for \setupctable only) these options related to the sideways option:
+ captionsleft
+ captionsright
+ captionsinside
+
changes of v1.19 relative to v1.18:
- sideways option did not work anymore; corrected
@@ -15,4 +21,4 @@ major changes of v1.18 relative to v1.17:
- introduced \setupctable, setting defaults for the options
- added complements for several option: topcap, nosideways, et cetera
-$Id: README,v 1.9 2011-04-30 20:23:15 wybo Exp $
+$Id: README,v 1.10 2011-08-24 14:02:11 wybo Exp $
diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf
index f2506c3c912..173dacb13fd 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 be3981d5a02..48be2d221fc 100755
--- a/Master/texmf-dist/doc/latex/ctable/inst
+++ b/Master/texmf-dist/doc/latex/ctable/inst
@@ -1,8 +1,9 @@
#!/bin/bash
-# this script generates ctable's documentation into ctable.pdf
+NAME=ctable
+# this script generates NAME's documentation into NAME.pdf
# and then installs (unless the environment variable NOINSTALL is not empty)
-# ctable in TEXMFLOCAL
+# NAME in TEXMFLOCAL
# This is not a make-like process. If you changed any files, then first run
# inst with the --Clean option, then run inst without options.
@@ -11,8 +12,7 @@ function die {
exit 1
}
-NAME=ctable
-LOCAL=`kpsewhich --expand-var '$TEXMFLOCAL'`/tex/latex/ctable
+LOCAL=`kpsewhich --expand-var '$TEXMFLOCAL'`/tex/latex/$NAME
CLEAN={aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex}
ALLCLEAN={aux,idx,ilg,chk,fls,ind,log,glo,gls,out,tex,sty,cls,pdf}
@@ -35,7 +35,7 @@ echo y |tex $NAME.ins >/dev/null
(
# recompile example graphics if any is missing:
cd doc
- ln -sf ../ctable.sty || exit 1 # use the ctable.sty version to be installed
+ ln -sf ../$NAME.sty || exit 1 # use the $NAME.sty version to be installed
for i in [0-9][0-9]?; do
if [ ! -f $i.pdf -o ! -f s$i.pdf ]; then
echo Creating example graphics
@@ -44,7 +44,7 @@ echo y |tex $NAME.ins >/dev/null
break
fi
done
- rm ctable.sty
+ rm $NAME.sty
cd ..
echo Creating documentation
@@ -64,15 +64,15 @@ echo y |tex $NAME.ins >/dev/null
mkdir -p $LOCAL
cp $NAME.{dtx,sty,pdf} $LOCAL || exit 1
fi
- sudo `which mktexlsr` || exit 1
+ sudo mktexlsr $LOCAL
exit 0
)
if [ $? != 0 ]; then
- echo errors detected, see ctable.log
+ echo errors detected, see $NAME.log
else
- echo ctable successfully installed
+ echo $NAME successfully installed
fi
-texlog_extract ctable
+texlog_extract $NAME
-# $Id: inst,v 1.24 2010-06-26 21:44:29 wybo Exp $
+# $Id: inst,v 1.26 2011-08-14 16:02:44 wybo Exp $
diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx
index 2799a202787..9f38257fa7d 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>
- [2011/05/01 v1.19 ctable package]
+ [2011/08/24 v1.20 ctable package]
%</package>
%
%<*driver>
@@ -79,7 +79,7 @@
%</driver>
% \fi
%
-% \CheckSum{551}
+% \CheckSum{567}
%
% \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
@@ -166,6 +166,9 @@
% }
% \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)
+% }
%
% \GetFileInfo{ctable.dtx}
%
@@ -221,6 +224,12 @@
% made to have them make contact with horizontal rules.
%
% \section{Usage}
+% \DescribeMacro{\setupctable}
+% |\ctable| defaults can be set, either in the preamble or in the body,
+% with:\\
+%
+% |\setupctable{options} % key=value,...|\\
+%
% \DescribeMacro{\ctable}
% |\ctable| is called with 4 parameters, of which the first is optional: \\
%
@@ -241,12 +250,6 @@
% put the caption at the bottom of the float instead of on top of it.
% See also: |topcap|.
%
-% \DescribeMacro{captionskip=...\hfill}
-% moves the caption relative to the table; the default is |0ex|, which puts
-% captions at their default \LaTeX\ positions: a top caption's baseline at
-% |1ex| above the top rule position of the table and a bottom caption's
-% baseline at |4ex| below the bottom rule position.
-%
% \DescribeMacro{caption=...\hfill}
% table caption; the braces are needed only if your caption contains a
% comma or an equals sign.
@@ -257,6 +260,30 @@
% given an empty value, no entry in the |\listoftables| will be made. This
% may be useful, for example, with the |continued| option.
%
+% \DescribeMacro{captionskip=...\hfill}
+% moves the caption relative to the table; the default is |0ex|, which puts
+% captions at their default \LaTeX\ positions: a top caption's baseline at
+% |1ex| above the top rule position of the table and a bottom caption's
+% baseline at |4ex| below the bottom rule position.
+%
+% \DescribeMacro{captionsleft\hfill} This option is defined for
+% |\setupctable| only, and it is effective only where the |sideways| option
+% is used. After |\setupctable{captionsleft}| all tables typeset with the
+% |sideways| option will have their captions at the left.
+%
+% \DescribeMacro{captionsright\hfill} This option is defined for
+% |\setupctable| only, and it is effective only where the |sideways| option
+% is used. After |\setupctable{captionsright}| all tables typeset with the
+% |sideways| option will have their captions at the right.
+%
+% \DescribeMacro{captionsinside\hfill}
+% This option is defined for |\setupctable| only, it is the default, and it is effective
+% only where the |sideways| option is used. After
+% |\setupctable{captionsinside}| all tables typeset with the |sideways|
+% option will have their captions at the left in one-sided documents. In
+% twosided documents, captions will be on the left for odd-numbered pages
+% and on the right for even-numbered pages.
+%
% \DescribeMacro{center\hfill}
% center the table in the available text width; this is the default.
% See also: |left|, |right|.
@@ -646,7 +673,6 @@
% \ROW{Y}{s06a}{06a}
% \ROW{B}{s06b}{06b}
%
-% \newpage
% \subsection{\ttfamily\bfseries framerule}
% The following examples show the use of frames and backgrounds. Every table
% is typeset by |ctable| with a frame around it, but the frame is, by default,
@@ -695,6 +721,13 @@
% \ROW{B}{s01b}{01b}
%
% \newpage
+% \subsection{\ttfamily\bfseries doinside}
+% The argument of doinside is supposed to be a command to be run inside, just before the tabular or tabularx
+% environment. You can use this, for example, for the adjustment of the
+% font size with |\small|:
+% \medskip\\
+% \ROW{Y}{s14a}{14a}
+%
% \subsection{\ttfamily\bfseries sideways}
% The |sideways| option creates a landscape table with its head pointing at the
% spine\,---\,when the documentclass' twoside option has been used, that is. The
@@ -754,6 +787,11 @@
% \begin{macrocode}
\define@key{suctbl}{botcap}[]{\let\@defaultctblbotcap\@ctbltrue}
+\define@key{suctbl}{captionsinside}[]{\def\rot@LR{-1}
+ \if@twoside\@rot@twosidetrue
+ \else\@rot@twosidefalse\fi}
+\define@key{suctbl}{captionsleft}[]{\@rot@twosidefalse\def\rot@LR{-1}}
+\define@key{suctbl}{captionsright}[]{\@rot@twosidefalse\def\rot@LR{0}}
\define@key{suctbl}{captionskip}{\@defaultctblcaptionskip=#1}
\define@key{suctbl}{center}[]{\let\@defaultctblalign\centering}
\define@key{suctbl}{continued}{\def\@defaulttextcontinued{#1}}
@@ -1017,4 +1055,4 @@
% \end{macrocode}
% \Finale
\endinput
-$Id: ctable.dtx,v 1.73 2011-04-30 20:21:06 wybo Exp $
+$Id: ctable.dtx,v 1.75 2011-08-24 14:01:54 wybo Exp $
diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty
index 0114e652f21..7955d9cb078 100644
--- a/Master/texmf-dist/tex/latex/ctable/ctable.sty
+++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{ctable}
- [2011/05/01 v1.19 ctable package]
+ [2011/08/24 v1.20 ctable package]
\RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating}
\def\NN{\tabularnewline}
\def\FL{\toprule}
@@ -55,6 +55,11 @@
\newbox\ctbl@t % tabular saved and measured here
\define@key{suctbl}{botcap}[]{\let\@defaultctblbotcap\@ctbltrue}
+\define@key{suctbl}{captionsinside}[]{\def\rot@LR{-1}
+ \if@twoside\@rot@twosidetrue
+ \else\@rot@twosidefalse\fi}
+\define@key{suctbl}{captionsleft}[]{\@rot@twosidefalse\def\rot@LR{-1}}
+\define@key{suctbl}{captionsright}[]{\@rot@twosidefalse\def\rot@LR{0}}
\define@key{suctbl}{captionskip}{\@defaultctblcaptionskip=#1}
\define@key{suctbl}{center}[]{\let\@defaultctblalign\centering}
\define@key{suctbl}{continued}{\def\@defaulttextcontinued{#1}}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2bcdd5544c9..bdb7f9fe9a4 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -536,6 +536,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'mfpic', "&MAKEcopy",
'mhs', "die 'skipping, nomodify license'",
'milstd', "die 'skipping, have milstd.sty from logic'",
+ 'mimetex', "die 'skipping, CGI'",
'miniltx', "die 'skipping, use graphics-pln'",
'minionpro', "die 'skipping, requires nonfree minion'",
'misc', "&MAKEmisc",