summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/caption
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-07-20 03:02:49 +0000
committerNorbert Preining <norbert@preining.info>2020-07-20 03:02:49 +0000
commit7a37d65d52056a1500d4602172582154994bea64 (patch)
tree884e4a18a0c9bcdb3fbcddd00780ff2aa6148bdd /macros/latex/contrib/caption
parentcb4763b32d8bccc6791fb91ac5ce29f59163bf1a (diff)
CTAN sync 202007200302
Diffstat (limited to 'macros/latex/contrib/caption')
-rw-r--r--macros/latex/contrib/caption/README2
-rw-r--r--macros/latex/contrib/caption/caption3.dtx28
2 files changed, 20 insertions, 10 deletions
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README
index ed00e7db48..080116df65 100644
--- a/macros/latex/contrib/caption/README
+++ b/macros/latex/contrib/caption/README
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2020-05-30
+Release 2020-07-19
Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx
index 84134e7944..031c84fa67 100644
--- a/macros/latex/contrib/caption/caption3.dtx
+++ b/macros/latex/contrib/caption/caption3.dtx
@@ -28,7 +28,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{3576}
+% \CheckSum{3585}
%
% \iffalse
%<*driver>
@@ -191,7 +191,7 @@
%
% \begin{macrocode}
\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)]
% \end{macrocode}
%
% \section{Workaround for bug in package \package{arabtex}}
@@ -3638,17 +3638,12 @@
% |\caption@prepareslc|\par
% Re-define anything which would disturb the single-line-check.
% \begin{macrocode}
-\@ifundefined{caption@prepareslc}\def\g@addto@macro\caption@prepareslc{%
+\providecommand*\caption@prepareslc{}
+\g@addto@macro\caption@prepareslc{%
\let\label\caption@gobble
\let\hypertarget\@gobbletwo
% \end{macrocode}
% \begin{macrocode}
- \let\caption@footnotemark@ORI\footnotemark
- \def\footnote{\caption@withoptargs\caption@footnote}%
- \def\footnotemark{\caption@withoptargs\caption@footnotemark}%
- \let\@footnotetext\caption@gobble
-% \end{macrocode}
-% \begin{macrocode}
\let\caption@endnotemark@ORI\endnotemark
\def\endnote{\caption@withoptargs\caption@endnote}%
\def\endnotemark{\caption@withoptargs\caption@endnotemark}%
@@ -3676,6 +3671,21 @@
% \begin{macrocode}
}
% \end{macrocode}
+%
+% The following patch of \cs{footnote} assumes that the optional arguments of
+% \cs{footnote} and \cs{footnotemark} match. Since this is not the case in
+% \class{beamer} based documents, and since \class{beamer} extents the
+% syntax of \cs{footnote} in a way we don't support, we don't apply the patch there.
+% \begin{macrocode}
+\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}}
+% \end{macrocode}
% \begin{macrocode}
\newcommand\caption@footnote[2]{%
\caption@footnotemark{#1}}