combine 0.7 (22mar10)

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

4 files changed, 22 insertions, 13 deletions

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}