diff options
author | Karl Berry <karl@freefriends.org> | 2020-06-10 20:47:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-06-10 20:47:27 +0000 |
commit | ab2350d84cd86ce4be11206a765c6625e5cc2e5f (patch) | |
tree | e41cf5c553a7741b31843ff26ebcc00bcd2d52ff /Master/texmf-dist/tex/latex/caption | |
parent | 099bed71ffa7fb4e19f4e614c077a149aae72930 (diff) |
caption (10jun20)
git-svn-id: svn://tug.org/texlive/trunk@55507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption.sty | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/ltcaption.sty | 3 |
3 files changed, 28 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 71899f9dcc6..001e324884f 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -34,7 +34,7 @@ %% caption-deu.tex, caption-eng.tex, caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2020/05/10 v3.4j Customizing captions (AR)] +\ProvidesPackage{caption}[2020/05/30 v3.4k Customizing captions (AR)] \RequirePackage{caption3}[2020/05/10] % needs v1.10 or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% @@ -910,6 +910,28 @@ }{}% \caption@undefbool{needfreeze}} \let\caption@warmup\relax +\caption@IfPackageLoaded{changepage}[2008/07/23 memoir-v3.7k]{% + \newdimen\caption@adjustwidth@hsize + \newdimen\caption@adjustwidth@linewidth + \providecommand*\caption@set@adjustwidth{% + \caption@adjustwidth@hsize\hsize + \caption@adjustwidth@linewidth\linewidth}% + \providecommand*\caption@patch@changepage[1]{% + \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname + \expandafter\renewcommand\csname #1\endcsname[2]{% + \@nameuse{caption@#1}{##1}{##2}% + \caption@set@adjustwidth}}% + \caption@patch@changepage{adjustwidth}% + \caption@patch@changepage{adjustwidth*}% + \let\caption@patch@changepage\relax + \providecommand\caption@test@adjustwidth{% + \ifdim\hsize=\caption@adjustwidth@hsize + \ifdim\linewidth=\caption@adjustwidth@linewidth + \hsize=\linewidth + \fi + \fi}% +\AtBeginCaption{\caption@test@adjustwidth} + }{}% \caption@IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{% \caption@ifdefined\chkfloat@addcontentsline{% \renewcommand\caption@chkfloat{\chkfloat@addcontentsline}% diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 4bbf4307d66..205603c1dc1 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -34,7 +34,7 @@ %% caption-deu.tex, caption-eng.tex, caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2020/05/10 v1.11 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2020/05/30 v1.12 caption3 kernel (AR)] \providecommand\caption@FixArabTeX{% \def\caption@tempa##1{}% \ifx\caption@tempa\@gobble @@ -659,8 +659,9 @@ \DeclareCaptionLabelSeparator{period}{. } \DeclareCaptionLabelSeparator{space}{ } \DeclareCaptionLabelSeparator*{quad}{\quad} -\DeclareCaptionLabelSeparator*{newline}{\\} +\DeclareCaptionLabelSeparator*{newline}{\captionnewline} \DeclareCaptionLabelSeparator*{endash}{\space\textendash\space} +\newcommand*\captionnewline{\\} \newcommand*\caption@setdefaultlabelsep[1]{% \ifx\caption@lsep\caption@lsep@default \caption@set@default@labelsep{#1}% diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty index f76bfec9b11..2f0130a7f74 100644 --- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty @@ -34,7 +34,7 @@ %% caption-deu.tex, caption-eng.tex, caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{ltcaption}[2018/08/26 v1.4a longtable captions (AR)] +\ProvidesPackage{ltcaption}[2020/05/30 v1.4b longtable captions (AR)] \@ifpackageloaded{longtable}{}{% \PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}} \providecommand*\LTcaptype{table} @@ -64,6 +64,7 @@ \def\hyper@makecurrent{% \caption@LTtype\caption@LT@makecurrent}% \def\lst@@caption{\relax}% + \def\captionnewline{\par}% \ltcaption@ORI@LT@array}} \newcommand*\caption@LTtype[2]{% \edef\caption@LT@tempa{#2}% |