tocbibind update (4sep09)

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

5 files changed, 81 insertions, 91 deletions

diff --git a/Master/texmf-dist/doc/latex/tocbibind/README b/Master/texmf-dist/doc/latex/tocbibind/README
index 0258d7a15d1..2fe255c19c5 100644
--- a/Master/texmf-dist/doc/latex/tocbibind/README
+++ b/Master/texmf-dist/doc/latex/tocbibind/README
@@ -1,66 +1,69 @@
+_____________________
+The TOCBIBIND package
+
     The tocbibind package can be used to add the ToC and/or bibliography 
 and/or the index etc., to the Table of Contents listing.
 
-Changes (2004/05/10)
-o Changed license from LPPL v1.0 to v1.3
+Changes in version 1.5i (2009/09/04)
+- New maintainer (Will Robertson)
+
+Changes in version 1.5h (2004/05/10)
+- Changed license from LPPL v1.0 to v1.3
 
 Changes in version 1.5g (2003/03/13)
-o Fixed Bibliography page headings in twocolumn book class
+- Fixed Bibliography page headings in twocolumn book class
 
 Changes in version 1.5f (2003/02/04)
-o Fixed Index heading \MakeUppercase problem
+- Fixed Index heading \MakeUppercase problem
 
 Changes in version 1.5e (2003/01/22)
-o Improved harmony with the chapterbib and natbib packages
+- Improved harmony with the chapterbib and natbib packages
 
 Changes in version 1.5d (2002/04/09)
-o Fixed problem with \tocchapter in non-chaptered documents
+- Fixed problem with \tocchapter in non-chaptered documents
 
 Changes in version 1.5c (2002/03/11)
-o Fixed problem with \tocetcmark
+- Fixed problem with \tocetcmark
 
 Changes in version 1.5b (2001/11/10)
-o Improved interface for new pagestyles
+- Improved interface for new pagestyles
 
 Changes in version 1.5 (2001/04/17)
-o Removed requirement for the stdclsdv package
-o Fixed problem when used with the hyperref package
+- Removed requirement for the stdclsdv package
+- Fixed problem when used with the hyperref package
 
 Changes in version 1.4a (2000/03/05)
-o Improved flexibility of single line numbered chapters
-o Examples of handling additional kinds of List of...
-o Replaced command \toc@file by \tocfile
+- Improved flexibility of single line numbered chapters
+- Examples of handling additional kinds of List of...
+- Replaced command \toc@file by \tocfile
 
 Changes in version 1.4: (2000/03/04)
-o Disabled LaTeX feature (bug 3126) of change in Index title height
-o Added commands for single line numbered chapter headings
-o Added numbered List of... headings
+- Disabled LaTeX feature (bug 3126) of change in Index title height
+- Added commands for single line numbered chapter headings
+- Added numbered List of... headings
 
 Changes in version 1.3a: (1999/09/12)
-o Fixed index numbering, options, and headings
-o Improved (warning) reporting
+- Fixed index numbering, options, and headings
+- Improved (warning) reporting
 
 Changes in version 1.2: (1999/01/17)
-o Operates with the tocloft package
-o Supports numbered bibliography and index headings
+- Operates with the tocloft package
+- Supports numbered bibliography and index headings
 
 First public release: version 1.0 (1998/10/24) 
 
 ----------------------------------------------------------------- 
-  Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-                             (or at: pandgwilson at earthlink dot net) 
-  Copyright 1998 --- 2004 Peter R. Wilson
+  Author: Peter Wilson, Herries Press
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+  Copyright 1998--2004 Peter R. Wilson
  
   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:
 README (this file)
@@ -78,19 +81,14 @@ tocbibind.pdf (user manual)
 ----------------------------------------------------------------- 
 
     To install the package:
