Honor trailing spaces in LabelString and friends

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

diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
index 3e35b87062de9e8544be16bb7fee22fc6572de92..60dfa35ba854cb0eebe72a5c1225fc082c6a3a4b 100644 (file)
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -3,16 +3,23 @@
 #  \DeclareCategory{Articles}
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 45
+Format 64
 
 # Includes
+Input scrartcl.layout
 Input beamer.layout
 
 # override settings inherited from beamer.layout
 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 +31,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