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

diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
index 863227fbd7..6dc3c02d95 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -3,16 +3,24 @@
 #  \DeclareCategory{Articles}
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 44
+Format 99
 
 # Includes
+Input scrartcl.layout
 Input beamer.layout
 
 # override settings inherited from beamer.layout
+Provides amsmath  0
 Provides geometry 0
 Provides hyperref 0
-Provides color    0
-Provides xcolor   0
+
+DefaultFont
+	Family                Roman
+	Series                Medium
+	Shape                 Up
+	Size                  Normal
+	Color                 None
+EndFont
 
 Preamble
 	\usepackage{beamerarticle,pgf}
@@ -24,35 +32,3 @@ Preamble
 		\def\gobbletableofcontents#1{\origtableofcontents}
 	}
 EndPreamble
-
-##########################################
-# OBSOLETE STUFF
-# Everything below should be removed
-# (but this is a file format change)
-#
-#  TODO:
-#   * conversion of old frame
-#     and plain frame to new layout
-##########################################
-
-#
-# Backwards compatible definitions
-#
-
-AddToPreamble
-\providecommand\lyxframeend{}
-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