combine update (2sep09)

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

8 files changed, 102 insertions, 114 deletions

diff --git a/Master/texmf-dist/doc/latex/combine/README b/Master/texmf-dist/doc/latex/combine/README
index c579312e635..dc997717478 100644
--- a/Master/texmf-dist/doc/latex/combine/README
+++ b/Master/texmf-dist/doc/latex/combine/README
@@ -1,3 +1,6 @@
+_________________
+The COMBINE class
+
     The combine class lets you bundle individual documents into
 a single document, such as when preparing a conference proceedings.
 
@@ -7,85 +10,88 @@ combnat package enables the combine class and the natbib package
 to be used harmoniously together. The auxiliary combcite package
 provides a version of the cite package for use with the combine class.
 
+______________
+Change History
+
+Changes in version 0.64b of combine.dtx (2009/09/02)
+- New maintainer (Will Robertson)
+
 Minor change in the manual's abstract (2004/05/07)
 
 Changes in version 0.2a of combinet.sty (2004/03/06)
-o Minor internal change to ease hyperref pain
+- Minor internal change to ease hyperref pain
 
 Changes in version 1.0 of combcite.sty (2003/11/09)
-o First public release
+- First public release
 
 Changes in version 0.52 of combine.cls (2003/11/09)
-o Added `memoir' to the class options
+- Added `memoir' to the class options
 
 Changes in version 0.51 of combine.cls (2003/07/17)
-o Added macro to fix stack overflow for the combination:
+- Added macro to fix stack overflow for the combination:
   pdflatex + combine + graphicx + caption2
 
 Changes in version 0.21 of combnat.sty (2003/05/22)
-o Removed extraneous space from year citation.
+- Removed extraneous space from year citation.
 
 Changes in version 0.5 of combine.cls
        and version 0.2 of combnat.sty (2002/08/24)
-o Added options for individual bibliographies, a global bibliography,
+- Added options for individual bibliographies, a global bibliography,
   or both local bibliographies and a global combined bibliography.
 
 Changes in version 0.45 of combine.cls 
        and version 0.2 of combinet.sty (2001/09/05)
-o Fixed ToC alignment problem
+- Fixed ToC alignment problem
 
 Changes in version 0.44 of combine.cls (2001/08/25)
-o Imported documents can now use a class that \LoadClass another class.
+- Imported documents can now use a class that \LoadClass another class.
 
 Changes in version 0.43 of combine.cls (2001/07/09)
-o Removed the feature that the \appendix command changed the
+- Removed the feature that the \appendix command changed the
   numbering scheme in all subsequent imported documents
-o ToC additions are now in predefined order instead of
+- ToC additions are now in predefined order instead of
   input order
 
 Changes in version 0.1 of combnat.sty (2001/07/03)
-o First public release
+- First public release
 
 Changes in version 0.42 of combine.cls (2001/04/04)
-o Fixed incompatibility with the fancyhdr package
-o Reduced, and hopefully eliminated, a pagebreak problem in the ToC
+- Fixed incompatibility with the fancyhdr package
+- Reduced, and hopefully eliminated, a pagebreak problem in the ToC
 
 Changes in version 0.41 of combine.cls (2000/06/18)
-o Cooperates with the abstract and titling packages
+- Cooperates with the abstract and titling packages
 
 Changes in version 0.4 of combine.cls (2000/05/27)
-o Added book option
-o Extra options for ToC contents and more flexible ToC formatting
-o Counters are now reset for each imported document
-o Reduced the save stack size required for latexing combine.dtx
+- Added book option
+- Extra options for ToC contents and more flexible ToC formatting
+- Counters are now reset for each imported document
+- Reduced the save stack size required for latexing combine.dtx
 
 Changes in version 0.3 of combine.cls: (2000/05/20)
-o \newtheorem is now catered for
-o Control over the \maketitle formatting
-o Improved documentation
+- \newtheorem is now catered for
+- Control over the \maketitle formatting
+- Improved documentation
 
 Changes in version 0.2 of combine.cls: (2000/05/07)
-o Renamed as combine class instead of collection class
-o Improved documentation
+- Renamed as combine class instead of collection class
+- Improved documentation
 
 Changes in version 0.1 of combinet.sty: (2000/05/07)
