diff options
author | Karl Berry <karl@freefriends.org> | 2009-09-04 23:45:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-09-04 23:45:33 +0000 |
commit | 1abef80322709db7bef6181b09b80cbb3a637203 (patch) | |
tree | 5514944f65301563b20a87d09faf4d9a1b5c368e /Master/texmf-dist/source/latex/tocloft | |
parent | 714854a6373d296137e05b4c6e2bc771dff7e643 (diff) |
tocloft update (4sep09)
git-svn-id: svn://tug.org/texlive/trunk@15111 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/tocloft')
-rw-r--r-- | Master/texmf-dist/source/latex/tocloft/tocloft.dtx | 72 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/tocloft/tocloft.ins | 46 |
2 files changed, 56 insertions, 62 deletions
diff --git a/Master/texmf-dist/source/latex/tocloft/tocloft.dtx b/Master/texmf-dist/source/latex/tocloft/tocloft.dtx index 624fbfcab75..c1e23dc52e9 100644 --- a/Master/texmf-dist/source/latex/tocloft/tocloft.dtx +++ b/Master/texmf-dist/source/latex/tocloft/tocloft.dtx @@ -1,20 +1,18 @@ % \iffalse meta-comment % % tocloft.dtx -% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com -% (or pandgwilson@earthlink.net) +% Author: Peter Wilson, Herries Press +% Maintainer: Will Robertson (will dot robertson at latex-project dot org) % Copyright 1998-2003 Peter R. Wilson +% Copyright 2009 Will Robertson % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either -% version 1.3 of this license or (at your option) any -% later version. -% The latest version of the license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of -% LaTeX version 2003/06/01 or later. +% version 1.3c of this license or (at your option) any +% later version. <http://www.latex-project.org/lppl.txt> % -% This work has the LPPL maintenance status "author-maintained". +% This work has the LPPL maintenance status "maintained". +% The Current Maintainer of this work is Will Robertson. % % This work consists of the files listed in the README file. % @@ -94,6 +92,7 @@ % \changes{v2.3a}{2002/10/03}{Partial fix for Part changes} % \changes{v2.3b}{2003/01/20}{More fixes for Part changes} % \changes{v2.3c}{2003/09/26}{More fixes for hyperref} +% \changes{v2.3d}{2009/09/04}{New maintainer and tiny bug fix} % % \def\dtxfile{\texttt{tocloft.dtx}} % \def\fileversion{v1.1a} \def\filedate{2000/02/11} @@ -104,6 +103,7 @@ % \def\fileversion{v2.3a} \def\filedate{2002/10/03} % \def\fileversion{v2.3b} \def\filedate{2003/01/20} % \def\fileversion{v2.3c} \def\filedate{2003/09/26} +% \def\fileversion{v2.3d} \def\filedate{2009/09/04} % \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package % \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option % \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file @@ -116,10 +116,10 @@ % file (\dtxfile) has version number \fileversion, last revised % \filedate.}} % -% \author{% -% Peter Wilson\thanks{After May 2004 at: \texttt{pandgwilson at earthlink dot net}}\\ -% Catholic University of America \\ -% Now at \texttt{peter.r.wilson@boeing.com} +% \author{ +% Author: Peter Wilson, Herries Press \\ +% Maintainer: Will Robertson \\ +% \texttt{will dot robertson at latex-project dot org} % } % \date{\filedate} % \maketitle @@ -1214,7 +1214,7 @@ % \begin{macrocode} %<*usc> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tocloft}[2003/09/26 v2.3c parameterised ToC, etc., typesetting] +\ProvidesPackage{tocloft}[2009/09/04 v2.3d parameterised ToC, etc., typesetting] % \end{macrocode} % % \begin{macro}{\PRWPackageNote} @@ -1829,8 +1829,8 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftchapaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftchapfont #1}\nobreak - \cftchapfillnum{#2}} - \fi} + \cftchapfillnum{#2}}% + \fi}% \fi % \end{macrocode} % \end{macro} @@ -1865,7 +1865,7 @@ Consider installing the current version of tocbibind.}} \newcommand{\cftchapdotsep}{\cftnodots} \newcommand{\cftchappagefont}{\bfseries} \newcommand{\cftchapafterpnum}{} - \newcommand{\cftchapfillnum}[1]{ + \newcommand{\cftchapfillnum}[1]{% {\cftchapleader}\nobreak \hb@xt@\@pnumwidth{\hfil\cftchappagefont #1}\cftchapafterpnum\par} % \end{macrocode} @@ -1916,7 +1916,7 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftsecaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftsecfont #1}\nobreak - \cftsecfillnum{#2}} + \cftsecfillnum{#2}}% \fi} % \end{macrocode} % \end{macro} @@ -2041,7 +2041,7 @@ Consider installing the current version of tocbibind.}} % \end{macrocode} % Print the leader and the page number, and close the group. % \begin{macrocode} - \cftsubsecfillnum{#2}} + \cftsubsecfillnum{#2}}% \fi} % \end{macrocode} % \end{macro} @@ -2127,7 +2127,7 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftsubsubsecaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftsubsubsecfont #1}\nobreak - \cftsubsubsecfillnum{#2}} + \cftsubsubsecfillnum{#2}}% \fi} % \end{macrocode} % \end{macro} @@ -2205,7 +2205,7 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftparaaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftparafont #1}\nobreak - \cftparafillnum{#2}} + \cftparafillnum{#2}}% \fi} % \end{macrocode} % \end{macro} @@ -2283,7 +2283,7 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftsubparaaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftsubparafont #1}\nobreak - \cftsubparafillnum{#2}} + \cftsubparafillnum{#2}}% \fi} % \end{macrocode} % \end{macro} @@ -2368,7 +2368,7 @@ Consider installing the current version of tocbibind.}} % in one definition, hence some of the checks. First, perform the default % checks for multicolumns. (Do nothing if \Lopt{titles} option is used). % \begin{macrocode} -\AtBeginDocument{ +\AtBeginDocument{% \if@cftnctoc\else \renewcommand{\listoffigures}{% \@cfttocstart @@ -2389,7 +2389,7 @@ Consider installing the current version of tocbibind.}} % \end{macrocode} % Finally, restore any multicolumn typesetting. % \begin{macrocode} - \@cfttocfinish} + \@cfttocfinish}% \fi } @@ -2485,7 +2485,7 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftfigaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftfigfont #1}\nobreak - \cftfigfillnum{#2}} + \cftfigfillnum{#2}}% \fi } % \end{macrocode} @@ -2581,7 +2581,7 @@ Consider installing the current version of tocbibind.}} % checks for multicolumns. (Do nothing if the \Lopt{titles} option has % been used). % \begin{macrocode} -\AtBeginDocument{ +\AtBeginDocument{% \if@cftnctoc\else \renewcommand{\listoftables}{% \@cfttocstart @@ -2602,7 +2602,7 @@ Consider installing the current version of tocbibind.}} % \end{macrocode} % Finally, restore any multicolumn typesetting. % \begin{macrocode} - \@cfttocfinish} + \@cfttocfinish}% \fi } @@ -2698,7 +2698,7 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cfttabaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cfttabfont #1}\nobreak - \cfttabfillnum{#2}} + \cfttabfillnum{#2}}% \fi } % \end{macrocode} @@ -2762,7 +2762,7 @@ Consider installing the current version of tocbibind.}} % \begin{macro}{\@cftl@subfig} % This command redefines the |\l@subfigure| command. % \begin{macrocode} -\newcommand{\@cftl@subfig}{ +\newcommand{\@cftl@subfig}{% % \end{macrocode} % \begin{macro}{\l@subfigure} % |\l@subfigure{|\meta{title}|}{|\meta{page}|}| typesets the LoF entry for @@ -2785,9 +2785,9 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftsubfigaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftsubfigfont ##1}\nobreak - \cftsubfigfillnum{##2}} + \cftsubfigfillnum{##2}}% \fi - } + }% } % \end{macrocode} @@ -2855,7 +2855,7 @@ Consider installing the current version of tocbibind.}} % \begin{macro}{\@cftl@subtab} % This code redefines the code for |\l@subtable|. % \begin{macrocode} -\newcommand{\@cftl@subtab}{ +\newcommand{\@cftl@subtab}{% % \end{macrocode} % \begin{macro}{\l@subtable} % |\l@subtable{|\meta{title}|}{|\meta{page}|}| typesets the LoT entry for @@ -2878,9 +2878,9 @@ Consider installing the current version of tocbibind.}} \let\@cftasnumb \cftsubtabaftersnumb \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip {\cftsubtabfont ##1}\nobreak - \cftsubtabfillnum{##2}} + \cftsubtabfillnum{##2}}% \fi - } + }% } % \end{macrocode} % \end{macro} @@ -2889,7 +2889,7 @@ Consider installing the current version of tocbibind.}} % \begin{macro}{\@cftsetsubtab} % This command sets up the defaults for subtable entries in the LoT. % \begin{macrocode} -\newcommand{\@cftsetsubtab}{ +\newcommand{\@cftsetsubtab}{% % \end{macrocode} % \begin{macro}{\cftbeforesubtabskip} % \begin{macro}{\cftsubtabindent} @@ -3021,7 +3021,7 @@ Consider installing the current version of tocbibind.}} \expandafter\let\expandafter\@cftasnumb\csname cft#2aftersnumb\endcsname \advance\leftskip\@tempdima \null\nobreak\hskip -\leftskip {\@nameuse{cft#2font}##1}\nobreak - \@nameuse{cft#2fillnum}{##2}} + \@nameuse{cft#2fillnum}{##2}}% \fi } % end of \l@#2 diff --git a/Master/texmf-dist/source/latex/tocloft/tocloft.ins b/Master/texmf-dist/source/latex/tocloft/tocloft.ins index 55f10d39567..2917c1302e6 100644 --- a/Master/texmf-dist/source/latex/tocloft/tocloft.ins +++ b/Master/texmf-dist/source/latex/tocloft/tocloft.ins @@ -1,18 +1,17 @@ %% tocloft.ins -%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com -%% (or pandgwilson@earthlink.net) +%% Author: Peter Wilson, Herries Press +%% Maintainer: Will Robertson (will dot robertson at latex-project dot org) +%% Maintainer: Will Robertson (will dot robertson at latex-project dot org) %% Copyright 1998-2003 Peter R. Wilson +%% Copyright 2009 Will Robertson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either -%% version 1.3 of this license or (at your option) any -%% later version. -%% The latest version of the license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2003/06/01 or later. +%% version 1.3c of this license or (at your option) any +%% later version: <http://www.latex-project.org/lppl.txt> %% -%% This work has the LPPL maintenance status "author-maintained". +%% This work has the LPPL maintenance status "maintained". +%% The Current Maintainer of this work is Will Robertson. %% %% This work consists of the files listed in the README file. %% @@ -27,33 +26,28 @@ \input docstrip.tex \preamble - Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com - (or pandgwilson@earthlink.net) + Author: Peter Wilson, Herries Press + Maintainer: Will Robertson (will dot robertson at latex-project dot org) + Maintainer: Will Robertson (will dot robertson at latex-project dot org) Copyright 1998-2003 Peter R. Wilson + Copyright 2009 Will Robertson This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either - version 1.3 of this license or (at your option) any - later version. - The latest version of the license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of - LaTeX version 2003/06/01 or later. - - This work has the LPPL maintenance status "author-maintained". + version 1.3c of this license or (at your option) any + later version: <http://www.latex-project.org/lppl.txt> + + This work has the LPPL maintenance status "maintained". + The Current Maintainer of this work is Will Robertson. This work consists of the files listed in the README file. \endpreamble +\askforoverwritefalse \keepsilent - -%%% \Msg{*** Generating the driver file ***} -%%% \generateFile{tocloft.drv}{t}{\from{tocloft.dtx}{driver}} - -\Msg{*** Generating the LaTeX2e package files ***} - -\generateFile{tocloft.sty}{t}{\from{tocloft.dtx}{usc}} +\askforoverwritefalse +\generate{\file{tocloft.sty}{\from{tocloft.dtx}{usc}}} \Msg{***********************************************************} \Msg{*} |