texlive[46234] Master/texmf-dist: beamer (6jan18)

[commits+karl at tug.org]

Revision: 46234
          http://tug.org/svn/texlive?view=revision&revision=46234
Author:   karl
Date:     2018-01-06 22:54:57 +0100 (Sat, 06 Jan 2018)
Log Message:
-----------
beamer (6jan18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
    trunk/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
    trunk/Master/texmf-dist/doc/latex/beamer/beamerug-macros.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/beamerbasecolor.sty
    trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty

Modified: trunk/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex	2018-01-06 21:54:29 UTC (rev 46233)
+++ trunk/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex	2018-01-06 21:54:57 UTC (rev 46234)
@@ -206,7 +206,7 @@
 
 \newcommand{\genericthemeexample}[2][]{%
   \smallskip\par\noindent
-  \pgfimage[width=.45\textwidth,page=1]{beamerug#2}\qquad\pgfimage[width=.45\textwidth,page=2]{beamerug#2}
+  \includegraphics[width=.45\textwidth,page=1]{beamerug#2}\qquad\includegraphics[width=.45\textwidth,page=2]{beamerug#2}
   \smallskip\par}
 \newenvironment{themeexample}[2][]
 {\begin{theme}{usetheme}{{#2}#1}{presentation theme}{Presentation themes}

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-06 21:54:29 UTC (rev 46233)
+++ trunk/Master/texmf-dist/doc/latex/beamer/beameruserguide.tex	2018-01-06 21:54:57 UTC (rev 46234)
@@ -12,7 +12,7 @@
 
 \documentclass{ltxdoc}
 
-\def\beamerugversion{3.47}
+\def\beamerugversion{3.48}
 \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-06 21:54:29 UTC (rev 46233)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamer.cls	2018-01-06 21:54:57 UTC (rev 46234)
@@ -11,7 +11,7 @@
 % See the file doc/licenses/LICENSE for more details.
 
 \ProvidesClass{beamer}
-  [2017/12/16 v3.47 A class for typesetting presentations]
+  [2017/12/24 v3.48 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-06 21:54:29 UTC (rev 46233)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty	2018-01-06 21:54:57 UTC (rev 46234)
@@ -11,7 +11,7 @@
 % See the file doc/licenses/LICENSE for more details.
 
 \ProvidesPackage{beamerarticle}
-  [2017/12/16 v3.47 beamer input in article mode]
+  [2017/12/24 v3.48 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/beamerbasecolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty	2018-01-06 21:54:29 UTC (rev 46233)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty	2018-01-06 21:54:57 UTC (rev 46234)
@@ -160,7 +160,7 @@
   \ifbeamercolorempty[bg]{#2}{\@tempswafalse}{\@tempswatrue}%
   \ifbeamer at colbox@ignorebg\@tempswafalse\fi%
   \def\beamer at colbox@color{#2}%
-  \setbox\beamer at tempbox=\vbox\bgroup%
+  \setbox\beamer at tempbox=\hbox\bgroup\color at begingroup
     \ifbeamer at colbox@ignorebg%
       \colorlet{beamer at temp@color}{bg}%
       \usebeamercolor[fg]{#2}%
@@ -168,6 +168,7 @@
     \else%
       \usebeamercolor[fg]{#2}%
     \fi%
+    \vbox\bgroup%
     \hsize=\beamer at colbox@wd%
     \@arrayparboxrestore%
     \leftskip=\beamer at colbox@ls%
@@ -178,14 +179,17 @@
       \advance\leftskip by\beamer at colbox@colsep%
       \advance\rightskip by\beamer at colbox@colsep%
       \vskip\beamer at colbox@colsep%
-    \fi\fi%
+    \fi%
+      \ifdim\beamer at colbox@colseps>\z@\vskip\beamer at colbox@colseps\fi%
+    \fi%
     \ifdim\beamer at colbox@sep>\z@\vskip\beamer at colbox@sep\fi%
     \beamer at vmode\ignorespaces}{%
     \ifdim\beamer at colbox@sep>\z@\vskip\beamer at colbox@sep\fi%
     \if at tempswa
       \ifdim\beamer at colbox@colsep>\z@\vskip\beamer at colbox@colsep\fi%
+      \ifdim\beamer at colbox@colseps>\z@\vskip\beamer at colbox@colseps\fi%
     \fi%
-  \egroup%
+  \egroup\color at endgroup\egroup%
   \ifx\beamer at colbox@ht\@empty\else\ht\beamer at tempbox=\beamer at colbox@ht\fi%
   \ifx\beamer at colbox@dp\@empty\else\dp\beamer at tempbox=\beamer at colbox@dp\fi%
   \ifbeamer at colbox@rounded%
@@ -209,7 +213,7 @@
       \if at tempswa%
         \ifdim\beamer at colbox@colseps>\z@%
           \advance\beamer at bg@wd\beamer at colbox@colseps\advance\beamer at bg@wd\beamer at colbox@colseps%
-          \advance\beamer at bg@ht\beamer at colbox@colseps\advance\beamer at bg@dp\beamer at colbox@colseps%
+%          \advance\beamer at bg@ht\beamer at colbox@colseps\advance\beamer at bg@dp\beamer at colbox@colseps%
           \hskip-\beamer at colbox@colseps\fi%
         \usebeamercolor{\beamer at colbox@color}%
         \rlap{\color at begingroup\color{bg}\vrule\@width\beamer at bg@wd\@height\beamer at bg@ht\@depth\beamer at bg@dp\color at endgroup}%

Modified: trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty	2018-01-06 21:54:29 UTC (rev 46233)
+++ trunk/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty	2018-01-06 21:54:57 UTC (rev 46234)
@@ -86,7 +86,9 @@
 \g at addto@macro\beamer at lastminutepatches{%
   \beamer at activecjk
   \makeatletter
-  \@input{\jobname.nav}
+  \begingroup
+    \@input{\jobname.nav}%
+  \endgroup
   \let\beamer at sectionentryorig=\sectionentry
   \let\beamer at slideentryorig=\slideentry
   \let\beamer at subsubsectionentryorig=\beamer at subsubsectionentry