X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fscrarticle-beamer.layout;h=414fa59fbf0f570ed55307d5a2c267e19779ea8b;hb=d8a6e0ab70962134792c5eca585fdcd013204649;hp=b705f28d34a2dd141ef77ed93935ae6a1afd5ef2;hpb=de815f594ee4f9fbfd86cb94dd039bbcc6fbdf7c;p=lyx.git

diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
index b705f28d34..414fa59fbf 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -1,12 +1,19 @@
 #% 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 28
+Format 43
 
 # Includes
 Input beamer.layout
 
+# override settings inherited from beamer.layout
+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
@@ -18,11 +25,28 @@ Preamble
 	}
 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
-    \makeatletter
     \long\def\lyxframe#1{\@lyxframe#1\@lyxframestop}%
     \def\@lyxframe{\@ifnextchar<{\@@lyxframe}{\@@lyxframe<*>}}%
     \def\@@lyxframe<#1>{\@ifnextchar[{\@@@lyxframe<#1>}{\@@@lyxframe<#1>[]}}
@@ -30,6 +54,5 @@ Style BeginFrame
     \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