X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Farticle-beamer.layout;h=5d49a709d5a55664b032b7ec1c050a8520f13233;hb=f8f9eec358c5dcd45665defed13d51c0b304fb8e;hp=7f538b4bc1443f231e2dd5019630120902c5443f;hpb=874e86795379c4cfb0730822ed53be99e68982a1;p=lyx.git

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index 7f538b4bc1..5d49a709d5 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -1,16 +1,26 @@
 #% 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 31
+Format 68
 
 # Includes
+Input article.layout
 Input beamer.layout
 
 # override settings inherited from beamer.layout (Paul Rubin <rubin@msu.edu>)
 Provides geometry 0
 Provides hyperref 0
 
+DefaultFont
+	Family                Roman
+	Series                Medium
+	Shape                 Up
+	Size                  Normal
+	Color                 None
+EndFont
+
 Preamble
 	\usepackage{beamerarticle,pgf}
 	% this default might be overridden by plain title style
@@ -21,17 +31,3 @@ Preamble
 		\def\gobbletableofcontents#1{\origtableofcontents}
 	}
 EndPreamble
-
-# Frame control definition
-Style BeginFrame
-# This redefinition is needed to make beamerarticle work
-  Preamble
-    \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}}
-  EndPreamble
-End