diff options
author | Karl Berry <karl@freefriends.org> | 2013-02-04 23:09:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-02-04 23:09:35 +0000 |
commit | ce680c5880f743ecea22f9ebfde192a05186c257 (patch) | |
tree | 3caa18bd81f78a46e883d56e9944946f5c861587 /Master/texmf-dist/source/latex/caption/caption.dtx | |
parent | aab61d64b6347dba9ee058d3997f3e2f4c28f041 (diff) |
caption (4feb13)
git-svn-id: svn://tug.org/texlive/trunk@29026 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption.dtx | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 84af747aa8d..1059245b1a2 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -2,6 +2,9 @@ % % This is file `caption.dtx'. % +% $Id: caption.dtx 65 2013-02-03 15:09:48Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption.dtx $ +% % Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- @@ -25,12 +28,12 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3475} +% \CheckSum{3459} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption.drv}[2012/12/26 v3.3 Implementation of the caption package] +\ProvidesFile{caption.drv}[2011/08/06 v3.3 Implementation of the caption package] \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. %\errorcontextlines=3 % @@ -96,7 +99,7 @@ % This package has version number \fileversion, last revised \filedate.}}%^^A % {the caption package}} % \author{Axel Sommerfeldt\\ -% \href{mailto:axel.sommerfeldt@f-m.fm}{\texttt{axel.sommerfeldt@f-m.fm}}} +% \url{http://sourceforge.net/projects/latex-caption/}} % \date{\docdate} % \maketitle % @@ -218,8 +221,10 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2013/01/06 v3.3 Customizing captions (AR)] -%\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}} +\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% + \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} +\caption@tempa $Id: caption.dtx 65 2013-02-03 15:09:48Z sommerfeldt $ +\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] % \end{macrocode} % % \subsection{Loading the kernel} @@ -1383,10 +1388,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}% }% % \end{macrocode} % @@ -1426,8 +1427,7 @@ % \end{macrocode} % \begin{macrocode} \caption@AtBeginDocument*{% - \let\caption@ORI@capstart\@undefined - \let\caption@ORI@float@makebox\@undefined}% + \let\caption@ORI@capstart\@undefined}% % \end{macrocode} % % \begin{macro}{\@xfloat} @@ -2816,6 +2816,27 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\float@makebox} +% \changes{v3.3}{2013/01/06}{Corrects wrong load order hyperref-float now} +% \changes{v3.3}{2013/02/03}{Correction of wrong load order hyperref-float revised} +% Redefine |\float@makebox| (only if we are not operating in compatibility mode). +% \begin{macrocode} + \caption@AtBeginDocument{\caption@ifcompatibility{}{% +% \end{macrocode} +% If it was redefined by the \package{hyperref} package, +% we need to build on the original definition (and not on the redefined one). +% \begin{macrocode} + \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}}% +% \end{macrocode} +% \begin{macrocode} + }}% +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\caption@typehook} % \changes{v3.1}{2007/07/08}{float package hook added} % \LaTeX\ and almost every other packages use @@ -3408,31 +3429,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\float@makebox} -% \changes{v3.3}{2013/01/06}{Corrects wrong load order hyperref-float now} -% Do our own redefinition of |\float@makebox|, if it was redefined by -% the \package{hyperref} package. -% (But first of all we correct a wrong load order \package{hyperref}-\package{float}, -% if possible.) -% \begin{macrocode} - \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}{}}% -% \end{macrocode} -% \begin{macrocode} - \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}}% - }% -% \end{macrocode} -% \end{macro} -% % \begin{macrocode} }}{} % \end{macrocode} |