X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrarticle-beamer.layout;h=6dc3c02d95355a7c8637ce2c0c86eb8bf57ec3b0;hb=051c5f27284f00c20e95c5732bcfb04632c7cb18;hp=bcc82362cd0537d68a7e45b84fad8bdd926c9a06;hpb=004901eef65be4301b9fb2cd8d159b4005a740d7;p=lyx.git

diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
index bcc82362cd..6dc3c02d95 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -1,12 +1,27 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{article (koma + beamer)}
-# Author : Jürgen Spitzmüller <j.spitzmueller@gmx.de>
+#  \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (KOMA-Script)}
+#  \DeclareCategory{Articles}
+# Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 27
+Format 99
 
 # Includes
+Input scrartcl.layout
 Input beamer.layout
 
+# override settings inherited from beamer.layout
+Provides amsmath  0
+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
@@ -17,19 +32,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