From ce680c5880f743ecea22f9ebfde192a05186c257 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Feb 2013 23:09:35 +0000 Subject: caption (4feb13) git-svn-id: svn://tug.org/texlive/trunk@29026 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/caption/caption.sty | 36 +++++++++++-------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/tex/latex/caption/caption.sty') diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index bf396d89096..8e6755e630d 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -6,7 +6,9 @@ %% %% caption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% +%% http://sourceforge.net/projects/latex-caption/ %% %% -------------------------------------------------------------------------- %% @@ -30,7 +32,10 @@ %% % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2013/01/06 v3.3 Customizing captions (AR)] +\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% + \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} +\caption@tempa $Id: caption.sty 65 2013-02-03 15:09:48Z sommerfeldt $ +\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] \RequirePackage{caption3}[2012/12/26] % needs v1.5 or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% @@ -654,10 +659,6 @@ \caption@Debug{% Restore hypcap definition of \string\capstart\@gobble}% \let\capstart\caption@ORI@capstart}% - \caption@ifundefined\caption@ORI@float@makebox{}{% - \caption@Debug{% - Restore hyperref redefinition of \string\float@makebox\@gobble}% - \let\float@makebox\caption@ORI@float@makebox}% }% \renewcommand*\caption@star[2]{#1#2}% }{% @@ -673,8 +674,7 @@ \caption@redefine }% \caption@AtBeginDocument*{% - \let\caption@ORI@capstart\@undefined - \let\caption@ORI@float@makebox\@undefined}% + \let\caption@ORI@capstart\@undefined}% \let\caption@ORI@xfloat\@xfloat \def\@xfloat#1[#2]{% \caption@ORI@xfloat{#1}[#2]% @@ -1208,6 +1208,13 @@ }{}% \caption@freezeHref % will be defrosted in \float@makebox \caption@ORI@float@setevery{#1}}% + \caption@AtBeginDocument{\caption@ifcompatibility{}{% + \caption@ifundefined\HyOrg@float@makebox + {\let\caption@ORI@float@makebox\float@makebox}% + {\let\caption@ORI@float@makebox\HyOrg@float@makebox}% + \renewcommand\float@makebox[1]{% + \caption@ORI@float@makebox{#1\relax \caption@defrostHref}}% + }}% \g@addto@macro\caption@typehook{% \expandafter\ifx\csname #1name\endcsname\relax \expandafter\let\csname #1name\expandafter\endcsname @@ -1398,19 +1405,6 @@ \caption@startanchor\caption@currentHref \global\let\caption@currentHref\@undefined \fi}% - \caption@ifundefined\HyNew@float@makebox{}{% - \caption@ifundefined\HyOrg@float@makebox{% - \caption@Debug{% - Correcting wrong load order hyperref-float\@gobble}% - \let\HyOrg@float@makebox\float@makebox - \let\float@makebox\HyNew@float@makebox}{}}% - \caption@ifundefined\HyOrg@float@makebox{}{% - \caption@Debug{% - Redefining \noexpand\float@makebox (again)\@gobble}% - \let\caption@ORI@float@makebox\float@makebox % save for compatibility mode - \renewcommand\float@makebox[1]{% - \HyOrg@float@makebox{#1\relax \caption@defrostHref}}% - }% }}{} \caption@IfPackageLoaded{hypcap}{% v1.0 \ifx\caption@start\relax \else % hyperref hasn't stopped early -- cgit v1.2.3