combine 0.7 (22mar10)

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

9 files changed, 65 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/latex/combine/README b/Master/texmf-dist/doc/latex/combine/README
index dc997717478..f31a93f1e2c 100644
--- a/Master/texmf-dist/doc/latex/combine/README
+++ b/Master/texmf-dist/doc/latex/combine/README
@@ -13,6 +13,14 @@ provides a version of the cite package for use with the combine class.
 ______________
 Change History
 
+Version 0.7 (2010/03/22)
+
+- Consolidate fileversion and filedate for all derived files
+  I.e., combine.cls, combinet.sty, combcite.sty, combnat.sty are all now v0.7
+  This is simply to make book-keeping easier
+  
+- Bug fix for combnat thanks to Nicola Talbot
+
 Changes in version 0.64b of combine.dtx (2009/09/02)
 - New maintainer (Will Robertson)
 
diff --git a/Master/texmf-dist/doc/latex/combine/combine.pdf b/Master/texmf-dist/doc/latex/combine/combine.pdf
index 77ea2a01378..21a871993dd 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 c6f7c2c870c..7eb87ea8600 100644
--- a/Master/texmf-dist/source/latex/combine/combine.dtx
+++ b/Master/texmf-dist/source/latex/combine/combine.dtx
@@ -4,6 +4,7 @@
 % 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
+% Copyright 2010 Will Robertson
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -15,7 +16,23 @@
 %
 % This work consists of the files listed in the README file.
 %
-% 
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{combine.dtx}
+%</driver>
+%<usc>\ProvidesClass{combine}
+%<pck>\ProvidesPackage{combinet}
+%<natpack>\ProvidesPackage{combnat}
+%<citepack>\ProvidesPackage{combcite}
+%<*usc|pck|natpack|citepack>
+  [2010/03/22 v0.7
+%</usc|pck|natpack|citepack>
+%<usc>              collection of documents]
+%<pck>              document titles in ToC]
+%<natpack>          combine version of natbib package]
+%<citepack>         combine version of cite package]
+  source file for the combine class]
+%
 %<*driver>
 \documentclass[twoside]{ltxdoc}
 \makeatletter \@mparswitchfalse \makeatother
@@ -32,7 +49,7 @@
 %
 % \fi
 %
-% \CheckSum{3866}
+% \CheckSum{3858}
 %
 % \DoNotIndex{\',\.,\@M,\@@input,\@addtoreset,\@arabic,\@badmath}
 % \DoNotIndex{\@centercr,\@cite}
@@ -97,28 +114,10 @@
 % \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)}
+% \changes{v0.7}{2010/03/22}{Bug fix and new (simpler) file versioning scheme}
+%
+% \GetFileInfo{combine.dtx}
 %
