summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/caption2.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption2.dtx')
-rw-r--r--Master/texmf-dist/source/latex/caption/caption2.dtx26
1 files changed, 12 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx
index 4df70ba1cf4..946a41e7969 100644
--- a/Master/texmf-dist/source/latex/caption/caption2.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption2.dtx
@@ -25,7 +25,7 @@
% caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{848}
+% \CheckSum{853}
%
% \iffalse
%<*driver>
@@ -96,7 +96,7 @@
% the regular \package{caption} package. It was made public as beta test version
% without documentation in 1995 because of the strong demand for new features and
% adaptations to other packages like the \package{longtable} and
-% \package{subfigure} package.
+% \package{subfigure} one.
%
% But within the next years I found no time to reintegrate some of the
% well-tried features into the regular \package{caption} package. So I
@@ -204,7 +204,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2008/07/01 v2.2c Customising captions (AS)]
+\ProvidesPackage{caption2}[2011/08/12 v2.2d Customising captions (AR)]
% \end{macrocode}
%
% \changes{v2.2b}{2007/06/15}{Made obsolete warning even more annoying}
@@ -337,7 +337,8 @@
% \begin{macrocode}
\newcommand*\defcaptionstyle[1]{%
\@namedef{caption@@#1}}
-%
+% \end{macrocode}
+% \begin{macrocode}
\newcommand*\newcaptionstyle[1]{%
\expandafter\ifx\csname caption@@#1\endcsname\relax
\expandafter\defcaptionstyle
@@ -346,7 +347,8 @@
\expandafter\@gobbletwo
\fi
{#1}}
-%
+% \end{macrocode}
+% \begin{macrocode}
\newcommand*\renewcaptionstyle[1]{%
\expandafter\ifx\csname caption@@#1\endcsname\relax
\PackageError{caption2}{Caption style `#1' undefined}{\caption@eh}%
@@ -433,16 +435,12 @@
% \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}%
@@ -739,9 +737,9 @@
% (like \textsf{ucthesis}), so we do it here if not already done.
% \changes{v2.1}{2002/02/19}{\cs{abovecaptionskip} and \cs{belowcaptionskip} will be defined if neccessary}
% \begin{macrocode}
-\@ifundefined{abovecaptionskip}{%
+\caption@ifundefined\abovecaptionskip{%
\newlength\abovecaptionskip\setlength\abovecaptionskip{10\p@}}{}
-\@ifundefined{belowcaptionskip}{%
+\caption@ifundefined\belowcaptionskip{%
\newlength\belowcaptionskip\setlength\belowcaptionskip{0\p@}}{}
% \end{macrocode}
% \end{macro}
@@ -817,7 +815,7 @@
% \changes{v2.2}{2007/04/06}{\cs{let}\cs{caption@make}\cs{caption@makecaption} added}
% \begin{macrocode}
\newcommand*\usecaptionstyle[1]{%
- \@ifundefined{captiontext}{%
+ \caption@ifundefined\captiontext{%
\PackageError{caption2}{You can't use \protect#1
in normal text}{The usage of \protect#1 is only
allowed inside code declared with\MessageBreak \protect\defcaptionstyle,
@@ -980,7 +978,7 @@
\renewcommand*\caption@of[2]{\def\@captype{#2}%
\@ifundefined{fst@#2}{}{%
\@nameuse{fst@#2}%
- \@ifundefined{@float@setevery}{}{\@float@setevery{#2}}%
+ \caption@ifundefined\@float@setevery{}{\@float@setevery{#2}}%
\let\caption@fs@capt\@fs@capt
\let\@fs@capt\caption@of@float}%
#1}
@@ -1068,7 +1066,7 @@
% into v2.1 of the \textsf{subfigure} package) we define it first.
% \begin{macrocode}
\newcommand*\setsubcapstyle{%
- \@ifundefined{subcapraggedrightfalse}{%
+ \caption@ifundefined\subcapraggedrightfalse{%
\newif\ifsubcapraggedright}{}%
\ifsubcaphang
\ifsubcapcenter