beamer (28jan17)

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

4 files changed, 7 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/latex/beamer/beamer.cls b/Master/texmf-dist/tex/latex/beamer/beamer.cls
index 6f3801e84e9..4621408264e 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/01/22 v3.40 A class for typesetting presentations]
+  [2017/01/23 v3.41 A class for typesetting presentations]
 
 % Force e-TeX
 \RequirePackage{etoolbox}
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty b/Master/texmf-dist/tex/latex/beamer/beamerarticle.sty
index a17012b4fdd..8c519bb6ebe 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/01/22 v3.40 beamer input in article mode]
+  [2017/01/23 v3.41 beamer input in article mode]
 
 \RequirePackage{etoolbox}
 
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
index f2c6104ec20..f62ab535a52 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasecolor.sty
@@ -334,33 +334,6 @@
 }
 
 %
-% Address the lack of a proper galley structure in LaTeX2e for dealing
-% with colour on the MVL (cf. xgalley for a long-term solution)
-%
-\newcommand*\if@minipage@and@vmode@TF{%
-  \relax % In case we are in an alignment
-  \ifvmode
-    \if@minipage
-      \expandafter\expandafter\expandafter\@firstoftwo
-    \else
-      \expandafter\expandafter\expandafter\@secondoftwo
-    \fi
-  \else
-    \expandafter\@secondoftwo
-  \fi
-}
-\newcommand*\set@minipage@color{}
-\def\@setminipage{%
-  \@minipagetrue
-  \everypar{%
-    \@minipagefalse % Before the hook so \if@minipage is FALSE
-    \set@minipage@color
-    \gdef\set@minipage@color{}%
-    \everypar{}%
-  }%
-}
-
-%
 % Allow mixins to survive groups:
 %
 
@@ -373,17 +346,7 @@
 
 \def\set@color{%
   \edef\beamer@current@colorhook{\beamer@colorhook}%
-  \if@minipage@and@vmode@TF
-    {%
-      \begingroup
-        \let\reset@color\relax
-        \edef\@tempa{\beamerorig@set@color}% Force colour value to be saved
-      % Add the colour setting to the minipage hook
-      \expandafter\endgroup
-      \expandafter\g@addto@macro\expandafter\set@minipage@color
-        \expandafter{\@tempa}%
-    }
-    {\beamerorig@set@color}}
+  \beamerorig@set@color}
 \def\reset@color{%
   \beamer@lastskip=\lastskip%
   \edef\beamer@lastskiptexta{\the\lastskip}%
@@ -407,6 +370,8 @@
   \fi%
 }
 
+
+
 % compatibility:
 
 \AtBeginDocument{
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
index 031b2afd5c3..a73cd06444c 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty
@@ -459,8 +459,8 @@
 %
 
 \let\beamer@origitem=\item
-\def\beamer@callorigitem{\@ifnextchar[\beamer@@callorigitem{\beamer@origitem\if@minipage@and@vmode@TF{}{\kern0pt}\ignorespaces}}
-\def\beamer@@callorigitem[#1]{\beamer@origitem[{#1}]\if@minipage@and@vmode@TF{}{\kern0pt}\ignorespaces}
+\def\beamer@callorigitem{\@ifnextchar[\beamer@@callorigitem{\beamer@origitem\kern0pt\ignorespaces}}
+\def\beamer@@callorigitem[#1]{\beamer@origitem[{#1}]\kern0pt\ignorespaces}
 
 \def\item{%
   \@ifnextchar\relax\beamer@origitem{%