summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/beamer/base
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-27 03:01:40 +0000
committerNorbert Preining <norbert@preining.info>2021-05-27 03:01:40 +0000
commit5f1cfa686748068fedb95d8dafda3dc7f999c948 (patch)
tree874fa8430be12fe4633924f3b707428170316a46 /macros/latex/contrib/beamer/base
parent8982c52e00ffb3fb5a913fc60913ebd9070f091a (diff)
CTAN sync 202105270301
Diffstat (limited to 'macros/latex/contrib/beamer/base')
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls5
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty47
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasetoc.sty13
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeinfolines.sty11
6 files changed, 62 insertions, 18 deletions
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index 7854b07b04..135969d997 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/03/19 v3.62 A class for typesetting presentations]
+ [2021/05/26 v3.63 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
@@ -74,6 +74,7 @@
\newcount\beamer@currentsubsection
\newcount\beamer@coveringdepth
\newcount\beamer@sectionadjust
+\newcount\beamer@toclastsection
\newcount\beamer@tocsectionnumber
\newif\ifbeamer@sansmath
@@ -250,7 +251,7 @@
bookmarksopen=true,%
pdfborder={0 0 0},%
pdfhighlight={/N},%
- linkbordercolor={.5 .5 .5}}{hyperref}
+ linkbordercolor=[rgb]{0.5,0.5,0.5}}{hyperref}
\DeclareOptionBeamer{pgf}{\PassOptionsToPackage{#1}{pgf}}
\DeclareOptionBeamer{hyperref}{\PassOptionsToPackage{#1}{hyperref}}
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index f855632e28..195e49a0e3 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/03/19 v3.62 beamer input in article mode]
+ [2021/05/26 v3.63 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 3725661462..28cfebc886 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
@@ -185,8 +185,16 @@
% (sub-)section in toc: sections numbered
-\defbeamertemplate{section in toc}{sections numbered}
-{\leavevmode\inserttocsectionnumber. \inserttocsection\par}
+\defbeamertemplate{section in toc}{sections numbered}{%
+ \leavevmode%
+ % prevents the period to be printed with the first/last section option
+ \ifnum\beamer@tempcount>\beamer@toclastsection
+ \else
+ \ifnum\beamer@tempcount>0
+ \inserttocsectionnumber.
+ \fi\fi%
+ \inserttocsection\par%
+}
\defbeamertemplate{subsection in toc}{sections numbered}
{\leavevmode\leftskip=2.5em\inserttocsubsection\par}
@@ -554,22 +562,43 @@
{\hskip\Gm@lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm@rmargin}
% Framenumbers in footline
-\defbeamertemplate{page number in head/foot}{framenumber}{\insertframenumber}
+\defbeamertemplate{page number in head/foot}{framenumber}{%
+ \setbox\beamer@tempbox=\hbox{\inserttotalframenumber}%
+ \beamer@tempdim=\wd\beamer@tempbox%
+ \makebox[\beamer@tempdim][r]{\insertframenumber}%
+}
-\defbeamertemplate{page number in head/foot}{totalframenumber}{\insertframenumber\,/\,\inserttotalframenumber}
+\defbeamertemplate{page number in head/foot}{totalframenumber}{%
+ \setbox\beamer@tempbox=\hbox{\inserttotalframenumber\,/\,\inserttotalframenumber}%
+ \beamer@tempdim=\wd\beamer@tempbox%
+ \makebox[\beamer@tempdim][r]{\insertframenumber\,/\,\inserttotalframenumber}%
+}
\defbeamertemplate{page number in head/foot}{appendixframenumber}{%
+ \ifnum\insertappendixframenumber<\insertmainframenumber%
+ \setbox\beamer@tempbox=\hbox{\insertmainframenumber\,/\,\insertmainframenumber}%
+ \else%
+ \setbox\beamer@tempbox=\hbox{\insertappendixframenumber\,/\,\insertappendixframenumber}%
+ \fi%
+ \beamer@tempdim=\wd\beamer@tempbox%
\ifbeamer@inappendix%
- \insertframenumberinappendix\,/\,\insertappendixframenumber%
+ \makebox[\beamer@tempdim][r]{\insertframenumberinappendix\,/\,\insertappendixframenumber}%
\else%
- \insertframenumber\,/\,\insertmainframenumber%
+ \makebox[\beamer@tempdim][r]{\insertframenumber\,/\,\insertmainframenumber}%
\fi%
}
-\defbeamertemplate{page number in head/foot}{pagenumber}{\insertpagenumber}
-
-\defbeamertemplate{page number in head/foot}{totalpagenumber}{\insertpagenumber\,/\,\insertpresentationendpage}
+\defbeamertemplate{page number in head/foot}{pagenumber}{%
+ \setbox\beamer@tempbox=\hbox{\insertpresentationendpage}%
+ \beamer@tempdim=\wd\beamer@tempbox%
+ \makebox[\beamer@tempdim][r]{\insertpagenumber}%
+}
+\defbeamertemplate{page number in head/foot}{totalpagenumber}{%
+ \setbox\beamer@tempbox=\hbox{\insertpresentationendpage\,/\,\insertpresentationendpage}%
+ \beamer@tempdim=\wd\beamer@tempbox%
+ \makebox[\beamer@tempdim][r]{\insertpagenumber\,/\,\insertpresentationendpage}%
+}
% Footline
diff --git a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
index 75050cfcab..17ac0b45f0 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -107,7 +107,7 @@
<article>
{
\IfFormatAtLeastTF{2020-10-01}
- {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
+ {\AddToHook{begindocument/end}[beamer]{\beamer@lastminutepatches}}
{%
\let\beamer@origdocument\document
\def\document{%
diff --git a/macros/latex/contrib/beamer/base/beamerbasetoc.sty b/macros/latex/contrib/beamer/base/beamerbasetoc.sty
index 9b39d707e0..0ea5318a59 100644
--- a/macros/latex/contrib/beamer/base/beamerbasetoc.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasetoc.sty
@@ -63,6 +63,7 @@
\define@key{beamertoc}{part}{\beamer@showpartnumber=#1\relax}
\define@key{beamertoc}{sections}{\beamer@parsetocsections#1[]}
\define@key{beamertoc}{firstsection}{\beamer@sectionadjust=-#1\relax\advance\beamer@sectionadjust by 1\relax}
+\define@key{beamertoc}{lastsection}{\beamer@toclastsection=#1}
\def\beamer@parsetocsections{\@ifnextchar<\beamer@@parsetocsections\beamer@@@parsetocsections}
\def\beamer@@parsetocsections#1[]{\def\beamer@tocsections{#1}}
\def\beamer@@@parsetocsections#1[]{\def\beamer@tocsections{<all:#1>}}
@@ -105,6 +106,10 @@
\def\beamer@hidetext{hide}
+% initialize count with something large
+\beamer@toclastsection=\maxdimen
+\multiply\beamer@toclastsection by 2
+
\def\sectionintoc{}
\def\beamer@sectionintoc#1#2#3#4#5{%
\ifnum\c@tocdepth>0%
@@ -116,8 +121,12 @@
\expandafter\only\beamer@tocsections{\gdef\beamer@todo{%
\beamer@tempcount=#5\relax%
\advance\beamer@tempcount by\beamer@sectionadjust%
- \ifnum\beamer@tempcount>0
- \edef\inserttocsectionnumber{\the\beamer@tempcount}%
+ \ifnum\beamer@tempcount>0
+ \ifnum\beamer@tempcount>\beamer@toclastsection
+ \def\inserttocsectionnumber{}%
+ \else
+ \edef\inserttocsectionnumber{\the\beamer@tempcount}%
+ \fi
\else
\def\inserttocsectionnumber{}%
\fi%
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeinfolines.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeinfolines.sty
index e7bae70936..be53727f33 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeinfolines.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemeinfolines.sty
@@ -30,9 +30,14 @@
\begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot}%
\usebeamerfont{title in head/foot}\insertshorttitle
\end{beamercolorbox}%
- \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,right]{date in head/foot}%
- \usebeamerfont{date in head/foot}\insertshortdate{}\hspace*{2em}
- \usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}\hspace*{2ex}
+ \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,leftskip=2ex,rightskip=2ex,sep=0pt]{date in head/foot}%
+ \hfill%
+ \usebeamerfont{date in head/foot}%
+ \insertshortdate{}%
+ \hfill%
+ \usebeamercolor[fg]{page number in head/foot}%
+ \usebeamerfont{page number in head/foot}%
+ \usebeamertemplate{page number in head/foot}%
\end{beamercolorbox}}%
\vskip0pt%
}