texlive[55878] Master/texmf-dist: caption (19jul20)

[commits+karl at tug.org]

Revision: 55878
          http://tug.org/svn/texlive?view=revision&revision=55878
Author:   karl
Date:     2020-07-19 23:25:57 +0200 (Sun, 19 Jul 2020)
Log Message:
-----------
caption (19jul20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/caption/README
    trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
    trunk/Master/texmf-dist/tex/latex/caption/caption3.sty

Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README	2020-07-19 21:25:40 UTC (rev 55877)
+++ trunk/Master/texmf-dist/doc/latex/caption/README	2020-07-19 21:25:57 UTC (rev 55878)
@@ -1,7 +1,7 @@
 ==========================================================================
 
 The `caption' package bundle
-Release 2020-05-30
+Release 2020-07-19
 Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
 
 License: LPPL = LaTeX Project Public Licence

Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx	2020-07-19 21:25:40 UTC (rev 55877)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx	2020-07-19 21:25:57 UTC (rev 55878)
@@ -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 at prepareslc|\par
 %  Re-define anything which would disturb the single-line-check.
 %    \begin{macrocode}
-\@ifundefined{caption at prepareslc}\def\g at addto@macro\caption at prepareslc{%
+\providecommand*\caption at prepareslc{}
+\g at addto@macro\caption at prepareslc{%
   \let\label\caption at gobble
   \let\hypertarget\@gobbletwo
 %    \end{macrocode}
 %    \begin{macrocode}
-  \let\caption at footnotemark@ORI\footnotemark
-  \def\footnote{\caption at withoptargs\caption at footnote}%
-  \def\footnotemark{\caption at withoptargs\caption at footnotemark}%
-  \let\@footnotetext\caption at gobble
-%    \end{macrocode}
-%    \begin{macrocode}
   \let\caption at endnotemark@ORI\endnotemark
   \def\endnote{\caption at withoptargs\caption at endnote}%
   \def\endnotemark{\caption at withoptargs\caption at endnotemark}%
@@ -3676,7 +3671,22 @@
 %    \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 at ifclassloaded{beamer}{}{%
+  \g at addto@macro\caption at prepareslc{%
+    \let\caption at footnote@ORI\footnote
+    \def\footnote{\caption at withoptargs\caption at footnote}%
+    \let\caption at footnotemark@ORI\footnotemark
+    \def\footnotemark{\caption at withoptargs\caption at footnotemark}%
+    \let\caption at footnotetext@ORI\@footnotetext
+    \let\@footnotetext\caption at gobble}}
+%    \end{macrocode}
+%    \begin{macrocode}
 \newcommand\caption at footnote[2]{%
   \caption at footnotemark{#1}}
 \newcommand\caption at footnotemark[1]{%

Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty	2020-07-19 21:25:40 UTC (rev 55877)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty	2020-07-19 21:25:57 UTC (rev 55878)
@@ -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 at FixArabTeX{%
   \def\caption at tempa##1{}%
   \ifx\caption at tempa\@gobble
@@ -1474,13 +1474,10 @@
 \newcommand*\caption at singleline{%
   \caption at xsetup\caption at opt@singleline
   \let\caption at fmt\caption at slfmt}
-\@ifundefined{caption at prepareslc}\def\g at addto@macro\caption at prepareslc{%
+\providecommand*\caption at prepareslc{}
+\g at addto@macro\caption at prepareslc{%
   \let\label\caption at gobble
   \let\hypertarget\@gobbletwo
-  \let\caption at footnotemark@ORI\footnotemark
-  \def\footnote{\caption at withoptargs\caption at footnote}%
-  \def\footnotemark{\caption at withoptargs\caption at footnotemark}%
-  \let\@footnotetext\caption at gobble
   \let\caption at endnotemark@ORI\endnotemark
   \def\endnote{\caption at withoptargs\caption at endnote}%
   \def\endnotemark{\caption at withoptargs\caption at endnotemark}%
@@ -1490,6 +1487,14 @@
   \let\AC at placelabel\@gobble
   \let\glsunset\@gobble
 }
+\caption at ifclassloaded{beamer}{}{%
+  \g at addto@macro\caption at prepareslc{%
+    \let\caption at footnote@ORI\footnote
+    \def\footnote{\caption at withoptargs\caption at footnote}%
+    \let\caption at footnotemark@ORI\footnotemark
+    \def\footnotemark{\caption at withoptargs\caption at footnotemark}%
+    \let\caption at footnotetext@ORI\@footnotetext
+    \let\@footnotetext\caption at gobble}}
 \newcommand\caption at footnote[2]{%
   \caption at footnotemark{#1}}
 \newcommand\caption at footnotemark[1]{%