-o First public release
+- First public release
 
 ----------------------------------------------------------------- 
-  Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-                             (or at: pandgwilson at earthlink dot net) 
+  Author: Peter Wilson, Herries Press
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
   Copyright 2001, 2002, 2003, 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 following files:
 README (this file)
@@ -106,17 +112,16 @@ combine.ins
 combine.pdf (user manual)
 
     To install the distribution:
-o run: latex combine.ins (which will generate combine.cls,
+- run: latex combine.ins (which will generate combine.cls,
                           combinet.sty and combnat.sty)
-o run: latex combine.dtx
-o For an index, run: makeindex -s gind.ist combine
-o run: latex combine.dtx
-o Print combine.dvi for a hardcopy of the user manual 
-o Move combine.cls, combinet.sty and combnat.sty to locations 
+- run: latex combine.dtx
+- For an index, run: makeindex -s gind.ist combine
+- run: latex combine.dtx
+- Print combine.dvi for a hardcopy of the user manual 
+- Move combine.cls, combinet.sty and combnat.sty to locations 
   where LaTeX will find them (The FAQ on CTAN in /help/uktug-FAQ
   gives more information about this magic place).
 
 
 2004/05/07
 Peter Wilson
-peter.r.wilson@boeing.com
diff --git a/Master/texmf-dist/doc/latex/combine/combine.pdf b/Master/texmf-dist/doc/latex/combine/combine.pdf
index 319dbfa473a..77ea2a01378 100644
--- a/Master/texmf-dist/doc/latex/combine/combine.pdf
+++ b/Master/texmf-dist/doc/latex/combine/combine.pdf
diff --git a/Master/texmf-dist/source/latex/combine/combine.dtx b/Master/texmf-dist/source/latex/combine/combine.dtx
index aa2cb2ecaf7..c6f7c2c870c 100644
--- a/Master/texmf-dist/source/latex/combine/combine.dtx
+++ b/Master/texmf-dist/source/latex/combine/combine.dtx
@@ -1,20 +1,17 @@
 % \iffalse meta-comment
 %
 % combine.dtx
-% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%                            (or at: pandgwilson at earthlink dot net) 
+% Author: Peter Wilson, Herries Press
+% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 % Copyright 2000, 2001, 2002, 2003, 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.
 %
@@ -99,6 +96,7 @@
 % \changes{v0.63}{2003/11/09}{Added the combcite package}
 % \changes{v0.64}{2004/03/06}{Minor change to combinet package}
 % \changes{v0.64a}{2004/05/07}{Minor change to the abstract}
+% \changes{v0.64b}{2009/09/02}{New maintainer (Will Robertson)}
 %
 % \def\dtxfilename{\texttt{combine.dtx}}
 % ^^A \def\fileversion{v0.3}
@@ -120,6 +118,7 @@
 % \def\fileversion{v0.63} \def\filedate{2003/11/09}
 % \def\fileversion{v0.64} \def\filedate{2004/03/06}
 % \def\fileversion{v0.64a} \def\filedate{2004/05/07}
+% \def\fileversion{v0.64b} \def\filedate{2009/09/02}
 % \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
@@ -132,12 +131,13 @@
 %       has version number \fileversion, last revised \filedate.}}
 %
 % \author{%
-% Peter Wilson\thanks{Dick Nickalls (\texttt{dicknickalls@compuserve.com})
+% Peter Wilson, Herries Press^^A
+%   \thanks{Dick Nickalls (\texttt{dicknickalls@compuserve.com})
 %   provided several requirements and suggestions.
 %   He also very helpfully tested earlier experimental versions.}\\
-% Catholic University of America \\
-% Now at \texttt{peter.r.wilson@boeing.com}\thanks{After May 2004 at
-%  \texttt{pandgwilson at earthlink dot net}}
+% \\~
+% Maintainer: Will Robertson\\
+% \texttt{will dot robertson at latex-project dot org}%
 % }
 % \date{\filedate}
 % \maketitle
diff --git a/Master/texmf-dist/source/latex/combine/combine.ins b/Master/texmf-dist/source/latex/combine/combine.ins
index 9808a4b38ba..7e0b2e3ac13 100644
--- a/Master/texmf-dist/source/latex/combine/combine.ins
+++ b/Master/texmf-dist/source/latex/combine/combine.ins
@@ -1,18 +1,15 @@
 %% combine.ins
-%% Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com until June 2004
-%%                            (or at: pandgwilson at earthlink dot net) 
+%% Author: Peter Wilson, Herries Press
+%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %% Copyright 2000, 2003, 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.
 %%
@@ -29,39 +26,37 @@
 \input docstrip.tex
 \preamble
 
-  Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com
-                             (or at: pandgwilson at earthlink dot net) 
+  Author: Peter Wilson, Herries Press
+  Maintainer: Will Robertson (will dot robertson at latex-project dot org)
   Copyright 2000, 2001, 2002, 2003 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{combine.drv}{t}{\from{combine.dtx}{driver}}
+%%% \generate{\file{combine.drv}{\from{combine.dtx}{driver}}}
 
 \Msg{*** Generating the LaTeX2e class file ***}
 
-\generateFile{combine.cls}{t}{\from{combine.dtx}{usc}}
+\generate{\file{combine.cls}{\from{combine.dtx}{usc}}}
 
 \Msg{*** Generating the LaTeX2e package files ***}
 
-\generateFile{combinet.sty}{t}{\from{combine.dtx}{pck}}
-\generateFile{combnat.sty}{t}{\from{combine.dtx}{natpack}}
-\generateFile{combcite.sty}{t}{\from{combine.dtx}{citepack}}
+\generate{\file{combinet.sty}{\from{combine.dtx}{pck}}}
+\generate{\file{combnat.sty}{\from{combine.dtx}{natpack}}}
+\generate{\file{combcite.sty}{\from{combine.dtx}{citepack}}}
 
 \Msg{***********************************************************}
 \Msg{*}
diff --git a/Master/texmf-dist/tex/latex/combine/combcite.sty b/Master/texmf-dist/tex/latex/combine/combcite.sty
index 12e4800d5c9..c5c3c7f0989 100644
--- a/Master/texmf-dist/tex/latex/combine/combcite.sty
+++ b/Master/texmf-dist/tex/latex/combine/combcite.sty
@@ -6,20 +6,17 @@
 %%
 %% combine.dtx  (with options: `citepack')
 %% 
-%%   Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com
-%%                              (or at: pandgwilson at earthlink dot net)
+%%   Author: Peter Wilson, Herries Press
+%%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/combine/combine.cls b/Master/texmf-dist/tex/latex/combine/combine.cls
index b8f2e8ae033..758f26f91a9 100644
--- a/Master/texmf-dist/tex/latex/combine/combine.cls
+++ b/Master/texmf-dist/tex/latex/combine/combine.cls
@@ -6,20 +6,17 @@
 %%
 %% combine.dtx  (with options: `usc')
 %% 
-%%   Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com
-%%                              (or at: pandgwilson at earthlink dot net)
+%%   Author: Peter Wilson, Herries Press
+%%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/combine/combinet.sty b/Master/texmf-dist/tex/latex/combine/combinet.sty
index 5b1858b9cb2..67d32974079 100644
--- a/Master/texmf-dist/tex/latex/combine/combinet.sty
+++ b/Master/texmf-dist/tex/latex/combine/combinet.sty
@@ -6,20 +6,17 @@
 %%
 %% combine.dtx  (with options: `pck')
 %% 
-%%   Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com
-%%                              (or at: pandgwilson at earthlink dot net)
+%%   Author: Peter Wilson, Herries Press
+%%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 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.
 %% 
diff --git a/Master/texmf-dist/tex/latex/combine/combnat.sty b/Master/texmf-dist/tex/latex/combine/combnat.sty
index 53ef889cdfa..6f36a14fe04 100644
--- a/Master/texmf-dist/tex/latex/combine/combnat.sty
+++ b/Master/texmf-dist/tex/latex/combine/combnat.sty
@@ -6,20 +6,17 @@
 %%
 %% combine.dtx  (with options: `natpack')
 %% 
-%%   Author: Peter Wilson (CUA) now at peter.r.wilson@boeing.com
-%%                              (or at: pandgwilson at earthlink dot net)
+%%   Author: Peter Wilson, Herries Press
+%%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 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.
 %%