Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / layouts / article-beamer.layout

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index 392b1e475fbc5a8760194eead73bec1857968913..31a4c7e3ea66c118d3d271cb26ba1771e5b03a8c 100644 (file)
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -1,8 +1,9 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{article (beamer)}
-# Author: Jürgen Spitzmüller <j.spitzmueller@gmx.de>
+#  \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (Standard Class)}
+#  \DeclareCategory{Articles}
+# Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 30
+Format 45
 
 # Includes
 Input beamer.layout
@@ -10,6 +11,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}
@@ -21,19 +24,3 @@ Preamble
                \def\gobbletableofcontents#1{\origtableofcontents}
        }
 EndPreamble
-
-# Frame control definition
-Style BeginFrame
-# This redefinition is needed to make beamerarticle work
-  Preamble
-    \makeatletter
-    \long\def\lyxframe#1{\@lyxframe#1\@lyxframestop}%
-    \def\@lyxframe{\@ifnextchar<{\@@lyxframe}{\@@lyxframe<*>}}%
-    \def\@@lyxframe<#1>{\@ifnextchar[{\@@@lyxframe<#1>}{\@@@lyxframe<#1>[]}}
-    \def\@@@lyxframe<#1>[{\@ifnextchar<{\@@@@@lyxframe<#1>[}{\@@@@lyxframe<#1>[<*>][}}
-    \def\@@@@@lyxframe<#1>[#2]{\@ifnextchar[{\@@@@lyxframe<#1>[#2]}{\@@@@lyxframe<#1>[#2][]}}
-    \long\def\@@@@lyxframe<#1>[#2][#3]#4\@lyxframestop#5\lyxframeend{%
-      \frame<#1>[#3]{\frametitle{#4}#5}}
-    \makeatother
-  EndPreamble
-End