-o run: latex tocbibind.ins (which will generate tocbibind.sty)
-o Move tocbibind.sty to a location where LaTeX will find it
+- run: latex tocbibind.ins (which will generate tocbibind.sty)
+- Move tocbibind.sty to a location where LaTeX will find it
   (typically in a local texmf tree at tex/latex/***) and refresh the
   file database. See the FAQ on CTAN at help/uk-tex-faq or
   http://www.tug.ac.uk/faq for more information on this.
 
     To process the manual:
-o run: latex tocbibind.dtx
-o For an index, run: makeindex -s gind.ist tocbibind
-o run: latex tocbibind.dtx
-o Print tocbibind.dvi for a hardcopy of the package manual 
-
-2004/05/10
-Peter Wilson
-peter.r.wilson@boeing.com
-
+- run: latex tocbibind.dtx
+- For an index, run: makeindex -s gind.ist tocbibind
+- run: latex tocbibind.dtx
+- Print tocbibind.dvi for a hardcopy of the package manual 
diff --git a/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf b/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf
index 08d7dd5da0b..807c510ab00 100644
--- a/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf
+++ b/Master/texmf-dist/doc/latex/tocbibind/tocbibind.pdf
diff --git a/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx b/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx
index a2514d354b9..02a44a7456a 100644
--- a/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx
+++ b/Master/texmf-dist/source/latex/tocbibind/tocbibind.dtx
@@ -1,19 +1,16 @@
 % \iffalse meta-comment
 % tocbibind.dtx
-% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%                            (or at: pandgwilson at earthlink dot net) 
-% Copyright 1998 --- 2004 Peter R. Wilson
+% Author: Peter Wilson, Herries Press
+% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+% Copyright 1998--2004 Peter R. Wilson
 %
 % 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.
 %
@@ -91,6 +88,7 @@
 % \changes{v1.5e}{2003/01/22}{Changed thebibliography}
 % \changes{v1.5f}{2003/02/04}{Changed theindex}
 % \changes{v1.5h}{2004/05/10}{Changed license from LPPL v1.0 to v1.3}
+% \changes{v1.5i}{2009/09/04}{New maintainer (Will Robertson)}
 %
 % \def\dtxfile{tocbibind.dtx}
 % ^^A \def\fileversion{v1.4a}
@@ -113,6 +111,8 @@
 % \def\filedate{2003/03/13}
 % \def\fileversion{v1.5h}
 % \def\filedate{2004/05/10}
+% \def\fileversion{v1.5i}
+% \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
@@ -124,10 +124,10 @@
 %        file (\texttt{\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
@@ -457,7 +457,7 @@
 %    \begin{macrocode}
 %<*usc>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tocbibind}[2003/03/13 v1.5g extra ToC listings]
+\ProvidesPackage{tocbibind}[2009/09/04 v1.5i extra ToC listings]
 
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/tocbibind/tocbibind.ins b/Master/texmf-dist/source/latex/tocbibind/tocbibind.ins
index 3845d892836..e73e6af8eb9 100644
--- a/Master/texmf-dist/source/latex/tocbibind/tocbibind.ins
+++ b/Master/texmf-dist/source/latex/tocbibind/tocbibind.ins
@@ -1,18 +1,15 @@
 %% tocbibind.ins
-%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%%                            (or at: pandgwilson at earthlink dot net) 
-%% Copyright 1998 --- 2004 Peter R. Wilson
+%% Author: Peter Wilson, Herries Press
+%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+%% Copyright 1998--2004 Peter R. Wilson
 %%
 %% 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.
 %%
@@ -28,34 +25,32 @@
 \preamble
 
 ----------------------------------------------------------------- 
-  Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-                             (or at: pandgwilson at earthlink dot net) 
-  Copyright 1998 --- 2004 Peter R. Wilson
+  Author: Peter Wilson, Herries Press
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+  Copyright 1998--2004 Peter R. Wilson
  
   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{tocbibind.drv}{t}{\from{tocbibind.dtx}{driver}}
+%%% \generate{\file{tocbibind.drv}{\from{tocbibind.dtx}{driver}}}
 
 \Msg{*** Generating the LaTeX2e package files ***}
 
-\generateFile{tocbibind.sty}{t}{\from{tocbibind.dtx}{usc}}
+\generate{\file{tocbibind.sty}{\from{tocbibind.dtx}{usc}}}
 
 \Msg{***********************************************************}
 \Msg{*}
diff --git a/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty b/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty
index b9ac969aa6b..ce9626016fd 100644
--- a/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/tocbibind/tocbibind.sty
@@ -7,26 +7,23 @@
 %% tocbibind.dtx  (with options: `usc')
 %% 
 %% -----------------------------------------------------------------
-%%   Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%%                              (or at: pandgwilson at earthlink dot net)
-%%   Copyright 1998 --- 2004 Peter R. Wilson
+%%   Author: Peter Wilson, Herries Press
+%%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
+%%   Copyright 1998--2004 Peter R. Wilson
 %% 
 %%   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.
 %% -----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tocbibind}[2003/03/13 v1.5g extra ToC listings]
+\ProvidesPackage{tocbibind}[2009/09/04 v1.5i extra ToC listings]
 
 \providecommand{\PRWPackageNote}[2]{%
   \GenericWarning{%