From bd3377f8c4354d513bb3f8b7b06708718f6ccb06 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Jul 2020 21:25:57 +0000 Subject: caption (19jul20) git-svn-id: svn://tug.org/texlive/trunk@55878 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/caption/caption3.sty | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 205603c1dc1..f9c5cd404da 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/30 v1.12 caption3 kernel (AR)] +\ProvidesPackage{caption3}[2020/07/19 v1.12a caption3 kernel (AR)] \providecommand\caption@FixArabTeX{% \def\caption@tempa##1{}% \ifx\caption@tempa\@gobble @@ -1474,13 +1474,10 @@ \newcommand*\caption@singleline{% \caption@xsetup\caption@opt@singleline \let\caption@fmt\caption@slfmt} -\@ifundefined{caption@prepareslc}\def\g@addto@macro\caption@prepareslc{% +\providecommand*\caption@prepareslc{} +\g@addto@macro\caption@prepareslc{% \let\label\caption@gobble \let\hypertarget\@gobbletwo - \let\caption@footnotemark@ORI\footnotemark - \def\footnote{\caption@withoptargs\caption@footnote}% - \def\footnotemark{\caption@withoptargs\caption@footnotemark}% - \let\@footnotetext\caption@gobble \let\caption@endnotemark@ORI\endnotemark \def\endnote{\caption@withoptargs\caption@endnote}% \def\endnotemark{\caption@withoptargs\caption@endnotemark}% @@ -1490,6 +1487,14 @@ \let\AC@placelabel\@gobble \let\glsunset\@gobble } +\caption@ifclassloaded{beamer}{}{% + \g@addto@macro\caption@prepareslc{% + \let\caption@footnote@ORI\footnote + \def\footnote{\caption@withoptargs\caption@footnote}% + \let\caption@footnotemark@ORI\footnotemark + \def\footnotemark{\caption@withoptargs\caption@footnotemark}% + \let\caption@footnotetext@ORI\@footnotetext + \let\@footnotetext\caption@gobble}} \newcommand\caption@footnote[2]{% \caption@footnotemark{#1}} \newcommand\caption@footnotemark[1]{% -- cgit v1.2.3