summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/caption2.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-09-07 22:57:55 +0000
committerKarl Berry <karl@freefriends.org>2008-09-07 22:57:55 +0000
commit659b2fc8ec74e13edb9d2147c3bb1a20e7534a5c (patch)
treec9ac6685cac65cd0024373d02d752be599bfd295 /Master/texmf-dist/source/latex/caption/caption2.dtx
parent108b7f7f5503540c8843a3cb9d4dced1d9732d9d (diff)
caption 3.1j (24aug08)
git-svn-id: svn://tug.org/texlive/trunk@10446 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.dtx21
1 files changed, 15 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx
index 0d18ff7868e..0172521d3aa 100644
--- a/Master/texmf-dist/source/latex/caption/caption2.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption2.dtx
@@ -2,7 +2,7 @@
%
% This is file `caption2.dtx'.
%
-% Copyright (C) 1994-2007 Axel Sommerfeldt (caption@sommerfee.de)
+% Copyright (C) 1994-2008 Axel Sommerfeldt (caption@sommerfee.de)
%
% --------------------------------------------------------------------------
%
@@ -24,7 +24,7 @@
% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{846}
+% \CheckSum{848}
%
% \iffalse
%<*driver>
@@ -49,7 +49,7 @@
\ifpdf\usepackage{hypdestopt}\fi
\hypersetup{pdfkeywords={LaTeX, package, caption2},pdfstartpage={},pdfstartview={}}
%
-\usepackage{caption2}[2007/08/12]
+\usepackage{caption2}[2008/07/01]
%
%<+driver>\OnlyDescription
%
@@ -203,7 +203,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2007/08/12 v2.2b Customising captions (AS)]
+\ProvidesPackage{caption2}[2008/07/01 v2.2c Customising captions (AS)]
% \end{macrocode}
%
% \changes{v2.2b}{2007/06/15}{Made obsolete warning even more annoying}
@@ -1092,6 +1092,7 @@
% \end{macro}
%
% \begin{macro}{\caption@makesubcaption}
+% \changes{v2.2c}{2008/07/01}{Bugfix: Usage of \cs{ifcaptionwidth} removed}
% This will typeset the subcaption.
% We just set all our \cs{caption}\textit{xxx} values to
% the values of \cs{subcap}\textit{xxx} and typeset the
@@ -1129,11 +1130,19 @@
\renewcommand*\captionlabelfont{\normalfont\subcapsize\subcaplabelfont}%
\let\captionlabeldelim\subcaplabeldelim
\let\captionlabelsep\subcaplabelsep
- \ifsubfigcapwidth\captionwidthtrue\else\captionwidthfalse\fi
+ \ifsubfigcapwidth
+ \setcaptionwidth\subfigcapwidth
+ \else
+ \setcaptionmargin\subfigcapmargin
+ \fi
\setlength\captionmargin\subfigcapmargin
\setlength\captionwidth\subfigcapwidth
\captionindent\subcapindent
- \ifsubcapnooneline\onelinecaptionsfalse\else\onelinecaptionstrue\fi
+ \ifsubcapnooneline
+ \onelinecaptionsfalse
+ \else
+ \onelinecaptionstrue
+ \fi
\hbox to\@tempdima{%
\caption@subfig@hss\parbox[t]\@tempdima{%
\captionlinewidth\@tempdima