summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-15 00:18:08 +0000
committerKarl Berry <karl@freefriends.org>2010-01-15 00:18:08 +0000
commitb8016f8b15fd4d572edf93863460b8584fdff367 (patch)
treef5ae8acab759b6c8187706769c3448aa9e503918 /Master
parent065472f29ef06185f389a5a2d0c68e4801d1cf2d (diff)
caption 3.1m (14jan10)
git-svn-id: svn://tug.org/texlive/trunk@16715 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/caption/caption.pdfbin385847 -> 385875 bytes
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.dtx21
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty2
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty14
4 files changed, 21 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf
index 6cedc09b47d..80bad0bedfc 100644
--- a/Master/texmf-dist/doc/latex/caption/caption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index f056043f19a..12d8e975342 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -24,12 +24,12 @@
% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{7234}
+% \CheckSum{7235}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption.drv}[2010/01/09 v3.1l Implementation of the caption package]
+\ProvidesFile{caption.drv}[2010/01/14 v3.1m Implementation of the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -233,7 +233,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2010/01/09 v3.1l caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2010/01/14 v3.1m caption3 kernel (AR)]
% \end{macrocode}
%
% \subsection{Generic helpers}
@@ -3690,6 +3690,7 @@
% \changes{v3.0l}{2007/01/31}{Bugfix of subfig package moved from package (kernel)}
% \changes{v3.1}{2007/07/07}{Several adaptions to the \package{subfig} package added}
% \changes{v3.1l}{2010/01/09}{Patch for better hyperref support added to \package{subfig} package adaptions}
+% \changes{v3.1m}{2010/01/14}{Last patch didn't worked without hyperref; fixed}
%
% We have to make several adaptions to \thispackage~\version{3.1} here.
% \begin{macrocode}
@@ -3711,11 +3712,13 @@
% \end{macrocode}
% This patch should provide better hyperref support:
% \begin{macrocode}
- \renewcommand*\sf@updatecaptionlist[4]{%
- \xdef\sf@captionlist{%
- \sf@captionlist,%
- {\protect\numberline{\@subcaplabel}\noexpand{\ignorespaces #2}}%
- {\@currentHref}}}%
+ \@ifpackageloaded{hyperref}{%
+ \renewcommand*\sf@updatecaptionlist[4]{%
+ \xdef\sf@captionlist{%
+ \sf@captionlist,%
+ {\protect\numberline{\@subcaplabel}\noexpand{\ignorespaces #2}}%
+ {\@currentHref}}}%
+ }{}%
% \end{macrocode}
% \begin{macrocode}
\fi
@@ -3774,7 +3777,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2010/01/09 v3.1l Customizing captions (AR)]
+\ProvidesPackage{caption}[2010/01/09 v3.1m Customizing captions (AR)]
%\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index e0ef8f114c3..cbbfd16cb9b 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -28,7 +28,7 @@
%% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2010/01/09 v3.1l Customizing captions (AR)]
+\ProvidesPackage{caption}[2010/01/09 v3.1m Customizing captions (AR)]
\newcommand*\caption@Info[1]{\PackageInfo{caption}{#1\@gobble}}
\@onlypreamble\caption@Info
\RequirePackage{caption3}[2008/08/24] % needs v3.1j or newer
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 37b6efe7044..226e7193509 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -28,7 +28,7 @@
%% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2010/01/09 v3.1l caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2010/01/14 v3.1m caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand\l@addto@macro[2]{%
@@ -1726,11 +1726,13 @@
\let\@dottedxxxline\sf@NEW@dottedxxxline
\let\sf@subfloat\sf@NEW@subfloat
\DeclareRobustCommand*\subref{\@ifstar\sf@@subref\sf@subref}%
- \renewcommand*\sf@updatecaptionlist[4]{%
- \xdef\sf@captionlist{%
- \sf@captionlist,%
- {\protect\numberline{\@subcaplabel}\noexpand{\ignorespaces #2}}%
- {\@currentHref}}}%
+ \@ifpackageloaded{hyperref}{%
+ \renewcommand*\sf@updatecaptionlist[4]{%
+ \xdef\sf@captionlist{%
+ \sf@captionlist,%
+ {\protect\numberline{\@subcaplabel}\noexpand{\ignorespaces #2}}%
+ {\@currentHref}}}%
+ }{}%
\fi
\let\sf@NEW@dottedxxxline\@undefined
\let\sf@NEW@subfloat\@undefined}