summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-19 21:25:57 +0000
committerKarl Berry <karl@freefriends.org>2020-07-19 21:25:57 +0000
commitbd3377f8c4354d513bb3f8b7b06708718f6ccb06 (patch)
tree03ce9b8d13bb8bb599e86b1837c7afc5be35134a /Master
parent57db2136844339b947bf0af8c518487514f8cee1 (diff)
caption (19jul20)
git-svn-id: svn://tug.org/texlive/trunk@55878 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/caption/README2
-rw-r--r--Master/texmf-dist/source/latex/caption/caption3.dtx28
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty17
3 files changed, 31 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index ed00e7db489..080116df658 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx
index 84134e79441..031c84fa67c 100644
--- a/Master/texmf-dist/source/latex/caption/caption3.dtx
+++ b/Master/texmf-dist/source/latex/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}}
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]{%