beamer (28jan18)

git-svn-id: svn://tug.org/texlive/trunk@46481 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 87 insertions, 4 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
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}