-% \def\dtxfilename{\texttt{combine.dtx}}
-% ^^A \def\fileversion{v0.3}
-% ^^A \def\filedate{2000/05/20}
-% ^^A \def\fileversion{v0.4}
-% ^^A \def\filedate{2000/05/27}
-% ^^A \def\fileversion{v0.41}
-% ^^A \def\filedate{2000/06/18}
-% ^^A \def\fileversion{v0.42}
-% ^^A \def\filedate{2001/04/04}
-% ^^A \def\fileversion{v0.51}
-% ^^A \def\filedate{2001/07/09}
-% ^^A \def\fileversion{v0.52}
-% ^^A \def\filedate{2001/08/25}
-% \def\fileversion{v0.53} \def\filedate{2001/09/05}
-% \def\fileversion{v0.6} \def\filedate{2002/08/24}
-% \def\fileversion{v0.61} \def\filedate{2003/05/22}
-% \def\fileversion{v0.62} \def\filedate{2003/07/19}
-% \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
@@ -126,8 +125,8 @@
 % \newcommand*{\pstyle}[1]{\textsl {#1}}          ^^A typeset a pagestyle
 % \newcommand*{\Lenv}[1]{\texttt {#1}}            ^^A typeset an environment
 %
-% \title{The \Lpack{combine} class and the \Lpack{combinet}, 
-%       \Lpack{combnat} and \Lpack{combcite} packages\thanks{This file (\dtxfilename)
+% \title{The \Lpack{combine} class and the packages\\ \Lpack{combinet}, 
+%       \Lpack{combnat} and \Lpack{combcite}\thanks{This file (\texttt{combine.dtx})
 %       has version number \fileversion, last revised \filedate.}}
 %
 % \author{%
@@ -969,15 +968,13 @@
 %
 %    Announce the name and version of the class, which requires
 % \LaTeXe{} and the \Lpack{keyval} package.
+% (This now happens at the top of DTX file so doesn't appear here.)
 % \changes{v0.53}{2001/09/05}{Class is now v0.45}
 % \changes{v0.6}{2002/08/24}{Class is now v0.5}
 % \changes{v0.63}{2003/11/09}{Class is now v0.52}
 %    \begin{macrocode}
 %<*usc>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{combine}[2003/11/09 v0.52 collection of documents]
 \RequirePackage{keyval}
-
 %    \end{macrocode}
 %
 % \begin{macro}{\c@lclass}
@@ -2794,8 +2791,6 @@
 % \changes{v0.53}{2001/09/05}{combinet package now version 0.2}
 % \changes{v0.64}{2004/03/06}{combinet package now version 0.2a}
 %    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{combinet}[2004/03/06 v0.2a document titles in ToC]
 \@ifclassloaded{combine}{}{%
   \PackageError{combinet}{The `combine' class is expected}{\@ehc}%
 }
@@ -3006,13 +3001,11 @@
 % \changes{v0.6}{2002/08/24}{combnat package is now version 0.2}
 % \changes{v0.61}{2003/05/22}{combnat package is now version 0.21}
 % \changes{v0.61}{2003/05/22}{Somehow removed extraneous space from combnat package}
+% \changes{v0.7}{2010/03/22}{combnat bug fix thanks to Nicola Talbot}
 %    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{combnat}[2003/05/22 v0.21 combined natbib package]
 \@ifclassloaded{combine}{}{%
   \PackageError{combnat}{The `combine' class is expected}{\@ehc}}
 \RequirePackageWithOptions{natbib}
-
 %    \end{macrocode}
 %
 % For multiple bibliographies (|\c@lonebibfalse|)
@@ -3436,7 +3429,7 @@
      \let\protect=\@unexpandable@protect\let~\relax
      \let\active@prefix=\@gobble
      \xdef\NAT@temp{\csname b@#1\@extra@b@citeb\endcsname}}%
-     \expandafter\NAT@split\NAT@temp
+     \expandafter\NAT@split\NAT@temp?????@@%
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 
@@ -3444,7 +3437,7 @@
      \let\protect=\@unexpandable@protect\let~\relax
      \let\active@prefix=\@gobble
      \xdef\NAT@temp{\csname B?\jobname?@#1\@extra@b@citeb\endcsname}}%
-     \expandafter\NAT@split\NAT@temp
+     \expandafter\NAT@split\NAT@temp?????@@%
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 
@@ -3706,11 +3699,8 @@
 % The usual preliminaries. The \Lpack{cite} package is required
 % and all options are passed to it to deal with.
 %    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{combcite}[2003/11/09 v1.0 combine version of cite package]
 \@ifclassloaded{combine}{}{%
   \PackageError{combcite}{The `combine' class is expected}{\@ehc}}
-
 %    \end{macrocode}
 % By definition, we need the \Lpack{cite} package, but first have
 % to set up some option handling.
diff --git a/Master/texmf-dist/source/latex/combine/combine.ins b/Master/texmf-dist/source/latex/combine/combine.ins
index 7e0b2e3ac13..d31479d5baa 100644
--- a/Master/texmf-dist/source/latex/combine/combine.ins
+++ b/Master/texmf-dist/source/latex/combine/combine.ins
@@ -2,6 +2,7 @@
 %% Author: Peter Wilson, Herries Press
 %% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %% Copyright 2000, 2003, 2004 Peter R. Wilson
+%% Copyright 2010 Will Robertson
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -29,6 +30,7 @@
   Author: Peter Wilson, Herries Press
   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
   Copyright 2000, 2001, 2002, 2003 Peter R. Wilson
+  Copyright 2010 Will Robertson
  
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/combine/combcite.sty b/Master/texmf-dist/tex/latex/combine/combcite.sty
index c5c3c7f0989..4310a7945a3 100644
--- a/Master/texmf-dist/tex/latex/combine/combcite.sty
+++ b/Master/texmf-dist/tex/latex/combine/combcite.sty
@@ -9,6 +9,7 @@
 %%   Author: Peter Wilson, Herries Press
 %%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 Peter R. Wilson
+%%   Copyright 2010 Will Robertson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -20,11 +21,12 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{combcite}[2003/11/09 v1.0 combine version of cite package]
+\ProvidesPackage{combcite}
+  [2010/03/22 v0.7
+         combine version of cite package]
+  source file for the combine class]
 \@ifclassloaded{combine}{}{%
   \PackageError{combcite}{The `combine' class is expected}{\@ehc}}
-
 \newif\ifc@lbsuperopt
   \c@lbsuperoptfalse
 \DeclareOption{super}{\ExecuteOptions{superscript}}
diff --git a/Master/texmf-dist/tex/latex/combine/combine.cls b/Master/texmf-dist/tex/latex/combine/combine.cls
index 758f26f91a9..a9f4420a0c5 100644
--- a/Master/texmf-dist/tex/latex/combine/combine.cls
+++ b/Master/texmf-dist/tex/latex/combine/combine.cls
@@ -9,6 +9,7 @@
 %%   Author: Peter Wilson, Herries Press
 %%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 Peter R. Wilson
+%%   Copyright 2010 Will Robertson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -20,10 +21,11 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{combine}[2003/11/09 v0.52 collection of documents]
+\ProvidesClass{combine}
+  [2010/03/22 v0.7
+              collection of documents]
+  source file for the combine class]
 \RequirePackage{keyval}
-
 \newcommand{\c@lclass}{article}
 \define@key{COLCLASS}{colclass}[article]%
            {\renewcommand{\c@lclass}{#1}
diff --git a/Master/texmf-dist/tex/latex/combine/combinet.sty b/Master/texmf-dist/tex/latex/combine/combinet.sty
index 67d32974079..8c1d76755b1 100644
--- a/Master/texmf-dist/tex/latex/combine/combinet.sty
+++ b/Master/texmf-dist/tex/latex/combine/combinet.sty
@@ -9,6 +9,7 @@
 %%   Author: Peter Wilson, Herries Press
 %%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 Peter R. Wilson
+%%   Copyright 2010 Will Robertson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -20,8 +21,10 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{combinet}[2004/03/06 v0.2a document titles in ToC]
+\ProvidesPackage{combinet}
+  [2010/03/22 v0.7
+              document titles in ToC]
+  source file for the combine class]
 \@ifclassloaded{combine}{}{%
   \PackageError{combinet}{The `combine' class is expected}{\@ehc}%
 }
diff --git a/Master/texmf-dist/tex/latex/combine/combnat.sty b/Master/texmf-dist/tex/latex/combine/combnat.sty
index 6f36a14fe04..6e43732da80 100644
--- a/Master/texmf-dist/tex/latex/combine/combnat.sty
+++ b/Master/texmf-dist/tex/latex/combine/combnat.sty
@@ -9,6 +9,7 @@
 %%   Author: Peter Wilson, Herries Press
 %%   Maintainer: Will Robertson (will dot robertson at latex-project dot org)
 %%   Copyright 2000, 2001, 2002, 2003 Peter R. Wilson
+%%   Copyright 2010 Will Robertson
 %% 
 %%   This work may be distributed and/or modified under the
 %%   conditions of the LaTeX Project Public License, either
@@ -20,12 +21,13 @@
 %% 
 %%   This work consists of the files listed in the README file.
 %% 
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{combnat}[2003/05/22 v0.21 combined natbib package]
+\ProvidesPackage{combnat}
+  [2010/03/22 v0.7
+          combine version of natbib package]
+  source file for the combine class]
 \@ifclassloaded{combine}{}{%
   \PackageError{combnat}{The `combine' class is expected}{\@ehc}}
 \RequirePackageWithOptions{natbib}
-
 \newcommand{\c@lNATwritemainbib}{%
   \if@filesw\immediate\write\@mainaux{\string\citation{\@citeb}}\fi
   \@ifundefined{b@\@citeb\@extra@b@citeb}{%
@@ -346,7 +348,7 @@
      \let\protect=\@unexpandable@protect\let~\relax
      \let\active@prefix=\@gobble
      \xdef\NAT@temp{\csname b@#1\@extra@b@citeb\endcsname}}%
-     \expandafter\NAT@split\NAT@temp
+     \expandafter\NAT@split\NAT@temp?????@@%
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 
@@ -354,7 +356,7 @@
      \let\protect=\@unexpandable@protect\let~\relax
      \let\active@prefix=\@gobble
      \xdef\NAT@temp{\csname B?\jobname?@#1\@extra@b@citeb\endcsname}}%
-     \expandafter\NAT@split\NAT@temp
+     \expandafter\NAT@split\NAT@temp?????@@%
      \expandafter\NAT@parse@date\NAT@date??????@@%
      \ifciteindex\NAT@index\fi}
 
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 65e0763438b..1d9c0712cf8 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -321,12 +321,17 @@ my @TLP_working = qw(
 my @TLP_no_check = (
   "afm2pl",		# not on CTAN
   "aleph",		# binary
+  "asymptote",		# binary
   "bibtex",		# binary
   "bibtex8",		# binary
   "fontname",		# tl-update-auto
   "gnu-freefont",	# only packed on CTAN
+  "kpathsea",		# binary
   "powerdot",		# stale generated files on CTAN
   "synctex",		# binary
+  "texinfo",		# tl-update-auto
+  "texlive.infra",	# binary
+  "xetex",		# binary
 );
 
 exit (&main ());