summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdfbin148565 -> 148612 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdfbin352399 -> 352661 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex2
-rw-r--r--Master/texmf-dist/doc/latex/beamer/beameruserguide.pdfbin1659970 -> 1640227 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/beamerbasecolor.sty12
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty4
9 files changed, 15 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
index f6e60a029b1..78adcd84a2c 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
index c1ebcbbf692..ad584f6adae 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/beamerexample-lecture-beamer-version.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex b/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex
index 1aeba93606f..41459343852 100644
--- a/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex
+++ b/Master/texmf-dist/doc/latex/beamer/beamerug-macros.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/beameruserguide.pdf
index d102a2acad3..be2b5232684 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 c350d8207b9..6734b649d63 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.47}
+\def\beamerugversion{3.48}
\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 5e4526108cd..6ffc15711ab 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/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
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
index 67bae85226c..ecc6c80118a 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/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
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
index 3cb05eda2fc..dd0259b0501 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -160,7 +160,7 @@
\ifbeamercolorempty[bg]{#2}{\@tempswafalse}{\@tempswatrue}%
\ifbeamer@colbox@ignorebg\@tempswafalse\fi%
\def\beamer@colbox@color{#2}%
- \setbox\beamer@tempbox=\vbox\bgroup%
+ \setbox\beamer@tempbox=\hbox\bgroup\color@begingroup
\ifbeamer@colbox@ignorebg%
\colorlet{beamer@temp@color}{bg}%
\usebeamercolor[fg]{#2}%
@@ -168,6 +168,7 @@
\else%
\usebeamercolor[fg]{#2}%
\fi%
+ \vbox\bgroup%
\hsize=\beamer@colbox@wd%
\@arrayparboxrestore%
\leftskip=\beamer@colbox@ls%
@@ -178,14 +179,17 @@
\advance\leftskip by\beamer@colbox@colsep%
\advance\rightskip by\beamer@colbox@colsep%
\vskip\beamer@colbox@colsep%
- \fi\fi%
+ \fi%
+ \ifdim\beamer@colbox@colseps>\z@\vskip\beamer@colbox@colseps\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%
+ \ifdim\beamer@colbox@colseps>\z@\vskip\beamer@colbox@colseps\fi%
\fi%
- \egroup%
+ \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%
@@ -209,7 +213,7 @@
\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%
+% \advance\beamer@bg@ht\beamer@colbox@colseps\advance\beamer@bg@dp\beamer@colbox@colseps%
\hskip-\beamer@colbox@colseps\fi%
\usebeamercolor{\beamer@colbox@color}%
\rlap{\color@begingroup\color{bg}\vrule\@width\beamer@bg@wd\@height\beamer@bg@ht\@depth\beamer@bg@dp\color@endgroup}%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
index 557d5a05d06..b3fd62ae532 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty
@@ -86,7 +86,9 @@
\g@addto@macro\beamer@lastminutepatches{%
\beamer@activecjk
\makeatletter
- \@input{\jobname.nav}
+ \begingroup
+ \@input{\jobname.nav}%
+ \endgroup
\let\beamer@sectionentryorig=\sectionentry
\let\beamer@slideentryorig=\slideentry
\let\beamer@subsubsectionentryorig=\beamer@subsubsectionentry