summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/caption2.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption2.sty')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption2.sty14
1 files changed, 11 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index adf32f8db9b..88edf30d74f 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -28,7 +28,7 @@
%% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\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)]
\PackageWarning{caption2}{%
****************************************************\MessageBreak
THIS PACKAGE IS OBSOLETE:\MessageBreak
@@ -365,11 +365,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