Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / layouts / article-beamer.layout

diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index e718213f2cf91166dfd107f05dc134fe7ec65ae6..7026cf3e7eb57426cd98af09c7bbbdaa1d982f65 100644 (file)
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -3,16 +3,23 @@
 #  \DeclareCategory{Articles}
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 43
+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
-Provides color    0
-Provides xcolor   0
+
+DefaultFont
+       Family                Roman
+       Series                Medium
+       Shape                 Up
+       Size                  Normal
+       Color                 None
+EndFont
 
 Preamble
        \usepackage{beamerarticle,pgf}
@@ -24,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