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.cls11
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty18
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseboxes.sty3
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty17
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasefont.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty6
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasenotes.sty7
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasetoc.sty2
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty70
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty69
11 files changed, 147 insertions, 60 deletions
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index 135969d997..ed9def1156 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/05/26 v3.63 A class for typesetting presentations]
+ [2021/10/18 v3.64 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
@@ -188,6 +188,8 @@
\nofiles
}
\def\beamer@notesaction@onlyslideswithnotes{%
+ \ClassWarning{beamer}{This option is obsolete. Use beamer option
+ ``show only slides with notes'' instead.}%
\beamer@notestrue
\beamer@frameswithnotesonlytrue
\nofiles
@@ -296,7 +298,10 @@
\setlength\beamer@paperheight{9.60cm}
\DeclareOptionBeamer{aspectratio}[43]{%
- \ifnum#1=1610 %
+ \ifnum#1=2013 %
+ \setlength\beamer@paperwidth{14.00cm}%
+ \setlength\beamer@paperheight{9.10cm}%
+ \else\ifnum#1=1610 %
\setlength\beamer@paperwidth{16.00cm}%
\setlength\beamer@paperheight{10.00cm}%
\else\ifnum#1=169 %
@@ -317,7 +322,7 @@
\else\ifnum#1=141 %
\setlength\beamer@paperwidth{14.85cm}%
\setlength\beamer@paperheight{10.50cm}%
- \fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi
}
\RequirePackage[%
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index 195e49a0e3..e58341d73e 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/05/26 v3.63 beamer input in article mode]
+ [2021/10/18 v3.64 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/beamerbaseauxtemplates.sty b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
index 28cfebc886..c77970cd31 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
@@ -536,9 +536,11 @@
\defbeamertemplate{frametitle continuation}{from second}[1][\insertcontinuationtext]
{\expandafter\ifnum\insertcontinuationcount>1\relax#1\fi}
-
-
-
+\defbeamertemplate{frametitle continuation}{singleframecheck}[1][\insertcontinuationcountroman]{%
+ \ifnum \numexpr\beamer@endpageofframe+1-\beamer@startpageofframe\relax > 1
+ #1
+ \fi%
+}
% Bibliography items
@@ -809,7 +811,15 @@
\insertnote
}
-
+\defbeamertemplate{note page}{lined}[1][6]{%
+ \vfill%
+ \beamer@tempcount=1%
+ \loop%
+ \hrulefill\vfill%
+ \advance\beamer@tempcount by 1%
+ \ifnum\beamer@tempcount<#1%
+ \repeat%
+}
%
% Theorem templates
diff --git a/macros/latex/contrib/beamer/base/beamerbaseboxes.sty b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
index 8124dc318c..fa40600490 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
@@ -167,7 +167,8 @@
\pgfpathrectangle{\pgfpoint{4bp}{8bp}}{\pgfpoint{\bmb@boxwidth-0.2bp}{\bmb@boxheight-2bp}}
\pgfusepath{fill}
\end{pgfscope}
- \end{pgfpicture}
+ \end{pgfpicture}%
+ \hskip4bp%
}%
\fi%
\bmb@temp=\bmb@width%
diff --git a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
index 17ac0b45f0..02abbad55a 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -57,6 +57,13 @@
\AddToHook{env/document/begin}[beamer]{\beamer@firstminutepatches}%
\AddToHook{env/document/begin}[beamer]{%
\@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
+ \@ifpackageloaded{pdfpages}{%
+ % Patching pdfpages package to avoid the included pages from being covered by the background canvas
+ \AddToHook{cmd/includepdf/before}[beamer]{\begingroup\setbeamercolor{background canvas}{bg=}}%
+ \AddToHook{cmd/includepdf/after}[beamer]{\endgroup}%
+ \AddToHook{cmd/includepdfmerge/before}[beamer]{\begingroup\setbeamercolor{background canvas}{bg=}}%
+ \AddToHook{cmd/includepdfmerge/after}[beamer]{\endgroup}%
+ }{}%
}%
\AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
{%
@@ -70,7 +77,7 @@
\ifbeamer@ignorenonframe
\expandafter\mode\expandafter*%
\fi
- }
+ }%
}
{%
\let\beamer@origdocument\document
@@ -234,6 +241,14 @@
\providecommand\ext@figure{}
%
+% Fix for polyglossia
+% https://github.com/josephwright/beamer/issues/706
+%
+\IfFormatAtLeastTF{2020-10-01}{%
+ \DeclareHookRule{begindocument/end}{beamer}{after}{polyglossia}%
+}{}
+
+%
% Obsolete commands from old versions of beamer
%
\mode
diff --git a/macros/latex/contrib/beamer/base/beamerbasefont.sty b/macros/latex/contrib/beamer/base/beamerbasefont.sty
index 01fdd9b6bb..0a82f35c35 100644
--- a/macros/latex/contrib/beamer/base/beamerbasefont.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasefont.sty
@@ -188,7 +188,7 @@
% supress for mathtime serif and math minion serif
\@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
- \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\mathversion{sf}\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{lmodern}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
diff --git a/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty b/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty
index 66f6e5314c..d4437e81fe 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty
@@ -315,7 +315,7 @@
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
\reset@font\footnotesize
- \hsize0.85\paperwidth
+ \hsize\columnwidth
\@parboxrestore
\protected@edef\@currentlabel
{\csname p@mpfootnote\endcsname\@thefnmark}%
@@ -356,6 +356,10 @@
\@footnotemark\beamer@footnotetext#2}%
\fi%
\beamer@next}
+
+\renewcommand{\footnoterule}{%
+ \kern -3\p@ \hrule width .4\columnwidth \kern 2.6\p@%
+}
\mode
<article>
diff --git a/macros/latex/contrib/beamer/base/beamerbasenotes.sty b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
index 736d9f950b..c8f611e8c6 100644
--- a/macros/latex/contrib/beamer/base/beamerbasenotes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
@@ -50,7 +50,12 @@
\nofiles
}
-
+\defbeameroption{show only slides with notes}[]%
+{
+ \beamer@notestrue
+ \beamer@frameswithnotesonlytrue
+ \nofiles
+}
%
% Notes
diff --git a/macros/latex/contrib/beamer/base/beamerbasetoc.sty b/macros/latex/contrib/beamer/base/beamerbasetoc.sty
index 0ea5318a59..6b003e80e3 100644
--- a/macros/latex/contrib/beamer/base/beamerbasetoc.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasetoc.sty
@@ -91,8 +91,6 @@
\vfill}%
}
-\renewcommand\addcontentsline[3]{\addtocontents{#1}{\protect\contentsline{#2}{#3}}}
-
\def\beamer@tocaction@show#1{\usebeamertemplate**{#1}}
\def\beamer@tocaction@shaded#1{\usebeamertemplate**{#1 shaded}}
\def\beamer@tocaction@hide#1{}
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
index 0a68ff0598..385ad307eb 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
@@ -35,22 +35,19 @@
\ifbeamer@sb@subsection
\pgfdeclareverticalshading{beamer@barshade}{\the\paperwidth}{%
- color(0ex)=(global.bg);%
- color(1ex)=(subsection in head/foot.bg);%
- color(3.25ex)=(subsection in head/foot.bg);%
- color(4.25ex)=(section in head/foot.bg);%
- color(9.75ex)=(section in head/foot.bg)%
+ color(0ex)=(subsection in head/foot.bg);%
+ color(2.25ex)=(subsection in head/foot.bg);%
+ color(3.25ex)=(section in head/foot.bg);%
+ color(8.75ex)=(section in head/foot.bg)%
}
\pgfdeclareverticalshading{beamer@aboveframetitle}{\the\paperwidth}{%
color(0ex)=(frametitle.bg);%
- color(1ex)=(frametitle.bg);%
- color(2ex)=(subsection in head/foot.bg)
+ color(1ex)=(subsection in head/foot.bg)
}
\else
\pgfdeclareverticalshading{beamer@barshade}{\the\paperwidth}{%
- color(0ex)=(global.bg);%
- color(1ex)=(section in head/foot.bg);%
- color(7ex)=(section in head/foot.bg)%
+ color(0ex)=(section in head/foot.bg);%
+ color(6ex)=(section in head/foot.bg)%
}
\pgfdeclareverticalshading{beamer@aboveframetitle}{\the\paperwidth}{%
color(0ex)=(frametitle.bg);%
@@ -58,11 +55,15 @@
color(2ex)=(section in head/foot.bg)
}
\fi
-
- \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
- color(0ex)=(global.bg);%
- color(1ex)=(frametitle.bg)
- }
+
+ \begingroup
+ \selectcolormodel{gray}
+ \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
+ color(0ex)=(pgftransparent!100);%
+ color(1ex)=(pgftransparent!0)
+ }
+ \pgfdeclarefading{beamer@belowframetitlemask}{\pgfuseshading{beamer@belowframetitle}}
+ \endgroup
}
}
@@ -70,10 +71,25 @@
\defbeamertemplate*{headline}{smoothbars theme}
{%
\pgfuseshading{beamer@barshade}%
+ \vskip-0.05ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \ifbeamer@sb@subsection%
+ \pgfsetfillcolor{subsection in head/foot.bg}%
+ \else%
+ \pgfsetfillcolor{section in head/foot.bg}%
+ \fi%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-0.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
+ \end{beamercolorbox}%
\ifbeamer@sb@subsection%
\vskip-9.75ex%
\else%
- \vskip-7ex%
+ \vskip-6.85ex%
\fi%
\begin{beamercolorbox}[ignorebg,ht=2.25ex,dp=3.75ex]{section in head/foot}
\insertnavigation{\paperwidth}
@@ -90,13 +106,15 @@
\defbeamertemplate*{frametitle}{smoothbars theme}
{%
\nointerlineskip%
+ \vskip-0.19ex%
\usebeamerfont{headline}%
- \begin{beamercolorbox}[wd=\paperwidth,ht=1.5ex,dp=0ex,vmode]{empty}
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=1ex,vmode]{empty}
\pgfuseshading{beamer@aboveframetitle}%
\end{beamercolorbox}%
- \vskip-.5ex%
+ \vskip-1ex%
\nointerlineskip%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=.3cm,rightskip=.3cm plus1fil,vmode]{frametitle}
+ \vskip0.5ex%
\usebeamerfont*{frametitle}\strut\insertframetitle%
\ifx\insertframesubtitle\@empty%
\strut\par%
@@ -104,11 +122,19 @@
\par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}%
\fi%%
\usebeamerfont{headline}%
- \vskip.5ex
+ \vskip0.05ex%
\end{beamercolorbox}%
- \nointerlineskip
- \begin{beamercolorbox}[wd=\paperwidth,ht=.5ex,dp=0ex]{empty}
- \pgfuseshading{beamer@belowframetitle}%
+ \nointerlineskip%
+ \vskip-0.05ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \pgfsetfillcolor{frametitle.bg}%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
\end{beamercolorbox}%
}
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
index 6af2e39505..fc6c9937de 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
@@ -23,33 +23,47 @@
\usebeamercolor{frametitle}
\pgfdeclareverticalshading{beamer@treeshade}{\the\paperwidth}{%
- color(0ex)=(normal text.bg);%
- color(1ex)=(subsection in head/foot.bg);%
- color(3.25ex)=(subsection in head/foot.bg);%
- color(4.25ex)=(section in head/foot.bg);%
- color(6.5ex)=(section in head/foot.bg);%
- color(7.5ex)=(title in head/foot.bg);%
- color(10.25ex)=(title in head/foot.bg)%
+ color(0ex)=(subsection in head/foot.bg);%
+ color(2.25ex)=(subsection in head/foot.bg);%
+ color(3.25ex)=(section in head/foot.bg);%
+ color(5.5ex)=(section in head/foot.bg);%
+ color(6.5ex)=(title in head/foot.bg);%
+ color(9.25ex)=(title in head/foot.bg)%
}
\pgfdeclareverticalshading{beamer@aboveframetitle}{\the\paperwidth}{%
color(0ex)=(frametitle.bg);%
- color(1ex)=(frametitle.bg);%
- color(2ex)=(subsection in head/foot.bg)
- }
-
- \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
- color(0ex)=(normal text.bg);%
- color(1ex)=(frametitle.bg)
+ color(1ex)=(subsection in head/foot.bg)
}
+
+ \begingroup
+ \selectcolormodel{gray}
+ \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
+ color(0ex)=(pgftransparent!100);%
+ color(1ex)=(pgftransparent!0)
+ }
+ \pgfdeclarefading{beamer@belowframetitlemask}{\pgfuseshading{beamer@belowframetitle}}
+ \endgroup
+
}
}
\defbeamertemplate*{headline}{smoothtree theme}
{%
\pgfuseshading{beamer@treeshade}%
- \vskip-10.25ex%
- \begin{beamercolorbox}[wd=\paperwidth,ht=2.125ex,dp=1.125ex,ignorebg,%
+ \vskip-0.05ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \pgfsetfillcolor{subsection in head/foot.bg}%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-0.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
+ \end{beamercolorbox}%
+ \vskip-9.15ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1.125ex,dp=1.125ex,ignorebg,%
leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}
\usebeamerfont{title in head/foot}\insertshorttitle
\end{beamercolorbox}
@@ -63,18 +77,20 @@
\usebeamerfont{subsection in head/foot}%
\hskip12pt\insertsubsectionhead
\end{beamercolorbox}
+ \vskip-0.4ex%
}
\defbeamertemplate*{frametitle}{smoothtree theme}
{%
\nointerlineskip%
+ \vskip-0.05ex%
\usebeamerfont{headline}%
- \begin{beamercolorbox}[wd=\paperwidth,ht=1.5ex,dp=0ex]{empty}
+ \begin{beamercolorbox}[wd=\paperwidth,ht=0.85ex,dp=0ex]{empty}
\pgfuseshading{beamer@aboveframetitle}%
- \end{beamercolorbox}%
- \vskip-.5ex%
+ \end{beamercolorbox}
\nointerlineskip%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=.935cm,rightskip=.3cm plus1fil]{frametitle}
+ \vskip-1.2ex%
\usebeamerfont*{frametitle}\strut\insertframetitle%
\ifx\insertframesubtitle\@empty%
\strut\par%
@@ -82,12 +98,19 @@
\par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}%
\fi%%
\usebeamerfont{headline}%
- \vskip.5ex
\end{beamercolorbox}%
\nointerlineskip
- \begin{beamercolorbox}[wd=\paperwidth,ht=.5ex,dp=0ex]{empty}
- \pgfuseshading{beamer@belowframetitle}%
- \end{beamercolorbox}%
+ \vskip-0.2ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \pgfsetfillcolor{frametitle.bg}%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-0.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
+ \end{beamercolorbox}%
}