summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer/base
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-03-20 03:01:11 +0000
committerNorbert Preining <norbert@preining.info>2021-03-20 03:01:11 +0000
commitd3b06b2254431c03e127876a07ae654091314c72 (patch)
tree4fa5e40c55aae3ceeeab0048fabbb778ee06e284 /macros/latex/contrib/beamer/base
parent6ad1cf68ae6add67e56faf5ec4390fead04e31b4 (diff)
CTAN sync 202103200301
Diffstat (limited to 'macros/latex/contrib/beamer/base')
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls2
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty45
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasemodes.sty1
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasesection.sty14
5 files changed, 36 insertions, 28 deletions
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index cc2bc8082e..7854b07b04 100644
--- a/macros/latex/contrib/beamer/base/beamer.cls
+++ b/macros/latex/contrib/beamer/base/beamer.cls
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2021/02/09 v3.61 A class for typesetting presentations]
+ [2021/03/19 v3.62 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index e0430e6aeb..f855632e28 100644
--- a/macros/latex/contrib/beamer/base/beamerarticle.sty
+++ b/macros/latex/contrib/beamer/base/beamerarticle.sty
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2021/02/09 v3.61 beamer input in article mode]
+ [2021/03/19 v3.62 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
index 4a51568934..75050cfcab 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -51,7 +51,27 @@
%
% Fixes right before the start of the document.
%
-\@ifundefined{AddToHook}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2020-10-01}
+ {%
+ \AddToHook{env/document/begin}[beamer]{\beamer@firstminutepatches}%
+ \AddToHook{env/document/begin}[beamer]{%
+ \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
+ }%
+ \AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
+ {%
+ \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
+ % Fix meddline with enumerate items
+ \renewcommand\theenumi{\@arabic\c@enumi}%
+ \renewcommand\theenumii{\@arabic\c@enumii}%
+ \renewcommand\theenumiii{\@arabic\c@enumiii}%
+ \catcode`<=12 \catcode`>=12 %% right place??
+ \beamer@lastminutepatches
+ \ifbeamer@ignorenonframe
+ \expandafter\mode\expandafter*%
+ \fi
+ }
+ }
{%
\let\beamer@origdocument\document
\def\document{%
@@ -82,37 +102,18 @@
\expandafter\mode\expandafter*%
\fi}%
}
- {%
- \AddToHook{env/begin/document}[beamer]{\beamer@firstminutepatches}%
- \AddToHook{env/begin/document}[beamer]{%
- \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
- }%
- \AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
- {%
- \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
- % Fix meddline with enumerate items
- \renewcommand\theenumi{\@arabic\c@enumi}%
- \renewcommand\theenumii{\@arabic\c@enumii}%
- \renewcommand\theenumiii{\@arabic\c@enumiii}%
- \catcode`<=12 \catcode`>=12 %% right place??
- \beamer@lastminutepatches
- \ifbeamer@ignorenonframe
- \expandafter\mode\expandafter*%
- \fi
- }
- }
\mode
<article>
{
- \@ifundefined{AddToHook}
+ \IfFormatAtLeastTF{2020-10-01}
+ {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
{%
\let\beamer@origdocument\document
\def\document{%
\beamer@origdocument%
\beamer@lastminutepatches}
}
- {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
\g@addto@macro\beamer@lastminutepatches{%
\ifbeamer@articleactive
diff --git a/macros/latex/contrib/beamer/base/beamerbasemodes.sty b/macros/latex/contrib/beamer/base/beamerbasemodes.sty
index d68e0c0c15..79091d9cd5 100644
--- a/macros/latex/contrib/beamer/base/beamerbasemodes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasemodes.sty
@@ -122,6 +122,7 @@
\ifx\beamer@nexttoken\lecture\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\note\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\appendix\let\next=\beamer@stopoutsidemode\fi
+ \ifx\beamer@nexttoken\beamer@appendixwrite\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\againframe\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\section\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\subsection\let\next=\beamer@stopoutsidemode\fi
diff --git a/macros/latex/contrib/beamer/base/beamerbasesection.sty b/macros/latex/contrib/beamer/base/beamerbasesection.sty
index 9193f5ca45..b28b9ea853 100644
--- a/macros/latex/contrib/beamer/base/beamerbasesection.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasesection.sty
@@ -372,13 +372,19 @@
\newcommand<>\beamer@appendix{}
\def\beamer@resetappendix{\global\let\appendix\beamer@appendix}
-\newcommand<>\appendix{%
- \beamer@inappendixtrue%
- \only#1{\part{\appendixname}%
+\def\beamer@appendixwrite{%
\immediate\write\@auxout{\string\@writefile{nav}%
{\noexpand\headcommand{\noexpand\gdef\noexpand\insertmainframenumber{\the\c@framenumber}}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer@appendixpages{\the\c@page}}}%
- \beamer@resetappendix}%
+}
+
+\newcommand<>\appendix{%
+ \beamer@inappendixtrue%
+ \only#1{%
+ \part{\appendixname}%
+ \beamer@appendixwrite%
+ \beamer@resetappendix%
+ }%
}
\def\insertappendixframenumber{\the\numexpr\inserttotalframenumber-\insertmainframenumber\relax}