diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption3.dtx | 608 |
1 files changed, 48 insertions, 560 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index 84fe9ad6ca6..51699c2e1df 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -19,13 +19,13 @@ % This Current Maintainer of this work is Axel Sommerfeldt. % % This work consists of the files caption.ins, caption.dtx, caption2.dtx, -% caption3.dtx, bicaption.dtx, ltcaption.dtx, and subcaption.dtx, -% the derived files caption.sty, caption2.sty, caption3.sty, bicaption.sty, -% ltcaption.sty, and subcaption.sty, and the user manuals caption-deu.tex, -% caption-eng.tex, and caption-rus.tex. +% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, +% the derived files caption.sty, caption2.sty, caption3.sty, +% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, +% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{4248} +% \CheckSum{3390} % % \iffalse %<*driver> @@ -200,7 +200,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2011/10/09 v1.4 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2011/11/01 v1.4a caption3 kernel (AR)] % \end{macrocode} % % \subsection{Generic helpers} @@ -3146,27 +3146,31 @@ % \changes{v1.1c}{2007/10/06}{Definition of \cs{caption@l@stepcounter} added} % |\caption@prepareslc|\par % \changes{v1.3}{2011/07/07}{Bugfix 11-07-06: Redefinition of \cs{footnote} and \cs{footnotemark} added, redefinition of \cs{stepcounter} and \cs{refstepcounter} dropped} +% \changes{v1.4a}{2011/10/21}{Redefinition of \cs{pagenote} from \textsf{memoir} document class added} +% \changes{v1.4a}{2011/10/22}{Redefinition of \cs{footnote} revised} % Re-define anything which would disturb the single-line-check. % \begin{macrocode} \newcommand*\caption@prepareslc{% \let\label\caption@gobble % \end{macrocode} % \begin{macrocode} - \let\caption@footnote@ORI\footnote - \def\footnote{\caption@withoptargs\caption@footnote}% \let\caption@footnotemark@ORI\footnotemark + \def\footnote{\caption@withoptargs\caption@footnote}% \def\footnotemark{\caption@withoptargs\caption@footnotemark}% - \let\@footnotetext\@gobble + \let\@footnotetext\caption@gobble +% \end{macrocode} +% \begin{macrocode} + \let\@endnotetext\caption@gobble % \end{macrocode} % \begin{macrocode} - \let\@endnotetext\@gobble} + \let\pagenote\caption@gobble +% \end{macrocode} +% \begin{macrocode} +} % \end{macrocode} % \begin{macrocode} \newcommand\caption@footnote[2]{% - \begingroup - \let\stepcounter\caption@l@stepcounter - \caption@footnote@ORI#1{#2}% - \endgroup} + \caption@footnotemark{#1}} \newcommand\caption@footnotemark[1]{% \begingroup \let\stepcounter\caption@l@stepcounter @@ -3344,559 +3348,38 @@ % \changes{v1.2b}{2008/08/02}{Support of \cs{float@exts} and \cs{float@addtolists} added} % \changes{v1.2e}{2010/01/09}{Usage of \cs{caption@DeclareWithinOption} added} % \changes{v1.3}{2011/08/06}{Definition of \cs{listofXXXes} added} +% \changes{v1.4a}{2011/10/29}{Outsourced as \package{newfloat} package} % |\DeclareCaptionType|\oarg{options}\marg{environment}\oarg{name}\oarg{list name} % \begin{macrocode} \newcommand*\DeclareCaptionType{% - \@testopt\@DeclareCaptionType{}} + \RequirePackage{newfloat}% + \DeclareFloatingEnvironment} \@onlypreamble\DeclareCaptionType % \end{macrocode} -% \begin{macrocode} -\def\@DeclareCaptionType[#1]#2{% - \def\caption@type{#2}% - \caption@Debug{New type `#2'}% - \newcounter{#2}\@namedef{theH#2}{}% - \KV@caption@DCT@within\caption@within@default - \caption@DeclareWithinOption{#2}% - \KV@caption@DCT@placement{tbp}% - \caption@ifundefined\c@float@type - {\newcounter{float@type}% - \setcounter{float@type}{\caption@ifundefined\c@figure14}}% - {}% - \caption@Debug{float type `#2'=\the\value{float@type}}% - \expandafter\xdef\csname ftype@#2\endcsname{\the\value{float@type}}% - \addtocounter{float@type}{\value{float@type}}% - \KV@caption@DCT@fileext{lo#2}% - \@namedef{fnum@#2}{\@nameuse{#2name}\nobreakspace\@nameuse{the#2}}% - \newenvironment{#2}{\@float{#2}}{\end@float}% - \newenvironment{#2*}{\@dblfloat{#2}}{\end@dblfloat}% - \expandafter\newcommand\csname listof#2s\endcsname{\caption@listof{#2}}% - \expandafter\newcommand\csname listof#2es\endcsname{\caption@listof{#2}}% - \caption@ifundefined\l@figure - {\@namedef{l@#2}{\@dottedtocline{1}{1.5em}{2.3em}}}% - {\expandafter\let\csname l@#2\endcsname\l@figure}% -% \end{macrocode} -% \begin{macrocode} - \expandafter\newcommand\csname #2name\endcsname{}% - \edef\@tempa{\def\noexpand\@tempa{\@car#2\@nil}}% - \uppercase\expandafter{\@tempa}% - \edef\@tempb{\noexpand\g@addto@macro\noexpand\@tempa{\@cdr#2\@nil}}% - \@tempb - \expandafter\let\csname #2name\endcsname\@tempa - \expandafter\newcommand\csname list#2name\endcsname{}% - \expandafter\xdef\csname list#2name\endcsname{List of \@tempa s}% -% \end{macrocode} -% \begin{macrocode} - \@cons\caption@typelist{{#2}}% - \caption@setkeys[caption]{caption@DCT}{#1}% -% \end{macrocode} -% \begin{macrocode} - \expandafter\caption@DeclareTypeExt\expandafter{\@nameuse{ext@#2}}{#2}% -% \end{macrocode} -% \begin{macrocode} - \@ifnextchar[\@@DeclareCaptionType\relax} -\@onlypreamble\@DeclareCaptionType -% \end{macrocode} -% \begin{macrocode} -\def\@@DeclareCaptionType[#1]{% - \KV@caption@DCT@name{#1}% - \@ifnextchar[\@@@DeclareCaptionType\relax} -\@onlypreamble\@@DeclareCaptionType -% \end{macrocode} -% \begin{macrocode} -\def\@@@DeclareCaptionType[#1]{% - \KV@caption@DCT@listname{#1}} -\@onlypreamble\@@@DeclareCaptionType -% \end{macrocode} -% \begin{macrocode} -\let\DeclareFloatingEnvironment\DeclareCaptionType % alternative command name -\@onlypreamble\DeclareFloatingEnvironment -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@DeclareTypeExt} -% \changes{v1.4}{2011/10/02}{Support of the tocbasic package added} -% \changes{v1.4}{2011/10/02}{Support of the titletoc package added} -% \begin{macrocode} -\newcommand*\caption@DeclareTypeExt[2]{% - \caption@ifundefined\@chapter\relax\caption@PatchChapter - \let\caption@PatchChapter\relax -% \end{macrocode} -% \begin{macrocode} - \@ifundefined{caption@ext@#1}{% - \@namedef{caption@ext@#1}{#2}% -% \end{macrocode} -% Support of \package{float} package\par -% TODO: Needs revision -% \begin{macrocode} - \caption@ifundefined\float@exts{\newtoks\float@exts}{}% - \let\float@do=\relax - \edef\@tempa{\noexpand\float@exts{\the\float@exts\float@do{#1}}}% - \@tempa - \caption@ifundefined\caption@addtolists{% - \newcommand\caption@addtolists[1]{% - \def\float@do####1{\addtocontents{####1}{##1}}\the\float@exts}}{}% -% \end{macrocode} -% Support of \package{tocbasic} package -% \begin{macrocode} - \caption@ifundefined\addtotoclist{}{% - \addtotoclist[float]{#1}% - \setuptoc{#1}{chapteratlist}% - \@namedef{listof#1name}{\list#2name}}% -% \end{macrocode} -% \begin{macrocode} - }{}% -% \end{macrocode} -% Support of \package{titletoc} package -% \begin{macrocode} - \caption@ifundefined\contentsuse{}{% - \contentsuse{#2}{#1}}% -% \end{macrocode} -% \begin{macrocode} -} -\@onlypreamble\caption@DeclareTypeExt -% \end{macrocode} % \end{macro} % -% \begin{macro}{\caption@within@default} -% \changes{v1.2b}{2008/04/13}{This macro added} -% The default `within' value. +% \begin{macro}{\caption@ForEachType} +% \changes{v1.4a}{2011/10/29}{This macro added} +% |\caption@ForEachType|\marg{code} +% will execute the given code for all (known) floating environments. % \begin{macrocode} -\newcommand*\caption@within@default{% - \caption@ifundefined\c@chapter{none}{chapter}} -\@onlypreamble\caption@within@default +\newcommand\caption@ForEachType[1]{% + \caption@ifundefined\ForEachFloatingEnvironment + {\def\@elt##1{#1}% + \caption@ifundefined\c@figure\@gobble\@elt{figure}% + \caption@ifundefined\c@table\@gobble\@elt{table}% + \let\@elt\relax + \newfloat@addtohook{#1}}% + {\ForEachFloatingEnvironment{#1}}} % \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@listof} -% \changes{v1.2}{2007/12/21}{This macro added} -% \changes{v1.4}{2011/10/02}{Support of \cs{listoftoc} added} -% |\caption@listof|\marg{float type} % \begin{macrocode} -\caption@ifundefined\listoftoc{% - \newcommand*\caption@listof[1]{% - \begingroup - \expandafter\let\expandafter\listfigurename\csname list#1name\endcsname - \expandafter\let\expandafter\ext@figure\csname ext@#1\endcsname - \let\caption@ORI@starttoc\@starttoc - \renewcommand*\@starttoc[1]{% - \expandafter\caption@ORI@starttoc\expandafter{\ext@figure}}% - \listoffigures - \endgroup}% -}{% - \newcommand*\caption@listof[1]{% - \expandafter\listoftoc\expandafter{\@nameuse{ext@#1}}}% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@typelist} -% An \cs{@elt}-list containing the caption types defined -% with |\Declare|\x|Caption|\x|Type|. -% \begin{macrocode} -\newcommand*\caption@typelist{} -% \end{macrocode} -% \end{macro} -% -% The available \meta{options} are: -% |fileext=|\meta{file extension}, -% |listname=|\meta{list name}, -% |name=|\meta{prosa name}, -% |placement=|\meta{htbp}, -% |within=|\meta{none,chapter,section}, and -% |without|. -% \begin{macrocode} -\define@key{caption@DCT}{fileext}{\@namedef{ext@\caption@type}{#1}} -\@onlypreamble@key{caption@DCT}{fileext} -\define@key{caption@DCT}{listname}{\@namedef{list\caption@type name}{#1}} -\@onlypreamble@key{caption@DCT}{listname} -\define@key{caption@DCT}{name}{\@namedef{\caption@type name}{#1}} -\@onlypreamble@key{caption@DCT}{name} -\define@key{caption@DCT}{placement}{\@namedef{fps@\caption@type}{#1}} -\@onlypreamble@key{caption@DCT}{placement} -\define@key{caption@DCT}{within}{% - \caption@ifundefined\c@chapter{}{\@removefromreset\caption@type{chapter}}% - \@removefromreset\caption@type{section}% - \begingroup - \caption@setkeys[caption]{caption@within}{#1}% - \endgroup} -%\@onlypreamble@key{caption@DCT}{within} -\define@key{caption@DCT}{without}{\KV@caption@DCT@within{none}} -%\@onlypreamble@key{caption@DCT}{without} -% \end{macrocode} -% \changes{v1.2d}{2009/03/29}{Bugfix 08-09-25: \texttt{within=section} fixed} -% \begin{macrocode} -\define@key{caption@within}{none}[]{% - \caption@within{}{}} -%\@onlypreamble@key{caption@within}{none} -\define@key{caption@within}{section}[]{% - \@addtoreset\caption@type{section}% - \caption@within{\ifnum\c@section>\z@ \thesection.\fi}{\theHsection.}} -%\@onlypreamble@key{caption@within}{section} -\caption@ifundefined\c@chapter{}{% - \define@key{caption@within}{chapter}[]{% - \@addtoreset\caption@type{chapter}% - \caption@within{\ifnum\c@chapter>\z@ \thechapter.\fi}{\theHchapter.}} -}% \@onlypreamble@key{caption@within}{chapter}} -% \end{macrocode} -% \begin{macro}{\caption@within} -% \changes{v1.2}{2007/12/21}{This macro added} -% |\caption@within|\marg{thecode}\marg{theHcode} -% \begin{macrocode} -\newcommand*\caption@within{% - \expandafter\caption@within@\expandafter{\caption@type}} -%\@onlypreamble\caption@within -\newcommand*\caption@within@[3]{% - \global\@namedef{the#1}{#2\arabic{#1}}% - \@ifundefined{theH#1}\caption@AtBeginDocument\@firstofone - {\global\@namedef{theH#1}{#3\arabic{#1}}}} -%\@onlypreamble\caption@within@ -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@removefromreset} -% \changes{v1.2}{2007/12/21}{This macro added} -% This code was taken from the \package{remreset} package -% which is part of the `carlisle' package bundle. -% (Copyright 1997 David Carlisle) -% \begin{macrocode} -\providecommand*\@removefromreset[2]{{% - \expandafter\let\csname c@#1\endcsname\@removefromreset - \def\@elt##1{% - \expandafter\ifx\csname c@##1\endcsname\@removefromreset - \else - \noexpand\@elt{##1}% - \fi}% - \expandafter\xdef\csname cl@#2\endcsname{% - \csname cl@#2\endcsname}}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\caption@PatchChapter} -% \changes{v1.2b}{2008/08/02}{This macro added} -% We try to patch \cs{@chapter} so \cs{caption@addtolists} will be supported. -% \begin{macrocode} -\newcommand*\caption@PatchChapter{% - \providecommand*\@chapterlistsgap{10\p@}% -% \end{macrocode} -% \begin{macrocode} - % report.cls [2005/09/16 v1.4f Standard LaTeX document class] - \caption@patch@chapter{report}{% - \ifnum \c@secnumdepth >\m@ne - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}##1}% - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \chaptermark{##1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi - }{% - \ifnum \c@secnumdepth >\m@ne - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}##1}% - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \chaptermark{##1}% - \ifdim \@chapterlistsgap>\z@ - \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% - \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% - \caption@addtolists{\protect\addvspace{\@chapterlistsgap}}% - \fi - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi}% -% \end{macrocode} -% \begin{macrocode} - % book.cls [2005/09/16 v1.4f Standard LaTeX document class] - \caption@patch@chapter{book}{% - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}##1}% - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \chaptermark{##1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi - }{% - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}##1}% - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \chaptermark{##1}% - \ifdim \@chapterlistsgap>\z@ - \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% - \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% - \caption@addtolists{\protect\addvspace{\@chapterlistsgap}}% - \fi - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi}% -% \end{macrocode} -% \begin{macrocode} - % amsbook.cls [2004/08/06 v2.20] - % smfbook.cls [1999/11/15 v1.2f Classe LaTeX pour les monographies editees par la SMF] - \caption@patch@chapter{ams/smfbook}{% - \refstepcounter{chapter}% - \ifnum\c@secnumdepth<\z@ \let\@secnumber\@empty - \else \let\@secnumber\thechapter \fi - \typeout{\chaptername\space\@secnumber}% - \def\@toclevel{0}% - \ifx\chaptername\appendixname \@tocwriteb\tocappendix{chapter}{##2}% - \else \@tocwriteb\tocchapter{chapter}{##2}\fi - \chaptermark{##1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% - \@makechapterhead{##2}\@afterheading - }{% - \refstepcounter{chapter}% - \ifnum\c@secnumdepth<\z@ \let\@secnumber\@empty - \else \let\@secnumber\thechapter \fi - \typeout{\chaptername\space\@secnumber}% - \def\@toclevel{0}% - \ifx\chaptername\appendixname \@tocwriteb\tocappendix{chapter}{##2}% - \else \@tocwriteb\tocchapter{chapter}{##2}\fi - \chaptermark{##1}% - \ifdim \@chapterlistsgap>\z@ - \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% - \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% - \caption@addtolists{\protect\addvspace{\@chapterlistsgap}}% - \fi - \@makechapterhead{##2}\@afterheading}% -% \end{macrocode} -% \begin{macrocode} - % scrreprt/scrbook.cls - \caption@ifundefined\KOMAClassName{}{% - \caption@Debug{document class `\KOMAClassName' detected}% - \let\caption@patch@chapter\@gobblethree}% -% \end{macrocode} -% \begin{macrocode} - % rapport1/3.cls [2004/06/07 v2.1a NTG LaTeX document class] - \caption@patch@chapter{rapport}{% - \ifnum \c@secnumdepth >\m@ne - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}\toc@font0 ##1}% - \else - \addcontentsline{toc}{chapter}{\toc@font0 ##1}% - \fi - \chaptermark{##1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi - }{% - \ifnum \c@secnumdepth >\m@ne - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}\toc@font0 ##1}% - \else - \addcontentsline{toc}{chapter}{\toc@font0 ##1}% - \fi - \chaptermark{##1}% - \ifdim \@chapterlistsgap>\z@ - \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% - \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% - \caption@addtolists{\protect\addvspace{\@chapterlistsgap}}% - \fi - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi}% -% \end{macrocode} -% \begin{macrocode} - % boek(3).cls [2004/06/07 v2.1a NTG LaTeX document class] - \caption@patch@chapter{boek}{% - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}\toc@font0 ##1}% - \else - \addcontentsline{toc}{chapter}{\toc@font0 ##1}% - \fi - \else - \addcontentsline{toc}{chapter}{\toc@font0 ##1}% - \fi - \chaptermark{##1}% - \addtocontents{lof}{\protect\addvspace{10\p@}}% - \addtocontents{lot}{\protect\addvspace{10\p@}}% - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi - }{% - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}% - {\protect\numberline{\thechapter}\toc@font0 ##1}% - \else - \addcontentsline{toc}{chapter}{\toc@font0 ##1}% - \fi - \else - \addcontentsline{toc}{chapter}{\toc@font0 ##1}% - \fi - \chaptermark{##1}% - \ifdim \@chapterlistsgap>\z@ - \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% - \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% - \caption@addtolists{\protect\addvspace{\@chapterlistsgap}}% - \fi - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi}% -% \end{macrocode} -% \begin{macrocode} - % thesis.cls [1996/25/01 1.0g LaTeX document class (wm).] - \caption@patch@chapter{thesis}{% - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\chaptername\space\thechapter.} - \if@thema - \ifx\@shortauthor\@empty - \addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter.}##1}% - \else - \addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter.}% - \@shortauthor\hfill\mbox{}\vskip\normallineskip ##1}% - \fi - \else - \addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter.}##1}% - \fi - \else - \addcontentsline{toc}{chapter}{##1} - \fi - \else - \addcontentsline{toc}{chapter}{##1} - \fi - \chaptermark{##1} - \addtocontents{lof}{\protect\addvspace{10pt}} - \addtocontents{lot}{\protect\addvspace{10pt}} - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}] - \else - \@makechapterhead{##2} - \@afterheading - \fi - }{% - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \refstepcounter{chapter}% - \typeout{\chaptername\space\thechapter.}% - \if@thema - \ifx\@shortauthor\@empty - \addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter.}##1}% - \else - \addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter.}% - \@shortauthor\hfill\mbox{}\vskip\normallineskip ##1}% - \fi - \else - \addcontentsline{toc}{chapter}{% - \protect\numberline{\thechapter.}##1}% - \fi - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \else - \addcontentsline{toc}{chapter}{##1}% - \fi - \chaptermark{##1}% - \ifdim \@chapterlistsgap>\z@ - \addtocontents{lof}{\protect\addvspace{\@chapterlistsgap}}% - \addtocontents{lot}{\protect\addvspace{\@chapterlistsgap}}% - \caption@addtolists{\protect\addvspace{\@chapterlistsgap}}% - \fi - \if@twocolumn - \@topnewpage[\@makechapterhead{##2}]% - \else - \@makechapterhead{##2}% - \@afterheading - \fi}% -% \end{macrocode} -% \begin{macrocode} - \ifx\caption@patch@chapter\@gobblethree \else - \caption@Debug{% - Unsupported document class detected,\MessageBreak - or \noexpand\@chapter was redefined by another package}% - \fi - \let\caption@PatchChapter\@undefined} -%\@onlypreamble\caption@PatchChapter -% \end{macrocode} -% \begin{macrocode} -\newcommand\caption@patch@chapter[3]{% - \begingroup -% \let\if@twocolumn\iffalse - \let\if@mainmatter\iffalse - \let\if@thema\iffalse - \def\@tempa[##1]##2{#2}% - \ifx\@tempa\@chapter - \caption@Debug{document class `#1' detected}% - \gdef\@chapter[##1]##2{#3}% - \global\let\caption@patch@chapter\@gobblethree - \fi - \endgroup} -%\@onlypreamble\caption@patch@chapter +\providecommand\newfloat@addtohook[1]{% + \toks@=\expandafter{\newfloat@hook{##1}#1}% + \edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}% + \@tempa} % \end{macrocode} % \begin{macrocode} -\long\def \@gobblethree #1#2#3{} +\providecommand*\newfloat@hook[1]{} % \end{macrocode} % \end{macro} % @@ -3929,7 +3412,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\caption@addtoreset} +% \begin{macro}{\caption@removefromreset} % \changes{v1.2d}{2009/10/09}{This macro added} % Like \cs{@removefromreset} from |remreset.sty| % \begin{macrocode} @@ -4093,13 +3576,18 @@ % \changes{v1.2e}{2010/01/09}{Patch for better hyperref support added to \package{subfig} package adaptions} % \changes{v1.2f}{2010/01/14}{Latest patch didn't worked without hyperref; fixed} % \changes{v1.3}{2010/12/20}{subfig package bugfixes dropped} +% \changes{v1.4a}{2011/11/01}{Bugfix 11-11-01: Test for the subfig package revised} % -% We have to make several adaptions to \thispackage~\version{1.1} here. +% Since the \package{subfig} package is not maintained anymore, +% we have to make several adaptions to \thispackage~\version{1.1} here. +% Please note that we only support the version $1.3$ of the \package{subfig} package here. +% So older versions do not work with this version of \thispackage, and never +% versions are expected to be adapted. % \begin{macrocode} \caption@AtBeginDocument{% - \def\@tempa{\@ifstar\sf@@subref\sf@subref}% - \ifx\subref\@tempa - \caption@InfoNoLine{subfig package 1.2 or 1.3 is loaded}% + \def\@tempa{2005/06/28 ver: 1.3 subfig package}% + \expandafter\ifx\csname ver@subfig.sty\endcsname\@tempa + \caption@InfoNoLine{subfig package v1.3 is loaded}% % \end{macrocode} % \begin{macrocode} \let\caption@setfloattype\@gobble |