summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-30 00:28:51 +0000
committerKarl Berry <karl@freefriends.org>2018-01-30 00:28:51 +0000
commite6129b052e9f923894c255aa312aa1a73c5cef3a (patch)
tree8432cfdecd00bd085044c2d60ed3da1c8dffc898 /Master/texmf-dist/tex/latex/beamer
parent72ab3cc654a8685d0994636572a5e7dd133c3c1d (diff)
beamer (28jan18)
git-svn-id: svn://tug.org/texlive/trunk@46481 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamer.cls2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerarticle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty27
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty1
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty8
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty4
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty4
8 files changed, 39 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index 6ffc15711ab..3ff46d2613b 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamer.cls
+++ b/Master/texmf-dist/tex/latex/beamer/beamer.cls
@@ -11,7 +11,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2017/12/24 v3.48 A class for typesetting presentations]
+ [2018/01/27 v3.49 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 ecc6c80118a..2bc1b867b0a 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
@@ -11,7 +11,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2017/12/24 v3.48 beamer input in article mode]
+ [2018/01/27 v3.49 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/beamerbaseauxtemplates.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
index f926afcf39d..dab26bf59cf 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
@@ -552,6 +552,25 @@
\defbeamertemplate{headline}{text line}[1]
{\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}{default}{}
+
+\defbeamertemplate{page number in head/foot}{framenumber}{\insertframenumber}
+
+\defbeamertemplate{page number in head/foot}{totalframenumber}{\insertframenumber\,/\,\inserttotalframenumber}
+
+\defbeamertemplate{page number in head/foot}{appendixframenumber}{%
+ \ifbeamer@inappendix%
+ \insertframenumberinappendix\,/\,\insertappendixframenumber%
+ \else%
+ \insertframenumber\,/\,\insertmainframenumber%
+ \fi%
+}
+
+\defbeamertemplate{page number in head/foot}{pagenumber}{\insertpagenumber}
+
+\defbeamertemplate{page number in head/foot}{totalpagenumber}{\insertpagenumber\,/\,\insertpresentationendpage}
+
% Footline
@@ -563,7 +582,8 @@
\hfill%
\usebeamercolor[fg]{page number in head/foot}%
\usebeamerfont{page number in head/foot}%
- \insertpagenumber\,/\,\insertpresentationendpage\kern1em\vskip2pt%
+ \setbeamertemplate{page number in head/foot}[totalpagenumber]%
+ \usebeamertemplate*{page number in head/foot}\kern1em\vskip2pt%
}
\defbeamertemplate{footline}{frame number}
@@ -571,12 +591,11 @@
\hfill%
\usebeamercolor[fg]{page number in head/foot}%
\usebeamerfont{page number in head/foot}%
- \insertframenumber\,/\,\inserttotalframenumber\kern1em\vskip2pt%
+ \setbeamertemplate{page number in head/foot}[totalframenumber]%
+ \usebeamertemplate*{page number in head/foot}\kern1em\vskip2pt%
}
-
-
% Mini frames
\defbeamertemplate{mini frame}{box}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
index beebc74d5eb..4a3f298ff75 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
@@ -182,9 +182,6 @@
\def\beamer@enumtempl{enumerate mini template}%
\expandafter\let\csname the\@enumctr\endcsname\@enThe
\csname c@\@enumctr\endcsname7
- \expandafter\settowidth
- \csname leftmargin\romannumeral\@enumdepth\endcsname
- {\the\@enLab\hspace{\labelsep}}%
\beamer@enum@}
\def\beamer@enum@{%
\beamer@computepref\@itemdepth% sets \beameritemnestingprefix
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
index b3fd62ae532..da3584cba0e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
@@ -41,6 +41,7 @@
\def\beamer@endpageofdocument{1}
\def\beamer@startpageofappendix{}
\def\inserttotalframenumber{1}
+\def\insertmainframenumber{\inserttotalframenumber}
\newrobustcmd*\partentry[2]{\beamer@sectioncount=0\relax}
\def\beamer@initsectionentry#1#2#3#4#5{\advance\beamer@sectioncount by1\relax
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
index c6a4d38b839..7c5d8cd356f 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
@@ -368,13 +368,21 @@
% Appendix stuff
%
+\newif\ifbeamer@inappendix
+
\newcommand<>\beamer@appendix{}
\newcommand<>\appendix{%
+ \beamer@inappendixtrue%
\only#1{\part{\appendixname}%
+ \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}}}%
\global\let\appendix\beamer@appendix}%
}
+\def\insertappendixframenumber{\the\numexpr\inserttotalframenumber-\insertmainframenumber\relax}
+\def\insertframenumberinappendix{\ifbeamer@inappendix\the\numexpr\insertframenumber-\insertmainframenumber\relax\else0\fi}
+
\mode
<article>
{
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
index e2d579f2e8e..487ce2a04f9 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
@@ -90,7 +90,7 @@
\centering
{\usebeamerfont{section name}\usebeamercolor[fg]{section name}\sectionname~\insertsectionnumber}
\vskip1em\par
- \begin{beamercolorbox}[sep=12pt,center,#1]{part title}
+ \begin{beamercolorbox}[sep=12pt,center,#1]{section title}
\usebeamerfont{section title}\insertsection\par
\end{beamercolorbox}
\endgroup
@@ -104,7 +104,7 @@
\centering
{\usebeamerfont{subsection name}\usebeamercolor[fg]{subsection name}\subsectionname~\insertsubsectionnumber}
\vskip1em\par
- \begin{beamercolorbox}[sep=8pt,center,#1]{part title}
+ \begin{beamercolorbox}[sep=8pt,center,#1]{subsection title}
\usebeamerfont{subsection title}\insertsubsection\par
\end{beamercolorbox}
\endgroup
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty
index 60e70bda9e5..01f67aecaea 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty
@@ -18,6 +18,8 @@
\setbeamercolor*{section in head/foot}{parent=palette tertiary}
\setbeamercolor*{subsection in head/foot}{parent=palette primary}
+\setbeamertemplate{page number in head/foot}[totalframenumber]%
+
\defbeamertemplate*{footline}{infolines theme}
{%
\leavevmode%
@@ -30,7 +32,7 @@
\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}
- \insertframenumber{} / \inserttotalframenumber\hspace*{2ex}
+ \usebeamertemplate*{page number in head/foot}\hspace*{2ex}
\end{beamercolorbox}}%
\vskip0pt%
}