diff options
author | Karl Berry <karl@freefriends.org> | 2007-04-11 23:10:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-04-11 23:10:18 +0000 |
commit | 26c7201725a630fb71ec1c952974cd207170d70f (patch) | |
tree | ed170f312b75edfdab76756c9c253424999ab62e /Master/texmf-dist/source/latex/caption/caption2.dtx | |
parent | 7518aae005c5ab74eae9c9902b7ffc82c7da1cd6 (diff) |
caption 3.0p (10apr07)
git-svn-id: svn://tug.org/texlive/trunk@4152 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption2.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption2.dtx | 253 |
1 files changed, 122 insertions, 131 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx index 12e7ed056a2..d2b92bce82f 100644 --- a/Master/texmf-dist/source/latex/caption/caption2.dtx +++ b/Master/texmf-dist/source/latex/caption/caption2.dtx @@ -23,7 +23,7 @@ % caption.sty, caption2.sty, caption3.sty, and manual.tex. % % \fi -% \CheckSum{843} +% \CheckSum{837} % % \iffalse %<*driver> @@ -39,7 +39,7 @@ \fi \fi % -\usepackage{caption2}[2004/04/16] +\usepackage{caption2}[2007/04/06] % %<+driver>\OnlyDescription % @@ -59,21 +59,22 @@ % \title{The \thispackage\ package\thanks{This package has version number % \fileversion, last revised \filedate.}} % \author{Axel Sommerfeldt\\\texttt{caption@sommerfee.de}} -% \date{2005/11/02} +% \date{2007/04/06} % \maketitle % -% \changes{v2.0}{ 9 Oct 95}{New experimental version: Many new commands and features} -% \changes{v2.0}{ 9 Oct 95}{Support of the longtable package added} -% \changes{v2.1}{20 Feb 02}{Revised: New commands and options} -% \changes{v2.1}{26 Feb 02}{Adapted to version 2.1 of the subfigure package} -% \changes{v2.1a}{12 Nov 03}{Some minor bug fixes and improved compatibility to v2.0} -% \changes{v2.1b}{16 Apr 04}{Some minor bug fixes and improved compatibility to v2.0} -% \changes{v2.1c}{10 May 04}{Some minor bug fixes and improved compatibility to v2.0} -% \changes{v2.1d}{ 3 Oct 05}{Some superfluous brackets removed; warning added} +% \changes{v2.0}{1995/10/09}{New experimental version: Many new commands and features} +% \changes{v2.0}{1995/10/09}{Support of the longtable package added} +% \changes{v2.1}{2002/02/20}{Revised: New commands and options} +% \changes{v2.1}{2002/02/26}{Adapted to version 2.1 of the subfigure package} +% \changes{v2.1a}{2003/11/12}{Some minor bug fixes and improved compatibility to v2.0} +% \changes{v2.1b}{2004/04/16}{Some minor bug fixes and improved compatibility to v2.0} +% \changes{v2.1c}{2004/05/10}{Some minor bug fixes and improved compatibility to v2.0} +% \changes{v2.1d}{2005/10/03}{Some superfluous brackets removed; warning added} +% \changes{v2.2}{2007/04/06}{Uses the caption3 kernel now} % % \providecommand\LaTeXcomp{The \LaTeX{} Companion} % -% \section*{This package is obsolete!} +% \section*{THIS PACKAGE IS OBSOLETE!} % % The \package{caption2} package used to be an experimental side-version of % the regular \package{caption} package. It was made public as beta test version @@ -111,7 +112,9 @@ % commands of the \package{caption2} package. % If you get some errors or wired results afterwards, please take a closer % look at the \package{caption} package documentation which will hopefully -% help you clearing these problems. +% help you clearing these problems. You will also find a section called +% `Compatibility to older versions' there which should help you with the +% migration process. % If all this should fail you can write me an e-mail asking for help. % % \section*{What will happen to this package?} @@ -123,7 +126,9 @@ % of foreign packages. % % This means migrating to the actual \package{caption} package should not be -% necessary for old documents. +% necessary for old documents -- they should still compile fine as they are. +% If they don't please don't hesitate to write me an e-mail asking for +% maintainance. % % \StopEventually{} % @@ -178,22 +183,29 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption2}[2005/10/03 v2.1d Customising captions (AS)] +\ProvidesPackage{caption2}[2007/04/06 v2.2 Customising captions (AS)] \PackageWarning{caption2}{% - THIS PACKAGE IS OBSOLETE, PLEASE USE caption INSTEAD} + *** THIS PACKAGE IS OBSOLETE, PLEASE USE caption ***} % \end{macrocode} % -% \subsection{Preliminary declarations} +% \subsection{Loading the caption3 kernel} % -% \begin{macro}{\captionfont} -% \begin{macro}{\captionlabelfont} -% \cs{captionfont} and \cs{captionlabelfont} will hold the font specifications for the caption. % \begin{macrocode} -\newcommand*\captionfont{} -\newcommand*\captionlabelfont{} +\RequirePackage{caption3}[2007/03/04] % needs v3.0m or newer +\def\caption@package{caption2} % \end{macrocode} -% \end{macro} -% \end{macro} +% +% \subsection{Check against the regular \package{caption} package} +% \changes{v2.2}{2007/04/06}{Check against regular \package{caption} package added} +% +% \begin{macrocode} +\@ifpackageloaded{caption}{% + \caption@error{You can't use both the caption *and* caption2 package}% + \endinput +}{} +% \end{macrocode} +% +% \subsection{Preliminary declarations} % % \begin{macro}{\captionlabeldelim} % \begin{macro}{\captionlabelsep} @@ -208,75 +220,62 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\captionsize} -% The macro \cs{captionsize} is obsolete since v1.4 of the \textsf{caption} package, -% but we still support it to provide backward compatibility. -% \begin{macrocode} -\newcommand*\captionsize{} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\captionmargin} -% \begin{macro}{\captionwidth} % \begin{macro}{\ifcaptionwidth} % Either \cs{captionmargin} (with specifies an extra margin) or \cs{captionwidth} % (with specifies an explicit width) can be set, therefore we need the flag \cs{ifcaptionwidth} % to determine with parameter we should pay attention to. % \begin{macrocode} -\newdimen\captionmargin -\newdimen\captionwidth -\newif\ifcaptionwidth +\newcommand*\ifcaptionwidth{\ifdim\captionwidth>\z@} % \end{macrocode} % \end{macro} -% \end{macro} -% \end{macro} % -% \begin{macro}{\captionindent} -% \cs{captionindent} will be used in caption style \texttt{indent} and specifies the indention -% after the first line. +% \changes{v2.1}{2002/02/20}{New ifs \cs{ifcaptionlabel} and \cs{ifignoreLTcapwidth}} % \begin{macrocode} -\newdimen\captionindent +\newif\ifcaption@temp % \end{macrocode} -% \end{macro} % % \begin{macro}{\ifcaptionlabel} -% \begin{macro}{\ifonelinecaptions} -% \begin{macro}{\ifignoreLTcapwidth} -% More flags. If \cs{ifcaptionlabel} is not set the caption label should be suppressed; +% If \cs{ifcaptionlabel} is not set the caption label should be suppressed; % we need this flag to support the \cs{caption*} command. +% \changes{v2.2}{2007/04/06}{New definition, based on \cs{ifcaption@star}} +% \begin{macrocode} +\def\ifcaptionlabel{% + \ifcaption@star + \caption@tempfalse + \else + \caption@temptrue + \fi + \ifcaption@temp} +\def\captionlabeltrue{\caption@starfalse} +\def\captionlabelfalse{\caption@startrue} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ifonelinecaptions} % If \cs{ifonelinecaptions} is set we support the \LaTeX\ base style 'one line captions', % that means the caption will be typeset centered if it fits to one line. -% If \cs{ifignoreLTcapwidth} is set we ignore the \cs{LTcapwidth} of \textsf{longtable}. -% \changes{v2.1}{20 Feb 02}{New ifs \cs{ifcaptionlabel} and \cs{ifignoreLTcapwidth}} +% \changes{v2.2}{2007/04/06}{New definition, based on \cs{caption@ifslc}} % \begin{macrocode} -\newif\ifcaptionlabel\captionlabeltrue -\newif\ifonelinecaptions -\newif\ifignoreLTcapwidth +\def\ifonelinecaptions{% + \caption@ifslc{\caption@temptrue}{\caption@tempfalse}% + \ifcaption@temp} +\def\onelinecaptionstrue{\caption@setbool{slc}{1}} +\def\onelinecaptionsfalse{\caption@setbool{slc}{0}} % \end{macrocode} % \end{macro} -% \end{macro} -% \end{macro} % -% \begin{macro}{\setcaptionmargin} -% \begin{macro}{\setcaptionwidth} -% User-friendly commands to set the caption margin resp.\ width. -% Note that they additionally set the \cs{ifcaptionwidth} flag. +% \begin{macro}{\ifignoreLTcapwidth} +% If \cs{ifignoreLTcapwidth} is set we ignore the \cs{LTcapwidth} of \textsf{longtable}. % \begin{macrocode} -\newcommand*\setcaptionmargin{% - \captionwidthfalse - \setlength\captionmargin} -\newcommand*\setcaptionwidth{% - \captionwidthtrue - \setlength\captionwidth} +\newif\ifignoreLTcapwidth % \end{macrocode} % \end{macro} -% \end{macro} % % \begin{macro}{\normalcaptionparams} % \cs{normalcaptionparams} resets all caption related parameters to it's normal default values. % \cs{captionfont} will be set to \cs{captionsize} so setting the obsolete \cs{captionsize} will still work. % Same story with \cs{captiondelim} and the obsolete \cs{captionlabeldelim}. -% \changes{v2.1}{29 Jan 02}{New command \cs{normalcaptionparams}} +% \changes{v2.1}{2002/01/29}{New command \cs{normalcaptionparams}} % \begin{macrocode} \newcommand*\normalcaptionparams{% \let\captionsize\@empty @@ -284,21 +283,12 @@ \let\captionlabelfont\@empty \renewcommand*\captionlabeldelim{:}% \renewcommand*\captionlabelsep{\space}% - \setcaptionmargin\z@\setlength\captionindent\z@ + \setcaptionmargin\z@ + \setlength\captionindent\z@ \onelinecaptionstrue} % \end{macrocode} % \end{macro} % -% \begin{macro}{\caption@eh} -% Some commands will produce an error message, use this as help text. -% \begin{macrocode} -\newcommand*\caption@eh{% - If you do not understand this error, please take a closer look\MessageBreak - at the documentation of the `caption2' package.\MessageBreak - \@ehc} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\defcaptionstyle} % \begin{macro}{\newcaptionstyle} % \begin{macro}{\renewcaptionstyle} @@ -397,30 +387,31 @@ % Our predefined caption styles. \cs{caption@makecaption} takes the style % name as parameter, it does the common stuff and calls a macro % (build out of the style name) to do the uncommon stuff if neccessary. -% \changes{v2.1}{26 Feb 02}{Renamed from \cs{caption@make} to \cs{caption@makecaption}} -% \changes{v2.1b}{16 Apr 04}{We offer and use \cs{caption@make}, again} -% \changes{v2.1c}{10 May 04}{Bugfix: Extra \cs{par} added} +% \changes{v2.1}{2002/02/26}{Renamed from \cs{caption@make} to \cs{caption@makecaption}} +% \changes{v2.1b}{2004/04/16}{We offer and use \cs{caption@make}, again} +% \changes{v2.1c}{2004/05/10}{Bugfix: Extra \cs{par} added} % \begin{macrocode} \newcommand*\caption@makecaption[1]{% \usecaptionmargin -% +% \end{macrocode} +% \begin{macrocode} \ifcaptionlabel \def\caption@label{% {\captionlabelfont\captionlabel\captionlabeldelim}\captionlabelsep}% \else \let\caption@label\@empty \fi -% +% \end{macrocode} +% \begin{macrocode} \captionfont \onelinecaption {\caption@label\captiontext}% {\parbox[b]\captionlinewidth{\strut\@nameuse{caption@@@#1}\par}\par}} -\newcommand*\caption@make{\caption@makecaption} % \end{macrocode} % \end{macro} % -% \changes{v2.1}{26 Feb 02}{Removed all extra parboxes from caption styles} -% \changes{v2.1a}{12 Nov 03}{\ldots and put the parbox into \cs{caption@makecaption} instead} +% \changes{v2.1}{2002/02/26}{Removed all extra parboxes from caption styles} +% \changes{v2.1a}{2003/11/12}{\ldots and put the parbox into \cs{caption@makecaption} instead} % % \begin{macro}{\caption@@@normal} % The `normal' caption style. Just typeset caption (label \& text) as paragraph. @@ -443,13 +434,10 @@ % The idea how to do this was taken from Br\"uggemann-Klein\cite{Anne}, % it is also mentioned in Kopka\cite[p227]{Kopka-E}. % \begin{macrocode} -\newcommand*\caption@centerlast{% - \advance\leftskip by 0pt plus 1fil% - \advance\rightskip by 0pt plus -1fil% - \parfillskip0pt plus 2fil\relax} -% +% \end{macrocode} +% \begin{macrocode} \newcommand*\caption@@@centerlast{% - \caption@centerlast\caption@label\captiontext} + \centerlast\caption@label\captiontext} % \end{macrocode} % \end{macro} % @@ -478,7 +466,8 @@ \sbox\@tempboxa{\caption@label}% \hangindent\wd\@tempboxa\noindent \usebox\@tempboxa\caption@hangplus\captiontext} -% +% \end{macrocode} +% \begin{macrocode} \newcommand*\caption@hangplus{} % \end{macrocode} % \end{macro} @@ -496,7 +485,7 @@ % The `hang+flushleft' caption style. % \begin{macrocode} \newcommand*\caption@@@hang@centerlast{% - \let\caption@hangplus\caption@centerlast\caption@@@hang} + \let\caption@hangplus\centerlast\caption@@@hang} % \end{macrocode} % \end{macro} % @@ -605,24 +594,24 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\caption@package} +% \begin{macro}{\caption@setpackage} % A helper macro, a value of 1 within parameter \#2 will activate the support % of the package given in parameter \#1, a value of 0 will deactivate it. % \begin{macrocode} -\newcommand*\caption@package[1]{\@namedef{caption@pkt@#1}} +\newcommand*\caption@setpackage[1]{\@namedef{caption@pkt@#1}} % \end{macrocode} % \end{macro} % % \begin{macro}{float} % \begin{macro}{longtable} % \begin{macro}{subfigure} -% \changes{v2.1}{19 Feb 02}{New options for interaction with other packages} +% \changes{v2.1}{2002/02/19}{New options for interaction with other packages} % These options will enable or suppress the support of the packages % \textsf{float}, \textsf{longtable}, and \textsf{subfigure}. % \begin{macrocode} -\DeclareOption{float}{\caption@twozerofalse\caption@package{float}{1}} -\DeclareOption{longtable}{\caption@twozerofalse\caption@package{longtable}{1}} -\DeclareOption{subfigure}{\caption@twozerofalse\caption@package{subfigure}{1}} +\DeclareOption{float}{\caption@twozerofalse\caption@setpackage{float}{1}} +\DeclareOption{longtable}{\caption@twozerofalse\caption@setpackage{longtable}{1}} +\DeclareOption{subfigure}{\caption@twozerofalse\caption@setpackage{subfigure}{1}} % \end{macrocode} % \end{macro} % \end{macro} @@ -633,8 +622,8 @@ % These options will enable or suppress the support of all the above packages. % \begin{macrocode} \DeclareOption{none}{\caption@twozerofalse - \caption@package{float}{0}\caption@package{longtable}{0}% - \caption@package{subfigure}{0}} + \caption@setpackage{float}{0}\caption@setpackage{longtable}{0}% + \caption@setpackage{subfigure}{0}} \DeclareOption{all}{\ExecuteOptions{float,longtable,subfigure}} % \end{macrocode} % \end{macro} @@ -664,7 +653,7 @@ % \begin{macro}{debug} % This option will put additional debug information in the log file. % \begin{macrocode} -\DeclareOption{debug}{\caption@debugtrue} +\DeclareOption{debug}{\captionsetup{debug}} % \end{macrocode} % \end{macro} % @@ -672,9 +661,8 @@ % (If \cs{caption@twozero} is set to true (default) we will emulate the package % load algorithm of \textsf{caption} v2.0: If the package is already loaded % patch it, otherwise do nothing.) -% \changes{v2.1}{19 Feb 02}{\cs{ProcessOptions} changed to \cs{ProcessOptions*}} +% \changes{v2.1}{2002/02/19}{\cs{ProcessOptions} changed to \cs{ProcessOptions*}} % \begin{macrocode} -\newif\ifcaption@debug \newif\ifcaption@twozero \normalcaptionparams \ExecuteOptions{none,normal} @@ -692,7 +680,7 @@ % \cs{captionof} resp.\ \cs{captionof*} will just set \cs{@captype} and do the normal % \cs{caption} resp.\ \cs{caption*}, so we can also typeset captions outside floating % environments. -% \changes{v2.1}{19 Feb 02}{New commands \cs{captionof} and \cs{captionof*}} +% \changes{v2.1}{2002/02/19}{New commands \cs{captionof} and \cs{captionof*}} % \begin{macrocode} \def\captionof{\@ifstar{\caption@of{\caption*}}{\caption@of\caption}} \newcommand*\caption@of[2]{\def\@captype{#2}#1} @@ -704,7 +692,7 @@ % \begin{macro}{\belowcaptionskip} % Not all document classes define \cs{abovecaptionskip} and \cs{belowcaptionskip} % (like \textsf{ucthesis}), so we do it here if not already done. -% \changes{v2.1}{19 Feb 02}{\cs{abovecaptionskip} and \cs{belowcaptionskip} will be defined if neccessary} +% \changes{v2.1}{2002/02/19}{\cs{abovecaptionskip} and \cs{belowcaptionskip} will be defined if neccessary} % \begin{macrocode} \@ifundefined{abovecaptionskip}{% \newlength\abovecaptionskip\setlength\abovecaptionskip{10\p@}}{} @@ -715,8 +703,8 @@ % \end{macro} % % \begin{macro}{\captionlinewidth} -% \changes{v2.1}{26 Feb 02}{Renamed from \cs{realcaptionwidth} to \cs{captionlinewidth}} -% \changes{v2.1a}{12 Nov 03}{We offer \cs{realcaptionwidth}, again} +% \changes{v2.1}{2002/02/26}{Renamed from \cs{realcaptionwidth} to \cs{captionlinewidth}} +% \changes{v2.1a}{2003/11/12}{We offer \cs{realcaptionwidth}, again} % \begin{macro}{\captionlabel} % \begin{macro}{\captiontext} % These values are only set and used within the caption code itself. @@ -780,7 +768,8 @@ % First we check if we are inside a caption -- if \cs{captiontext} is undefined we are not. % If we are we call the appropriate caption definition. % -% \changes{v2.1b}{16 Apr 04}{Missing percent added (and extra space removed)} +% \changes{v2.1b}{2004/04/16}{Missing percent added (and extra space removed)} +% \changes{v2.2}{2007/04/06}{\cs{let}\cs{caption@make}\cs{caption@makecaption} added} % \begin{macrocode} \newcommand*\usecaptionstyle[1]{% \@ifundefined{captiontext}{% @@ -792,7 +781,8 @@ }{% \@ifundefined{caption@@#1}% {\PackageError{caption2}{Caption style `#1' undefined}{\caption@eh}}% - {\@nameuse{caption@@#1}}% + {\let\caption@make\caption@makecaption + \@nameuse{caption@@#1}}% }} % \end{macrocode} % \end{macro} @@ -818,16 +808,16 @@ % % \subsection{Support of other packages} % -% \begin{macro}{\caption@package} +% \begin{macro}{\caption@ifpackage} % This macro will execute the code needed to support the package % named within argument \#1. The parameter \#2 is the command % which shows if the package is loaded -- it is defined, it is % already loaded, otherwise not. The parameter \#3 contains code % which will be executed if no support is required -- this is for % cleanup purposes. The final parameter \#4 contains the code itself. -% \changes{v2.1c}{9 May 04}{Compatibility warning removed} +% \changes{v2.1c}{2004/05/09}{Compatibility warning removed} % \begin{macrocode} -\renewcommand*\caption@package[3]{% +\newcommand*\caption@ifpackage[3]{% \if1\@nameuse{caption@pkt@#1}% \@ifundefined{#2}% {\let\next\AtBeginDocument}% @@ -840,12 +830,11 @@ #3\let\next\@gobble \fi\fi \expandafter\let\csname caption@pkt@#1\endcsname\undefined - \ifcaption@debug + \caption@ifdebug{% \ifx\next\@gobble\PackageInfo{caption2}{#1 => gobble}% \else\ifx\next\@firstofone\PackageInfo{caption2}{#1 => firstofone}% \else\ifx\next\AtBeginDocument\PackageInfo{caption2}{#1 => AtBeginDocument}% - \fi\fi\fi - \fi + \fi\fi\fi}{}% \next} % \end{macrocode} % \end{macro} @@ -853,7 +842,7 @@ % \subsubsection{Support of the \puresf{float} package} % % \begin{macrocode} -\caption@package{float}{floatc@plain}{}{% +\caption@ifpackage{float}{floatc@plain}{}{% \ifx\floatc@plain\relax \PackageWarning{caption2}{% Option `float' was set but there is no float package loaded} @@ -872,7 +861,7 @@ % So we test if a \cs{captionlabelfont} has been set by the user -- if not % \cs{@fs@cfont} will be used, otherwise \cs{captionlabelfont}. % -% \changes{v2.1b}{19 Mar 04}{\cs{realcaptionwidth}$=$\cs{hsize} was missing here} +% \changes{v2.1b}{2004/03/19}{\cs{realcaptionwidth}$=$\cs{hsize} was missing here} % \begin{macrocode} \newcommand\caption@floatc[3]{% \ifx\captionlabelfont\@empty @@ -914,7 +903,8 @@ {\@fs@cfont\captionlabel}\space% \fi\captiontext\par}% \fi -% +% \end{macrocode} +% \begin{macrocode} \renewcommand*\floatc@ruled{\caption@floatc{ruled}} % \end{macrocode} % \end{macro} @@ -967,7 +957,7 @@ % \subsubsection{Support of the \puresf{longtable} package} % % \begin{macrocode} -\caption@package{longtable}{LT@makecaption}{}{% +\caption@ifpackage{longtable}{LT@makecaption}{}{% \ifx\LT@makecaption\relax \PackageWarning{caption2}{% Option `longtable' was set but there is no longtable package loaded} @@ -996,7 +986,8 @@ % and |\@firstofone| otherwise.) % \begin{macrocode} \dummycaptionstyle{longtable}{} -% +% \end{macrocode} +% \begin{macrocode} \renewcommand\LT@makecaption[3]{% \LT@mcol\LT@cols c{\hbox to\z@{\hss\parbox[t]\hsize{% \ifignoreLTcapwidth @@ -1115,7 +1106,7 @@ % the helper macros in the garbage can. % % \begin{macrocode} -\caption@package{subfigure}{@makesubfigurecaption}{% +\caption@ifpackage{subfigure}{@makesubfigurecaption}{% \let\setsubcapstyle\undefined \let\caption@makesubcaption\undefined}{% \ifx\@makesubfigurecaption\relax @@ -1154,11 +1145,11 @@ % Note: \cs{subfigcapmargin} is a command in v2.0 of \textsf{subfigure}. % So we make \cs{subfigcapwidth} a command, too. % \begin{macrocode} - \newcommand*\subfigcapwidth{\z@} - \newcommand*\setsubcapmargin{% + \newcommand\subfigcapwidth{\z@} + \newcommand\setsubcapmargin{% \subfigcapwidthfalse \renewcommand*\subfigcapmargin} - \newcommand*\setsubcapwidth{% + \newcommand\setsubcapwidth{% \subfigcapwidthtrue \renewcommand*\subfigcapwidth} % \end{macrocode} @@ -1169,7 +1160,7 @@ % \begin{macro}{\subcaplabelsep} % Analogous to \cs{captionlabelsep} we define \cs{subcaplabelsep}. % \begin{macrocode} - \newcommand*\subcaplabelsep{\space} + \newcommand\subcaplabelsep{\space} % \end{macrocode} % \end{macro} % @@ -1196,10 +1187,10 @@ % So we make \cs{subfigcapwidth} a length, too. % \begin{macrocode} \newdimen\subfigcapwidth - \newcommand*\setsubcapmargin{% + \newcommand\setsubcapmargin{% \subfigcapwidthfalse \setlength\subfigcapmargin} - \newcommand*\setsubcapwidth{% + \newcommand\setsubcapwidth{% \subfigcapwidthtrue \setlength\subfigcapwidth} % \end{macrocode} @@ -1210,7 +1201,7 @@ % \begin{macro}{\subcaplabelsep} % Analogous to \cs{captionlabelsep} we define \cs{subcaplabelsep}. % \begin{macrocode} - \newcommand*\subcaplabelsep{\hskip\subfiglabelskip} + \newcommand\subcaplabelsep{\hskip\subfiglabelskip} % \end{macrocode} % \end{macro} % @@ -1235,7 +1226,7 @@ % \begin{macrocode} \newif\ifsubfigcapwidth \newdimen\subcapindent - \newcommand*\subcaplabeldelim{} + \newcommand\subcaplabeldelim{} % \end{macrocode} % \end{macro} % \end{macro} @@ -1287,7 +1278,7 @@ % That's all folks! % % \begin{macrocode} -\let\caption@package\undefined +\let\caption@ifpackage\undefined % \end{macrocode} % % \iffalse |