diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/ctable/05c | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ctable/README | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ctable/ctable.pdf | bin | 787038 -> 815944 bytes | |||
| -rwxr-xr-x | Master/texmf-dist/doc/latex/ctable/inst | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/ctable/ctable.dtx | 69 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ctable/ctable.sty | 25 |
6 files changed, 91 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/ctable/05c b/Master/texmf-dist/doc/latex/ctable/05c new file mode 100644 index 00000000000..41bcf0f6864 --- /dev/null +++ b/Master/texmf-dist/doc/latex/ctable/05c @@ -0,0 +1,7 @@ +\ctable[ + mincapwidth = 40mm, + footerwidth, + caption = a lengthy caption +]{c}{\tnote{footnote}} +{\FL row1\tmark\LL} +$Id: 05c,v 1.1 2012/05/28 12:54:25 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/ctable/README b/Master/texmf-dist/doc/latex/ctable/README index 00c29593c37..09d8a1315c3 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.21 of the ctable package +This is version 1.23 of the ctable package License: LPPL ctable.sty provides commands to easily typeset centered or left or @@ -8,13 +8,11 @@ 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.21 relative to v1.20: -- better documentaation for sideways, captionsleft/right/inside +changes of v1.23 relative to v1.22: +- added the footerwidth option -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.22 relative to v1.21: +- allow empty lines in last (tabular) argument +- corrected error from hyperref's nameref calls (thanks Marco Daniel!) -$Id: README,v 1.11 2011-09-05 11:39:44 wybo Exp $ +$Id: README,v 1.13 2012/05/28 12:52:08 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/ctable/ctable.pdf b/Master/texmf-dist/doc/latex/ctable/ctable.pdf Binary files differindex ab2777802cd..433a00b7d0a 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/doc/latex/ctable/inst b/Master/texmf-dist/doc/latex/ctable/inst index 48be2d221fc..01656d9325e 100755 --- a/Master/texmf-dist/doc/latex/ctable/inst +++ b/Master/texmf-dist/doc/latex/ctable/inst @@ -28,7 +28,7 @@ in -c|--clean) clean; exit;; -C|--Clean) Clean; exit;; -h|--help) echo 'Usage: ./inst [-c|C|h]'; exit;; -?*) echo 'Illegal argument(s)'; exit;; +?*) echo 'Illegal argument(s): use -c|-C|-h|--clean|--Clean|--help'; exit;; esac echo y |tex $NAME.ins >/dev/null @@ -64,7 +64,7 @@ echo y |tex $NAME.ins >/dev/null mkdir -p $LOCAL cp $NAME.{dtx,sty,pdf} $LOCAL || exit 1 fi - sudo mktexlsr $LOCAL + sudo -i mktexlsr $LOCAL exit 0 ) if [ $? != 0 ]; then @@ -74,5 +74,5 @@ else fi texlog_extract $NAME -# $Id: inst,v 1.26 2011-08-14 16:02:44 wybo Exp $ +# $Id: inst,v 1.28 2012/05/28 12:53:17 wybo Exp $ diff --git a/Master/texmf-dist/source/latex/ctable/ctable.dtx b/Master/texmf-dist/source/latex/ctable/ctable.dtx index d9a51c5e206..63883c3942b 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/09/05 v1.21 ctable package] + [2012/05/28 v1.23 ctable package] %</package> % %<*driver> @@ -79,7 +79,7 @@ %</driver> % \fi % -% \CheckSum{567} +% \CheckSum{604} % % \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 @@ -169,7 +169,15 @@ % \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.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 +% } % % \GetFileInfo{ctable.dtx} % @@ -302,6 +310,13 @@ % \DescribeMacro{figure\hfill} % produce a figure float instead of a table float. See also: |table|. % +% \DescribeMacro{footerwidth=...\hfill} +% Footnotes are typeset within the width of the table. When you use the +% |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. +% % \DescribeMacro{framebg={\slshape r g b}\hfill} % set the background color of the frame (the color inside the frame) to the % given triplet of \textsl{rgb}-values. The values should be numbers @@ -341,7 +356,8 @@ % set to that of the tabular, and the caption and footnotes are typeset % within that width. This may be a problem with very narrow tables; % |mincapwidth| can then be used to give the float a minimum width. The -% tabular will be centered in it. +% tabular will be centered in it. If you don't want the footnotes to be affected +% see the |footerwidth| option. % % \DescribeMacro{nonotespar\hfill} % typeset footnotes in a table; this is the default. See also: |notespar|. @@ -659,7 +675,11 @@ % the table: values larger than |\hsize| will move a centered table out of the % center, a value of |\hsize| will prevent the |left| and |right| options to do % their work, because the table is already captured between the left and right -% margins. +% margins. When footnotes are small, you may wish to undo the effect of the +% |mincapwidth| option on them: +% \medskip\\ +% \ROW{B}{s05c}{05c} +% \medskip % % \subsection{\ttfamily\bfseries maxwidth} % When \LaTeX-sources containing tables are generated automatically by a @@ -724,17 +744,19 @@ % % \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|: +% 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} % % \StopEventually{} % % \section{Implementation} +% Package etoolbox provides |\expandonce| % \begin{macrocode} \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating} +\RequirePackage{etoolbox} \def\NN{\tabularnewline} \def\FL{\toprule} \def\ML{\NN\midrule} @@ -759,6 +781,7 @@ \newdimen\@ctblcaptionskip \newdimen\@defaultctblcaptionskip \newdimen\@ctblmaxwidth \newdimen\@defaultctblmaxwidth \newdimen\@ctblmincapwidth \newdimen\@defaultctblmincapwidth +\newdimen\@ctblfooterwidth \newdimen\@defaultctblfooterwidth \newdimen\@ctblw % the final width \newdimen\@ctblfloatwidth \newdimen\@ctbloldsep @@ -794,6 +817,7 @@ \define@key{suctbl}{left}[]{\let\@defaultctblalign\raggedright} \define@key{suctbl}{maxwidth}{\@defaultctblmaxwidth=#1} \define@key{suctbl}{mincapwidth}{\@defaultctblmincapwidth=#1} +\define@key{suctbl}{footerwidth}[-1pt]{\@defaultctblfooterwidth=#1} \define@key{suctbl}{nonotespar}[]{\let\@defaultctblnotespar\@ctblfalse} \define@key{suctbl}{nosideways}[]{\let\@defaultctblsideways\empty} \define@key{suctbl}{nostar}[]{\def\@defaultctblstarred{}} @@ -819,6 +843,7 @@ width=0pt, maxwidth=0pt, mincapwidth=0pt, + footerwidth=0pt, nosideways, center, nostar, @@ -845,6 +870,7 @@ \define@key{ctbl}{left}[]{\let\@ctblalign\raggedright} \define@key{ctbl}{maxwidth}{\@ctblmaxwidth=#1} \define@key{ctbl}{mincapwidth}{\@ctblmincapwidth=#1} +\define@key{ctbl}{footerwidth}[-1pt]{\@ctblfooterwidth=#1} \define@key{ctbl}{nonotespar}[]{\let\@ctblnotespar\@ctblfalse} \define@key{ctbl}{nosideways}[]{\let\@ctblsideways\empty} \define@key{ctbl}{nostar}[]{\def\@ctblstarred{}} @@ -870,9 +896,14 @@ \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi \@ctblcaption\ \@ctblcontinued\strut} \ifx\@ctblcap\empty - \caption[]{\@ctblcaptionarg} + \begingroup + \edef\x{\endgroup\noexpand\caption[]{\expandonce\@ctblcaptionarg}} + \x \else - \caption[\@ctblcap]{\@ctblcaptionarg} + \begingroup + \edef\x{\endgroup\noexpand\caption[\expandonce\@ctblcap]% + {\expandonce\@ctblcaptionarg}} + \x \fi \fi } @@ -886,7 +917,7 @@ \let\NC@find@X\undefined \newcolumntype{X}{#1}% } -\def\@ctblframe#1#2#3{% +\long\def\@ctblframe#1#2#3{% \@ctbloldsep\fboxsep\fboxsep\@ctblframesep% \@ctbloldrule\fboxrule\fboxrule\@ctblframerule% \fcolorbox{#1}{#2}{\fboxsep\@ctbloldsep\fboxrule\@ctbloldrule #3}% @@ -920,6 +951,7 @@ \@ctblwidth \@defaultctblwidth \@ctblmaxwidth \@defaultctblmaxwidth \@ctblmincapwidth \@defaultctblmincapwidth + \@ctblfooterwidth \@defaultctblfooterwidth \def\@ctblfgactual {@defaultctblframefg} \def\@ctblbgactual {@defaultctblframebg} \def\@ctblbeg {\begin{\@ctblsideways\@ctbltaborfig\@ctblstarred}} @@ -1031,11 +1063,20 @@ \end{minipage}% \else% \\ - \begin{tabularx}{\hsize}{r@{\,}>{\raggedright}X} +% \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 +% |mincapwidth| option); if it is -1pt (because |footerwidth| was set without an argument) +% 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 + \ifdim\@ctblfooterwidth=0pt\hsize\else + \@ctblfooterwidth\fi\fi + }{r@{\,}>{\raggedright}X} #3% \end{tabularx}% \fi - } \fi \ifx\@ctblbotcap\@ctbltrue\vskip\@ctblcaptionskip\@ctblCaption\fi @@ -1045,4 +1086,4 @@ % \end{macrocode} % \Finale \endinput -$Id: ctable.dtx,v 1.76 2011-09-05 11:37:29 wybo Exp $ +$Id: ctable.dtx,v 1.80 2012/05/28 12:51:59 wybo Exp $ diff --git a/Master/texmf-dist/tex/latex/ctable/ctable.sty b/Master/texmf-dist/tex/latex/ctable/ctable.sty index 04251fa323e..f5f7304a58e 100644 --- a/Master/texmf-dist/tex/latex/ctable/ctable.sty +++ b/Master/texmf-dist/tex/latex/ctable/ctable.sty @@ -22,8 +22,9 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ctable} - [2011/09/05 v1.21 ctable package] + [2012/05/28 v1.23 ctable package] \RequirePackage{color,xkeyval,array,tabularx,booktabs,rotating} +\RequirePackage{etoolbox} \def\NN{\tabularnewline} \def\FL{\toprule} \def\ML{\NN\midrule} @@ -48,6 +49,7 @@ \newdimen\@ctblcaptionskip \newdimen\@defaultctblcaptionskip \newdimen\@ctblmaxwidth \newdimen\@defaultctblmaxwidth \newdimen\@ctblmincapwidth \newdimen\@defaultctblmincapwidth +\newdimen\@ctblfooterwidth \newdimen\@defaultctblfooterwidth \newdimen\@ctblw % the final width \newdimen\@ctblfloatwidth \newdimen\@ctbloldsep @@ -72,6 +74,7 @@ \define@key{suctbl}{left}[]{\let\@defaultctblalign\raggedright} \define@key{suctbl}{maxwidth}{\@defaultctblmaxwidth=#1} \define@key{suctbl}{mincapwidth}{\@defaultctblmincapwidth=#1} +\define@key{suctbl}{footerwidth}[-1pt]{\@defaultctblfooterwidth=#1} \define@key{suctbl}{nonotespar}[]{\let\@defaultctblnotespar\@ctblfalse} \define@key{suctbl}{nosideways}[]{\let\@defaultctblsideways\empty} \define@key{suctbl}{nostar}[]{\def\@defaultctblstarred{}} @@ -97,6 +100,7 @@ width=0pt, maxwidth=0pt, mincapwidth=0pt, + footerwidth=0pt, nosideways, center, nostar, @@ -123,6 +127,7 @@ \define@key{ctbl}{left}[]{\let\@ctblalign\raggedright} \define@key{ctbl}{maxwidth}{\@ctblmaxwidth=#1} \define@key{ctbl}{mincapwidth}{\@ctblmincapwidth=#1} +\define@key{ctbl}{footerwidth}[-1pt]{\@ctblfooterwidth=#1} \define@key{ctbl}{nonotespar}[]{\let\@ctblnotespar\@ctblfalse} \define@key{ctbl}{nosideways}[]{\let\@ctblsideways\empty} \define@key{ctbl}{nostar}[]{\def\@ctblstarred{}} @@ -142,9 +147,14 @@ \def\@ctblcaptionarg{\ifx\@ctbllabel\empty\else\label{\@ctbllabel}\fi \@ctblcaption\ \@ctblcontinued\strut} \ifx\@ctblcap\empty - \caption[]{\@ctblcaptionarg} + \begingroup + \edef\x{\endgroup\noexpand\caption[]{\expandonce\@ctblcaptionarg}} + \x \else - \caption[\@ctblcap]{\@ctblcaptionarg} + \begingroup + \edef\x{\endgroup\noexpand\caption[\expandonce\@ctblcap]% + {\expandonce\@ctblcaptionarg}} + \x \fi \fi } @@ -153,7 +163,7 @@ \let\NC@find@X\undefined \newcolumntype{X}{#1}% } -\def\@ctblframe#1#2#3{% +\long\def\@ctblframe#1#2#3{% \@ctbloldsep\fboxsep\fboxsep\@ctblframesep% \@ctbloldrule\fboxrule\fboxrule\@ctblframerule% \fcolorbox{#1}{#2}{\fboxsep\@ctbloldsep\fboxrule\@ctbloldrule #3}% @@ -187,6 +197,7 @@ \@ctblwidth \@defaultctblwidth \@ctblmaxwidth \@defaultctblmaxwidth \@ctblmincapwidth \@defaultctblmincapwidth + \@ctblfooterwidth \@defaultctblfooterwidth \def\@ctblfgactual {@defaultctblframefg} \def\@ctblbgactual {@defaultctblframebg} \def\@ctblbeg {\begin{\@ctblsideways\@ctbltaborfig\@ctblstarred}} @@ -267,11 +278,13 @@ \end{minipage}% \else% \\ - \begin{tabularx}{\hsize}{r@{\,}>{\raggedright}X} + \begin{tabularx}{\ifdim\@ctblfooterwidth=-1pt\@ctblw\else + \ifdim\@ctblfooterwidth=0pt\hsize\else + \@ctblfooterwidth\fi\fi + }{r@{\,}>{\raggedright}X} #3% \end{tabularx}% \fi - } \fi \ifx\@ctblbotcap\@ctbltrue\vskip\@ctblcaptionskip\@ctblCaption\fi |