beamer (27aug17)

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

6 files changed, 92 insertions, 84 deletions

diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index e9b4e209fe5..b2de6ccb861 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/07/13 v3.42 A class for typesetting presentations]
+  [2017/08/22 v3.43 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 6be1d56e82c..1520cbbc07a 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/07/13 v3.42 beamer input in article mode]
+  [2017/08/22 v3.43 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/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
index 33fc7276499..20dfc14181e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -107,8 +107,13 @@
   \fi%
 }
 
-\colorlet{fg}{black}
-\colorlet{bg}{white}
+
+\mode
+<all>
+{
+  \colorlet{fg}{black}
+  \colorlet{bg}{white}
+}
 
 
 \mode
@@ -143,89 +148,75 @@
 
 \newif\ifbeamer@colbox@rounded
 \newif\ifbeamer@colbox@ignorebg
+\newdimen\beamer@bg@ht \newdimen\beamer@bg@wd \newdimen\beamer@bg@dp
 
 \newenvironment{beamercolorbox}[2][]{%
-  \begingroup%
-    \def\beamer@colbox@coladd{0pt}%
-    \def\beamer@vmode{\leavevmode}%
-    \setkeys{beamercolbox}{%
-      wd=\textwidth,ht={},dp={},%
-      leftskip=0pt,rightskip=0pt plus1fil,%
-      sep=0pt,colsep=0pt,colsep*=0pt,%
-      shadow=false,rounded=false,ignorebg=false}%
-    \setkeys{beamercolbox}{#1}%
-    \ifbeamercolorempty[bg]{#2}{\@tempswafalse}{\@tempswatrue}%
-    \ifbeamer@colbox@ignorebg\@tempswafalse\fi%
-    \def\beamer@colbox@color{#2}%
+  \def\beamer@vmode{\leavevmode}%
+  \setkeys{beamercolbox}{wd=\textwidth,ht={},dp={},%
+    leftskip=0pt,rightskip=0pt plus1fil,%
+    sep=0pt,colsep=0pt,colsep*=0pt,%
+    shadow=false,rounded=false,ignorebg=false}%
+  \setkeys{beamercolbox}{#1}%
+  \ifbeamercolorempty[bg]{#2}{\@tempswafalse}{\@tempswatrue}%
+  \ifbeamer@colbox@ignorebg\@tempswafalse\fi%
+  \def\beamer@colbox@color{#2}%
+  \ifbeamer@colbox@ignorebg%
+    \colorlet{beamer@temp@color}{bg}%
+    \usebeamercolor{#2}%
+    \colorlet{bg}{beamer@temp@color}%
+  \else%
+    \usebeamercolor{#2}%
+  \fi%
+  \setbox\beamer@tempbox=\hbox\bgroup\color@begingroup\color{fg}\vbox\bgroup%
     \hsize=\beamer@colbox@wd%
-    \setbox\beamer@tempbox=\hbox\bgroup\vbox\bgroup%
-      \leftskip=\beamer@colbox@ls%
-      \advance\leftskip by\beamer@colbox@sep%
-      \rightskip=\beamer@colbox@rs%
-      \advance\rightskip by\beamer@colbox@sep%
-      \ifbeamer@colbox@ignorebg%
-        \colorlet{beamer@temp@color}{bg}%
-        \usebeamercolor[fg]{#2}%
-        \colorlet{bg}{beamer@temp@color}%
-      \else%
-        \usebeamercolor[fg]{#2}%
-      \fi%
-      \if@tempswa%
-        \advance\leftskip by\beamer@colbox@colsep%
-        \advance\rightskip by\beamer@colbox@colsep%
-        \ifdim\beamer@colbox@colsep=0pt\else\vskip\beamer@colbox@colsep\fi%
-        \ifdim\beamer@colbox@colseps=0pt\else\vskip\beamer@colbox@colseps\fi%
-      \fi%
-      \ifdim\beamer@colbox@sep=0pt\else\vskip\beamer@colbox@sep\fi%
-      \beamer@vmode\ignorespaces}{%
-      \ifdim\beamer@colbox@sep=0pt\else\vskip\beamer@colbox@sep\fi%
-      \if@tempswa\ifdim\beamer@colbox@colsep=0pt\else\vskip\beamer@colbox@colsep\fi\fi%
-      \if@tempswa\ifdim\beamer@colbox@colseps=0pt\else\vskip\beamer@colbox@colseps\fi\fi%
-    \egroup\egroup%
-    \wd\beamer@tempbox=\hsize%
-    \@tempdima=\wd\beamer@tempbox%
-    \ifx\beamer@colbox@ht\@empty%
-    \else%
-      \ht\beamer@tempbox=\beamer@colbox@ht%
-    \fi%
-    \ifx\beamer@colbox@dp\@empty%
-    \else%
-      \dp\beamer@tempbox=\beamer@colbox@dp%
-    \fi%
-    \ifbeamer@colbox@rounded%
-      \if@tempswa%
-        \begin{beamerboxesrounded}[%
-          shadow=\beamer@colbox@shadow,%
-          lower=\beamer@colbox@color,%
-          upper=normal text,%
-          width=\beamer@colbox@wd]{}%
-          \box\beamer@tempbox%
-        \end{beamerboxesrounded}%
-      \else%
-        \ifdim\@tempdima>\textwidth%
-          \setbox\beamer@tempbox=\hbox to\textwidth{\hss\box\beamer@tempbox\hss}%
-        \fi%
+    \@arrayparboxrestore%
+    \leftskip=\beamer@colbox@ls%
+    \ifdim\beamer@colbox@sep>\z@\advance\leftskip\beamer@colbox@sep\fi%
+    \rightskip=\beamer@colbox@rs%
+    \ifdim\beamer@colbox@sep>\z@\advance\rightskip\beamer@colbox@sep\fi%
+    \if@tempswa\ifdim\beamer@colbox@colsep>\z@%
+      \advance\leftskip by\beamer@colbox@colsep%
+      \advance\rightskip by\beamer@colbox@colsep%
+      \vskip\beamer@colbox@colsep%
+    \fi\fi%
+    \ifdim\beamer@colbox@sep>\z@\vskip\beamer@colbox@sep\fi%
+    \beamer@vmode\ignorespaces}{%
+    \ifdim\beamer@colbox@sep>\z@\vskip\beamer@colbox@sep\fi%
+    \if@tempswa\ifdim\beamer@colbox@colsep>\z@\vskip\beamer@colbox@colsep\fi\fi%
+  \egroup\color@endgroup\egroup%
+  \ifx\beamer@colbox@ht\@empty\else\ht\beamer@tempbox=\beamer@colbox@ht\fi%
+  \ifx\beamer@colbox@dp\@empty\else\dp\beamer@tempbox=\beamer@colbox@dp\fi%
+  \ifbeamer@colbox@rounded%
+    \if@tempswa%
+      \begin{beamerboxesrounded}[%
+        shadow=\beamer@colbox@shadow,%
+        lower=\beamer@colbox@color,%
+        upper=normal text,%
+        width=\beamer@colbox@wd]{}%
         \box\beamer@tempbox%
-      \fi%
+      \end{beamerboxesrounded}%
     \else%
-      \if@tempswa\setbox\beamer@tempbox=\hbox{\vbox{%
-        \usebeamercolor{\beamer@colbox@color}%
-        \advance\hsize by \beamer@colbox@colseps\relax%
-        \advance\hsize by \beamer@colbox@colseps\relax%
-        \hskip-\beamer@colbox@colseps%
-        \fboxsep=0pt\colorbox{bg}{%
-          \hskip\beamer@colbox@colseps%
-          \hbox{\box\beamer@tempbox}%
-          \hskip\beamer@colbox@colseps%
-        }%
-        \hskip-\beamer@colbox@colseps%
-      }}\fi%
-      \ifdim\@tempdima>\textwidth%
-        \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@rightmargin\relax}%
+      \ifdim\wd\beamer@tempbox>\textwidth%
+        \setbox\beamer@tempbox=\hbox to\textwidth{\hss\box\beamer@tempbox\hss}%
       \fi%
       \box\beamer@tempbox%
     \fi%
-  \endgroup%
+  \else%
+    \beamer@bg@ht=\ht\beamer@tempbox\relax\beamer@bg@dp=\dp\beamer@tempbox\relax\beamer@bg@wd=\wd\beamer@tempbox\relax%
+    \setbox\beamer@tempbox=\hbox{%
+      \if@tempswa%
+        \ifdim\beamer@colbox@colseps>\z@%
+          \advance\beamer@bg@wd\beamer@colbox@colseps\advance\beamer@bg@wd\beamer@colbox@colseps%
+          \advance\beamer@bg@ht\beamer@colbox@colseps\advance\beamer@bg@dp\beamer@colbox@colseps%
+          \hskip-\beamer@colbox@colseps\fi%
+        \rlap{\color@begingroup\color{bg}\vrule\@width\beamer@bg@wd\@height\beamer@bg@ht\@depth\beamer@bg@dp\color@endgroup}%
+        \ifdim\beamer@colbox@colseps>\z@\hskip\beamer@colbox@colseps\fi%
+      \fi\box\beamer@tempbox}%
+    \ifdim\wd\beamer@tempbox>\textwidth%
+      \setbox\beamer@tempbox=\hbox to\textwidth{\hskip0pt minus\beamer@leftmargin\relax\box\beamer@tempbox\hskip0pt minus\beamer@leftmargin\relax}%
+    \fi%
+    \box\beamer@tempbox%
+  \fi%
 }
 
 \mode
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
index bdd8a3aa894..55473278274 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasefont.sty
@@ -76,8 +76,8 @@
 %
 \def\EC@family#1#2#3#4#5{%
   \DeclareFontShape{#1}{#2}{#3}{#4}%
-  {<3><4><5><6><7><8><9><10><10.95><12><14.4>%
-   <17.28><20.74><24.88><29.86><35.83><42.99><51.59>genb*#5}{}}
+  {<3><4>#50500<5><6><7><8><9><10><10.95><12><14.4>%
+   <17.28><20.74><24.88><29.86><35.83>genb*#5<42.99><51.59>#53583}{}}
 \EC@family{T1}{cmr}{m}{n}{ecrm}
 \EC@family{T1}{cmr}{m}{sl}{ecsl}
 \EC@family{T1}{cmr}{m}{it}{ecti}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
index 04e25e5c33a..e58c7460cff 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframecomponents.sty
@@ -359,7 +359,24 @@
 \mode
 <article>
 {
-  \renewcommand<>{\footnote}{\beameroriginal{\footnote}}%
+  \define@key{beamerfootnote}{frame}[true]{}
+
+\let\beamer@origfootnote=\footnote
+  \renewcommand<>\footnote[1][]{%
+    \let\beamer@kvorig=\KV@errx%
+    \let\beamer@xkvorig=\XKV@err
+    \def\beamer@footarg{}%
+    \def\KV@errx##1{\edef\beamer@footarg{\@tempa}}%
+    \def\XKV@err##1{\edef\beamer@footarg{\XKV@tkey}}%
+    \setkeys{beamerfootnote}{#1}%
+    \let\KV@errx=\beamer@kvorig%
+    \let\XKV@errx=\beamer@xkvorig
+    \ifx\beamer@footarg\@empty%
+      \edef\beamer@next{\noexpand\beamer@origfootnote}%
+    \else%
+      \edef\beamer@next{\noexpand\beamer@origfootnote[\beamer@footarg]}%
+    \fi%
+    \beamer@next}
 }
 
 
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
index 01ceaf4bff1..4d97376915f 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty
@@ -203,7 +203,7 @@
     \def\insertsubsubsection{}%
     % Deal with a defective patch in metropolis theme
     \def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}%
-    \protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}%
+    \edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}%
     \def\insertsubsectionhead{}%
     \def\insertsubsubsectionhead{}%
     \def\lastsubsection{}%
@@ -280,7 +280,7 @@
     \def\insertsubsubsection{}%
     % Deal with a faulty patch in metropolis theme
     \def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}%
-    \protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}%
+    \edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}%
     \def\insertsubsubsectionhead{}%
     \Hy@writebookmark{\the\c@subsection}{#2}{Outline\the\c@part.\the\c@section.\the\c@subsection.\the\c@page}{3}{toc}%
     \hyper@anchorstart{Outline\the\c@part.\the\c@section.\the\c@subsection.\the\c@page}\hyper@anchorend%