texlive[46481] Master/texmf-dist: beamer (28jan18)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 30 01:28:51 CET 2018
Revision: 46481
http://tug.org/svn/texlive?view=revision&revision=46481
Author: karl
Date: 2018-01-30 01:28:51 +0100 (Tue, 30 Jan 2018)
Log Message:
-----------
beamer (28jan18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex
trunk/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex
trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls
trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
trunk/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty
Modified: trunk/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/doc/latex/beamer/beamerug-frames.tex 2018-01-30 00:28:51 UTC (rev 46481)
@@ -416,6 +416,12 @@
\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 @@
\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 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}
Modified: trunk/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/doc/latex/beamer/beamerug-globalstructure.tex 2018-01-30 00:28:51 UTC (rev 46481)
@@ -299,6 +299,8 @@
\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 @@
\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 @@
\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:
Modified: trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex 2018-01-30 00:28:51 UTC (rev 46481)
@@ -12,7 +12,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.48}
+\def\beamerugversion{3.49}
\def\beamerugpgfversion{1.00}
\def\beamerugxcolorversion{2.00}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls 2018-01-30 00:28:51 UTC (rev 46481)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaseauxtemplates.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -552,7 +552,26 @@
\defbeamertemplate{headline}{text line}[1]
{\hskip\Gm at lmargin\hbox to\@tempdima{\textwidth=\@tempdima\hsize=\textwidth\relax#1\hfil}\hskip\Gm at 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 at 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
\defbeamertemplate{footline}{text line}[1]
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -182,9 +182,6 @@
\def\beamer at 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 at enum@}
\def\beamer at enum@{%
\beamer at computepref\@itemdepth% sets \beameritemnestingprefix
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -41,6 +41,7 @@
\def\beamer at endpageofdocument{1}
\def\beamer at startpageofappendix{}
\def\inserttotalframenumber{1}
+\def\insertmainframenumber{\inserttotalframenumber}
\newrobustcmd*\partentry[2]{\beamer at sectioncount=0\relax}
\def\beamer at initsectionentry#1#2#3#4#5{\advance\beamer at sectioncount by1\relax
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -368,13 +368,21 @@
% Appendix stuff
%
+\newif\ifbeamer at inappendix
+
\newcommand<>\beamer at appendix{}
\newcommand<>\appendix{%
+ \beamer at inappendixtrue%
\only#1{\part{\appendixname}%
+ \immediate\write\@auxout{\string\@writefile{nav}%
+ {\noexpand\headcommand{\noexpand\gdef\noexpand\insertmainframenumber{\the\c at framenumber}}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer at appendixpages{\the\c at page}}}%
\global\let\appendix\beamer at appendix}%
}
+\def\insertappendixframenumber{\the\numexpr\inserttotalframenumber-\insertmainframenumber\relax}
+\def\insertframenumberinappendix{\ifbeamer at inappendix\the\numexpr\insertframenumber-\insertmainframenumber\relax\else0\fi}
+
\mode
<article>
{
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerinnerthemedefault.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty 2018-01-30 00:25:16 UTC (rev 46480)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerouterthemeinfolines.sty 2018-01-30 00:28:51 UTC (rev 46481)
@@ -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%
}
More information about the tex-live-commits
mailing list