X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Farticle-beamer.layout;h=31a4c7e3ea66c118d3d271cb26ba1771e5b03a8c;hb=6baa65119b22e88186ecc5291445e1f2f595d906;hp=a65009b82d2800c504115eb2a7707d42362fe91c;hpb=0b95498ef437c1347dbde293d893e83c418c377d;p=lyx.git

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index a65009b82d..31a4c7e3ea 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -1,12 +1,19 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[article]{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 10
+Format 45
 
 # Includes
 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}
 	% this default might be overridden by plain title style
@@ -17,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