summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex28
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex61
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.pdfbin1640227 -> 1597110 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.tex2
-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
12 files changed, 126 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex
index fda3f484106..00b7242d5ad 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex
+++ b/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex
@@ -416,6 +416,12 @@ The appearance of the headline and footline is determined by the following templ
\iteminsert{\inserttotalframenumber}
Inserts the total number of the frames (not slides) into a template. The number is only correct on the second run of \TeX\ on your document.
+ \iteminsert{\insertmainframenumber}
+ Inserts the number of the frames in the main part (before |\appendix| command) into a template. The number is only correct on the second run of \TeX\ on your document.
+
+ \iteminsert{\insertappendixframenumber}
+ Inserts the number of the frames in the appendix part (after |\appendix| command) into a template. The number is only correct on the second run of \TeX\ on your document.
+
\iteminsert{\insertframestartpage}
Inserts the page number of the first page of the current frame.
@@ -457,6 +463,8 @@ The appearance of the headline and footline is determined by the following templ
\iteminsert{\insertdocumentendpage}
Inserts the page number of the last page of the document (including the appendix).
+
+ \iteminsert{\usebeamertemplate*\{page number in head/foot\}} inserts a customisable template which e.g. inserts the current and total number of frames.
\end{itemize}
\end{element}
@@ -482,8 +490,26 @@ The appearance of the headline and footline is determined by the following templ
The same inserts as for headlines can be used.
- \begin{element}{page number in head/foot}\no\yes\yes
+ \begin{element}{page number in head/foot}\yes\yes\yes
These \beamer-color and -font are used to typeset the page number or frame number in the footline.
+
+ The \beamer-template provides a convenient way to format the page or frame number in the footline. It is used by the |infolines| outer theme and the |page number| and |frame number| footline themes.
+
+ \begin{templateoptions}
+ \itemoption{default}{} The default option is empty.
+
+ \itemoption{framenumber}{} This option inserts the current frame number.
+
+ \itemoption{totalframenumber}{} In addition to the current frame number, this option also shows the total number of frames.
+
+ \itemoption{appendixframenumber}{} This options replicates the behaviour of the |appendixnumberbeamer| package. In the main part before the |\appendix| command the current frame number and the total number of frames in the main part is displayed. In the appendix only the frame number within the appendix and the total number of frames in the appendix are shown.
+
+ \itemoption{pagenumber}{} Shows the current page number.
+
+ \itemoption{totalpagenumber}{} In addition to the current page number also the total page number is displayed.
+
+ \end{templateoptions}
+
\end{element}
\end{element}
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex
index 779bb24330a..2d9a31056f3 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex
+++ b/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex
@@ -299,6 +299,8 @@ Often, you may want a certain type of frame to be shown directly after a section
\beamer\ also provides |\sectionpage| and |\subsectionpage| commands, which are used to fill a frame with section or subsection number and title in a stylish way. They are very similar to |\partpage| command described below.
+\begin{command}{\sectionpage}
+ This command shows a frame with the section number and title of the current section.
\example
\begin{verbatim}
\section{A section}
@@ -308,6 +310,55 @@ Often, you may want a certain type of frame to be shown directly after a section
\frame{Some text.}
\end{verbatim}
+ \begin{element}{section page}\yes\no\no
+ This template is invoked when the |\sectionpage| command is used.
+
+ \begin{templateoptions}
+ \itemoption{default}{\oarg{alignment}}
+ The section page is typeset showing the current section number and, below, the current section title. The templates
+ \begin{element}{section name}\no\yes\yes
+ \end{element}
+ and
+ \begin{element}{section title}\no\yes\yes
+ \end{element}
+ are used, including the background color of |section title|. As for the |title page| template, the \meta{alignment} option is passed on the |beamercolorbox|.
+ \end{templateoptions}
+
+ The following commands are useful for this template:
+ \begin{templateinserts}
+ \iteminsert{\insertsection}
+ inserts the title of the current section.
+ \iteminsert{\insertsectionnumber}
+ inserts the current section number.
+ \end{templateinserts}
+ \end{element}
+\end{command}
+
+\begin{command}{\subsectionpage}
+ Works the same way as the |\sectionpage|.
+ \begin{element}{subsection page}\yes\no\no
+ \begin{templateoptions}
+ \itemoption{default}{\oarg{alignment}}
+
+ The templates
+ \begin{element}{subsection name}\no\yes\yes
+ \end{element}
+ and
+ \begin{element}{subsection title}\no\yes\yes
+ \end{element}
+ are used, including the background color of |subsection title|. As for the |title page| template, the \meta{alignment} option is passed on the |beamercolorbox|.
+ \end{templateoptions}
+
+ The following commands are useful for this template:
+ \begin{templateinserts}
+ \iteminsert{\insertsubsection}
+ inserts the title of the current subsection.
+ \iteminsert{\insertsubsectionnumber}
+ inserts the current subsection number.
+ \end{templateinserts}
+ \end{element}
+\end{command}
+
\subsection{Adding Parts}
If you give a long talk (like a lecture), you may wish to break up your talk into several parts. Each such part acts like a little ``talk of its own'' with its own table of contents, its own navigation bars, and so on. Inside one part, the sections and subsections of the other parts are not shown at all.
@@ -358,12 +409,18 @@ To create a new part, use the |\part| command. All sections and subsections foll
\example
|\frame{\partpage}|
- \begin{element}{part page}\yes\yes\yes
+ \begin{element}{part page}\yes\no\no
This template is invoked when the |\partpage| command is used.
\begin{templateoptions}
\itemoption{default}{\oarg{alignment}}
- The part page is typeset showing the current part number and, below, the current part title. The \beamer-color and -font |part page| are used, including the background color of |part page|. As for the |title page| template, the \meta{alignment} option is passed on the |beamercolorbox|.
+ The part page is typeset showing the current part number and, below, the current part title. The templates
+ \begin{element}{part name}\no\yes\yes
+ \end{element}
+ and
+ \begin{element}{part title}\no\yes\yes
+ \end{element}
+ are used, including the background color of |part title|. As for the |title page| template, the \meta{alignment} option is passed on the |beamercolorbox|.
\end{templateoptions}
The following commands are useful for this template:
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
index be2b5232684..5259800ce07 100644
--- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
index 6734b649d63..0689a38d926 100644
--- a/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
+++ b/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
@@ -12,7 +12,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.48}
+\def\beamerugversion{3.49}
\def\beamerugpgfversion{1.00}
\def\beamerugxcolorversion{2.00}
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%
}