X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Farticle-beamer.layout;h=7026cf3e7eb57426cd98af09c7bbbdaa1d982f65;hb=bab184e49e4420ad5277eacd45f2447727f55bbd;hp=d1d78568a1ce469a3d1147dd36deadc8a464badc;hpb=de815f594ee4f9fbfd86cb94dd039bbcc6fbdf7c;p=lyx.git

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index d1d78568a1..7026cf3e7e 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 28
+Format 80
 
 # 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,19 +31,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