From 739b02ea0fe14b3d8a4b99bcdd89b55c940a8698 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Mar 2021 21:26:56 +0000 Subject: beamer (19mar21) git-svn-id: svn://tug.org/texlive/trunk@58537 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/beamer/beamer.cls | 2 +- .../texmf-dist/tex/latex/beamer/beamerarticle.sty | 2 +- .../tex/latex/beamer/beamerbasecompatibility.sty | 45 +++++++++++----------- .../tex/latex/beamer/beamerbasemodes.sty | 1 + .../tex/latex/beamer/beamerbasesection.sty | 14 +++++-- 5 files changed, 36 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls index cc2bc8082eb..7854b07b04a 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamer.cls +++ b/Master/texmf-dist/tex/latex/beamer/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/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty index e0430e6aeb4..f855632e28d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty +++ b/Master/texmf-dist/tex/latex/beamer/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/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty index 4a515689342..75050cfcab3 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasecompatibility.sty +++ b/Master/texmf-dist/tex/latex/beamer/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
{ - \@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/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty index d68e0c0c15d..79091d9cd5e 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemodes.sty +++ b/Master/texmf-dist/tex/latex/beamer/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/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty index 9193f5ca45d..b28b9ea853f 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty +++ b/Master/texmf-dist/tex/latex/beamer/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} -- cgit v1.2.3