diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption3.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index fe0a5625e34..5a07a5c487c 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -25,19 +25,16 @@ %% This Current Maintainer of this work is Axel Sommerfeldt. %% %% This work consists of the files -%% CHANGELOG, README, SUMMARY, caption.ins, -%% caption.dtx, caption2.dtx, caption3.dtx, -%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, -%% newfloat.dtx, and totalcount.dtx +%% caption.ins, caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx, %% the derived files %% caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, -%% newfloat.sty, and totalcount.sty +%% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty, %% and the user manuals -%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% caption-deu.tex, caption-eng.tex, caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2019/09/09 v1.8e caption3 kernel (AR)] +\ProvidesPackage{caption3}[2019/12/31 v1.8f caption3 kernel (AR)] \providecommand\caption@FixArabTeX{% \def\caption@tempa##1{}% \ifx\caption@tempa\@gobble @@ -568,7 +565,8 @@ \DeclareCaptionBox{colorbox}{\colorbox{\caption@boxcolor}{% \setlength\caption@tempdima{#1}% \addtolength\caption@tempdima{-2\fboxsep}% - \linewidth=\caption@tempdima\hsize=\caption@tempdima + \linewidth\caption@tempdima + \hsize\caption@tempdima #2}} \DeclareCaptionOption{boxcolor}{\def\caption@boxcolor{#1}} \DeclareCaptionOption{boxsep}{\setlength\fboxsep{#1}} @@ -1290,7 +1288,7 @@ \newcommand\caption@@make@[2]{% \caption@stepthecounter \caption@beginhook - \caption@box\linewidth{% + \caption@box\hsize{% \caption@ifslc{\caption@slc{#1}{#2}\caption@singleline\relax}{}% \caption@calcmargin \caption@tempdima\captionmargin @@ -1331,23 +1329,20 @@ \fi \fi \ifdim\captionwidth=\z@ - \captionwidth\linewidth + \captionwidth\hsize \advance\captionwidth by -2\captionmargin \advance\captionwidth by -\captionmargin@ \else - \captionmargin\linewidth + \captionmargin\hsize \advance\captionmargin by -\captionwidth \divide\captionmargin by 2 \captionmargin@\z@ \fi \caption@Debug{% \string\hsize=\the\hsize, - \string\linewidth=\the\linewidth,\MessageBreak - \string\leftmargin=\the\leftmargin, - \string\rightmargin=\the\rightmargin,\MessageBreak - \string\margin=\the\captionmargin, - \string\margin@=\the\captionmargin@, - \string\width=\the\captionwidth}% + \string\captionwidth=\the\captionwidth,\MessageBreak + \string\captionmargin=\the\captionmargin, + \string\captionmargin@=\the\captionmargin@}% } \newcommand\caption@slc[4]{% \caption@Debug{Begin SLC}% |