summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer/base
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/beamer/base')
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls6
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty92
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasenotes.sty7
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseoverlay.sty1
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasetwoscreens.sty14
6 files changed, 85 insertions, 37 deletions
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index 8da6b10836..376c5d7aa9 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}
- [2020/05/06 v3.58 A class for typesetting presentations]
+ [2020/07/22 v3.59 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
@@ -226,7 +226,7 @@
\beamer@sansmathtrue
}
\DeclareOptionBeamer{serif}{%
- \ClassWarning{beamer}{``serif'' is obsolete. Use font theme ``serif'' instead}
+ \ClassWarning{beamer}{``serif'' option is obsolete. Use font theme ``serif'' instead}
\def\familydefault{\rmdefault}
\def\mathfamilydefault{\rmdefault}
\beamer@sansmathfalse
@@ -238,7 +238,7 @@
\ClassWarning{beamer}{``mathserif'' is obsolete. Use font theme ``serif'' with option ``onlymath''}
\def\mathfamilydefault{\rmdefault}\beamer@sansmathfalse}
\DeclareOptionBeamer{professionalfont}{%
- \ClassWarning{beamer}{``professionalfont'' is obsolete. Use font theme ``professionalfonts'' instead}
+ \ClassWarning{beamer}{``professionalfont'' option is obsolete. Use font theme ``professionalfonts'' instead}
\beamer@suppressreplacementstrue}
% has to be done here for compatibility
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index 1b3de32744..90b6b97afc 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}
- [2020/05/06 v3.58 beamer input in article mode]
+ [2020/07/22 v3.59 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 5699abe9f0..4a51568934 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -2,7 +2,7 @@
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011,2012,2015 by Vedran Mileti\'c, Joseph Wright
% Copyright 2016 by Joseph Wright
-% Copyright 2017,2018 by Louis Stuart, Joseph Wright
+% Copyright 2017-2020 by Louis Stuart, Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -51,42 +51,68 @@
%
% Fixes right before the start of the document.
%
-\let\beamer@origdocument\document
-\def\document{%
- \beamer@firstminutepatches
- \endgroup
- \AtBeginDocument{% fix spanish.ldf's meddling with < and >
- %
- % Fix spanish.ldf's meddling with < and >
- %
- \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
- % Fix meddline with enumerate items
- \renewcommand\theenumi{\@arabic\c@enumi}%
- \renewcommand\theenumii{\@arabic\c@enumii}%
- \renewcommand\theenumiii{\@arabic\c@enumiii}%
- }%
- \AtBeginDocument{% Allow for paralist loading
- \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}
-% \let\labelitemi\beamer@labelitemi
-% \let\labelitemii\beamer@labelitemii
-% \let\itemize\beamer@itemize
-% \let\list\beamer@list
-% \let\@trivlist\beamer@@trivlist
- \catcode`<=12 \catcode`>=12 }%
- \begingroup
- \beamer@origdocument
- \beamer@lastminutepatches
- \ifbeamer@ignorenonframe
- \expandafter\mode\expandafter*%
- \fi}
+\@ifundefined{AddToHook}
+ {%
+ \let\beamer@origdocument\document
+ \def\document{%
+ \beamer@firstminutepatches
+ \endgroup
+ \AtBeginDocument{% fix spanish.ldf's meddling with < and >
+ %
+ % Fix spanish.ldf's meddling with < and >
+ %
+ \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
+ % Fix meddline with enumerate items
+ \renewcommand\theenumi{\@arabic\c@enumi}%
+ \renewcommand\theenumii{\@arabic\c@enumii}%
+ \renewcommand\theenumiii{\@arabic\c@enumiii}%
+ }%
+ \AtBeginDocument{% Allow for paralist loading
+ \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}
+ \let\labelitemi\beamer@labelitemi
+ \let\labelitemii\beamer@labelitemii
+ \let\itemize\beamer@itemize
+ \let\list\beamer@list
+ \let\@trivlist\beamer@@trivlist
+ \catcode`<=12 \catcode`>=12 }%
+ \begingroup
+ \beamer@origdocument
+ \beamer@lastminutepatches
+ \ifbeamer@ignorenonframe
+ \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>
{
- \let\beamer@origdocument\document
- \def\document{%
- \beamer@origdocument%
- \beamer@lastminutepatches}
+ \@ifundefined{AddToHook}
+ {%
+ \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/beamerbasenotes.sty b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
index d15fb1c8fd..736d9f950b 100644
--- a/macros/latex/contrib/beamer/base/beamerbasenotes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
@@ -31,6 +31,13 @@
\defbeameroption{show notes on second screen}[right]%
{
+ \ifx\@onlypreamble\@notprerr
+ \ltx@ifpackageloaded{pgfpages}{}{%
+ \ClassError{beamer}{`pgfpages' package necessary for this option}{}%
+ }%
+ \else%
+ \RequirePackage{pgfpages}%
+ \fi%
\pgfpagesuselayout{two screens with optional second}[second #1]
\beamer@twoscreensnotestrue
\beamer@notestrue
diff --git a/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty b/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty
index 0f718e7287..46cc607dde 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseoverlay.sty
@@ -766,6 +766,7 @@
\newcommand<>{\transsplithorizontalout}[1][]{\only#2{\beamer@dotrans[{#1}]{Split /Dm /H /M /O}}}
\newcommand<>{\transuncover}[1][]{\only#2{\beamer@dotrans[{#1}]{Uncover}}}
\newcommand<>{\transwipe}[1][]{\only#2{\beamer@dotrans[{#1}]{Wipe}}}
+ \newcommand<>{\transfly}[1][]{\only#2{\beamer@dotrans[{#1}]{Fly}}}
}
\newcommand<>{\transduration}[1]{\only#2{\hypersetup{pdfpageduration={#1}}}}
diff --git a/macros/latex/contrib/beamer/base/beamerbasetwoscreens.sty b/macros/latex/contrib/beamer/base/beamerbasetwoscreens.sty
index af617d7ccc..89c4eb9f02 100644
--- a/macros/latex/contrib/beamer/base/beamerbasetwoscreens.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasetwoscreens.sty
@@ -20,6 +20,13 @@
\defbeameroption{previous slide on second screen}[right]%
{%
+ \ifx\@onlypreamble\@notprerr
+ \ltx@ifpackageloaded{pgfpages}{}{%
+ \ClassError{beamer}{`pgfpages' package necessary for this option}{}%
+ }%
+ \else%
+ \RequirePackage{pgfpages}%
+ \fi%
\pgfpagesuselayout{two screens with lagging second}[second #1]%
\beamer@twoscreenstexttrue
\nofiles
@@ -27,6 +34,13 @@
\defbeameroption{second mode text on second screen}[right]%
{%
+ \ifx\@onlypreamble\@notprerr
+ \ltx@ifpackageloaded{pgfpages}{}{%
+ \ClassError{beamer}{`pgfpages' package necessary for this option}{}%
+ }%
+ \else%
+ \RequirePackage{pgfpages}%
+ \fi%
\pgfpagesuselayout{two screens with optional second}[second #1]%
\beamer@twoscreenstexttrue
}