summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-21 21:39:45 +0000
committerKarl Berry <karl@freefriends.org>2020-07-21 21:39:45 +0000
commitc2672b946257e59e864cb7029db18d05630b7bc2 (patch)
tree9723cf1a33fe92ac5a53f284e2b7b985938a69a1 /Master/texmf-dist/tex/latex/caption
parent24f85a1e21564b541c4118b87d4bda16783c9cb1 (diff)
caption (21jul20)
git-svn-id: svn://tug.org/texlive/trunk@55900 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty41
1 files changed, 26 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index f9c5cd404da..c8b888672e7 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/07/19 v1.12a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/07/20 v1.12b caption3 kernel (AR)]
\providecommand\caption@FixArabTeX{%
\def\caption@tempa##1{}%
\ifx\caption@tempa\@gobble
@@ -243,10 +243,11 @@
\caption@teststar@\@captionsetup\@gobble\@firstofone}
\newcommand*\@captionsetup[1]{%
\captionsetup@startrue#1\captionsetup@starfalse
- \@ifnextchar[\caption@setup@options\caption@setup}
+ \@ifnextchar[%]
+ \caption@setup@options\caption@setup}
\newcommand*\caption@setup{\caption@setkeys{caption}}
\def\caption@setup@options[#1]{%
- \@ifnextchar[%
+ \@ifnextchar[%]
{\caption@stepthecounter
\caption@withoptargs{\@expandtwoargs
\caption@setup@options@i{#1}{@\caption@thecounter}}}%
@@ -1478,39 +1479,48 @@
\g@addto@macro\caption@prepareslc{%
\let\label\caption@gobble
\let\hypertarget\@gobbletwo
- \let\caption@endnotemark@ORI\endnotemark
+ \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
+ \let\caption@endnote@ORI\endnote
\def\endnote{\caption@withoptargs\caption@endnote}%
+ \let\caption@endnotemark@ORI\endnotemark
\def\endnotemark{\caption@withoptargs\caption@endnotemark}%
+ \let\caption@endnotetext@ORI\@endnotetext
\let\@endnotetext\caption@gobble
\let\pagenote\caption@gobble
\let\acused\@gobble
\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]{%
\begingroup
\let\stepcounter\caption@l@stepcounter
- \caption@footnotemark@ORI#1%
+ \caption@footnotemark@ORI#1\relax
\endgroup}
\newcommand\caption@endnote[2]{%
\caption@endnotemark{#1}}
\newcommand\caption@endnotemark[1]{%
\begingroup
\let\stepcounter\caption@l@stepcounter
- \caption@endnotemark@ORI#1
+ \caption@endnotemark@ORI#1\relax
\endgroup}
\newcommand*\caption@l@stepcounter[1]{%
\advance\csname c@#1\endcsname\@ne\relax}
+\caption@ifclassloaded{beamer}{%
+ \g@addto@macro\caption@prepareslc{%
+ \def\footnote{%
+ \begingroup
+ \let\stepcounter\caption@l@stepcounter
+ \renewcommand<>\beamer@framefootnotetext[1]{%
+ \endgroup}%
+ \let\@footnotetext\beamer@framefootnotetext
+ \caption@footnote@ORI}}}{}
\newcommand*\caption@applyfont{%
\caption@hj\captionfont\captionsize}
\newcommand\caption@@@make[2]{%
@@ -1705,7 +1715,8 @@
\noexpand\l@addto@macro\noexpand\caption@restore@counters
{\noexpand\setcounter{#1}{\number\value{#1}}}}%
\caption@tempa}
-\newcommand*\caption@For{\caption@withoptargs\caption@@For}
+\newcommand*\caption@For{%
+ \caption@withoptargs\caption@@For}
\newcommand\caption@@For[3]{%
\caption@AtBeginDocument#1{%
\def\@elt##1{#3}%