summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
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/texmf-dist/tex
parent065472f29ef06185f389a5a2d0c68e4801d1cf2d (diff)
caption 3.1m (14jan10)
git-svn-id: svn://tug.org/texlive/trunk@16715 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty2
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty14
2 files changed, 9 insertions, 7 deletions
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}