summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/beamer/base/beamerbasecompatibility.sty')
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty92
1 files changed, 59 insertions, 33 deletions
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