summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-11 01:03:12 +0000
committerKarl Berry <karl@freefriends.org>2010-07-11 01:03:12 +0000
commit4c99b6b0cfd6cb0435afa931ddc25dd788a4db5e (patch)
tree6dd88117b6ec690c8a512cc11679560d17916e08 /Master
parent0baee1132ce277d359c0b7466f457099243984e1 (diff)
combine update (10jul10)
git-svn-id: svn://tug.org/texlive/trunk@19361 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/combine/README3
-rw-r--r--Master/texmf-dist/doc/latex/combine/combine.pdfbin507541 -> 465111 bytes
-rw-r--r--Master/texmf-dist/source/latex/combine/combine.dtx16
-rw-r--r--Master/texmf-dist/tex/latex/combine/combcite.sty6
-rw-r--r--Master/texmf-dist/tex/latex/combine/combine.cls6
-rw-r--r--Master/texmf-dist/tex/latex/combine/combinet.sty6
-rw-r--r--Master/texmf-dist/tex/latex/combine/combnat.sty6
7 files changed, 24 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/combine/README b/Master/texmf-dist/doc/latex/combine/README
index f31a93f1e2c..96dda72d6a4 100644
--- a/Master/texmf-dist/doc/latex/combine/README
+++ b/Master/texmf-dist/doc/latex/combine/README
@@ -13,6 +13,9 @@ provides a version of the cite package for use with the combine class.
______________
Change History
+Version 0.7a (2010/07/10)
+- Previous version had a major typo, preventing the class from loading!
+
Version 0.7 (2010/03/22)
- Consolidate fileversion and filedate for all derived files
diff --git a/Master/texmf-dist/doc/latex/combine/combine.pdf b/Master/texmf-dist/doc/latex/combine/combine.pdf
index 21a871993dd..866140e6375 100644
--- a/Master/texmf-dist/doc/latex/combine/combine.pdf
+++ b/Master/texmf-dist/doc/latex/combine/combine.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/combine/combine.dtx b/Master/texmf-dist/source/latex/combine/combine.dtx
index 7eb87ea8600..0f637b59c55 100644
--- a/Master/texmf-dist/source/latex/combine/combine.dtx
+++ b/Master/texmf-dist/source/latex/combine/combine.dtx
@@ -8,7 +8,7 @@
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any
+% 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".
@@ -25,13 +25,15 @@
%<natpack>\ProvidesPackage{combnat}
%<citepack>\ProvidesPackage{combcite}
%<*usc|pck|natpack|citepack>
- [2010/03/22 v0.7
+ [2010/07/10 v0.7a
+%</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
+%<*usc|pck|natpack|citepack>
+ ]
%</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}
diff --git a/Master/texmf-dist/tex/latex/combine/combcite.sty b/Master/texmf-dist/tex/latex/combine/combcite.sty
index 4310a7945a3..bc97fa0b60e 100644
--- a/Master/texmf-dist/tex/latex/combine/combcite.sty
+++ b/Master/texmf-dist/tex/latex/combine/combcite.sty
@@ -22,9 +22,9 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesPackage{combcite}
- [2010/03/22 v0.7
- combine version of cite package]
- source file for the combine class]
+ [2010/07/10 v0.7a
+ combine version of cite package
+ ]
\@ifclassloaded{combine}{}{%
\PackageError{combcite}{The `combine' class is expected}{\@ehc}}
\newif\ifc@lbsuperopt
diff --git a/Master/texmf-dist/tex/latex/combine/combine.cls b/Master/texmf-dist/tex/latex/combine/combine.cls
index a9f4420a0c5..810fd1ada24 100644
--- a/Master/texmf-dist/tex/latex/combine/combine.cls
+++ b/Master/texmf-dist/tex/latex/combine/combine.cls
@@ -22,9 +22,9 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesClass{combine}
- [2010/03/22 v0.7
- collection of documents]
- source file for the combine class]
+ [2010/07/10 v0.7a
+ collection of documents
+ ]
\RequirePackage{keyval}
\newcommand{\c@lclass}{article}
\define@key{COLCLASS}{colclass}[article]%
diff --git a/Master/texmf-dist/tex/latex/combine/combinet.sty b/Master/texmf-dist/tex/latex/combine/combinet.sty
index 8c1d76755b1..9c7ed5c3d63 100644
--- a/Master/texmf-dist/tex/latex/combine/combinet.sty
+++ b/Master/texmf-dist/tex/latex/combine/combinet.sty
@@ -22,9 +22,9 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesPackage{combinet}
- [2010/03/22 v0.7
- document titles in ToC]
- source file for the combine class]
+ [2010/07/10 v0.7a
+ document titles in ToC
+ ]
\@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 6e43732da80..6ed5b47cabc 100644
--- a/Master/texmf-dist/tex/latex/combine/combnat.sty
+++ b/Master/texmf-dist/tex/latex/combine/combnat.sty
@@ -22,9 +22,9 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesPackage{combnat}
- [2010/03/22 v0.7
- combine version of natbib package]
- source file for the combine class]
+ [2010/07/10 v0.7a
+ combine version of natbib package
+ ]
\@ifclassloaded{combine}{}{%
\PackageError{combnat}{The `combine' class is expected}{\@ehc}}
\RequirePackageWithOptions{natbib}