Beamer provides [x]color (#8103)

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index c879a4992eb6f09cc23deb6d9694c54f8d952e18..34bb9e87be26181a8ccf376336ea4993ea129e78 100644 (file)
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -10,6 +10,8 @@ Input beamer.layout
 # override settings inherited from beamer.layout (Paul Rubin <rubin@msu.edu>)
 Provides geometry 0
 Provides hyperref 0
+Provides color    0
+Provides xcolor   0
 
 Preamble
        \usepackage{beamerarticle,pgf}

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index fdd7e70b881da7ea51f7f558542ac634596b8203..28c52849904a7ab9502135518b2963bd6ff91a22 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -18,6 +18,8 @@ TocDepth           2
 DefaultStyle       Standard
 Provides hyperref  1
 Provides geometry  1
+Provides color     1
+Provides xcolor    1
 
 DefaultFont
   Family           Sans

diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
index e8463a0dbdb3fe006a042e5201dde12ba4cd3485..5386ed51337ece5ec2a1370fac190f662c345fa3 100644 (file)
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -10,6 +10,8 @@ Input beamer.layout
 # override settings inherited from beamer.layout
 Provides geometry 0
 Provides hyperref 0
+Provides color    0
+Provides xcolor   0
 
 Preamble
        \usepackage{beamerarticle,pgf}

diff --git a/status.20x b/status.20x
index 42cf0d6b02fa9d5974c76cbfce0f651a2fbdf820..51b2a26ec4c1305ba0f63e8f70659e945fe4defa 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -147,6 +147,9 @@ What's new
 - Fix failure of lyxknitr.R to move files when /tmp was on a different
   file system (e.g. an encrypted home partition).
 
+- Do not load the color or xcolor package with the beamer class, since
+  beamer already loads it itself (bug 8103).
+
 - Do not suppress the loading of geometry and hyperref if the class
   "article (koma + beamer)".