Update tex2lyx test files

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index a4f0eac816d48d6e9cdeedb58a889e116313aa94..3ac4aae311ad48c4087ff288370c881c3a663a6c 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1,11 +1,12 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[beamer,amssymb.sty,hyperref.sty,pgf.sty,xcolor.sty,xxcolor.sty]{presentation (beamer)}
+#  \DeclareLaTeXClass[beamer,amssymb.sty,hyperref.sty,pgf.sty,xcolor.sty,xxcolor.sty]{Beamer}
+#  \DeclareCategory{Presentations}
 # Author : Till Tantau <tantau@users.sourceforge.net>
 
 # $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $
 
 # Includes
-Format 28
+Format 40
 Input stdcounters.inc
 Input stdinsets.inc
 
@@ -18,6 +19,8 @@ TocDepth           2
 DefaultStyle       Standard
 Provides hyperref  1
 Provides geometry  1
+Provides color     1
+Provides xcolor    1
 
 DefaultFont
   Family           Sans
@@ -58,7 +61,6 @@ Style Itemize
   ParSep           0.3
   Align            Left
   LabelType        Itemize
-  LabelString      "*"
 End
 
 # Enumerate style definition
@@ -98,9 +100,6 @@ Style Description
   ParSep           0.3
   Align            Left
   LabelType        Manual
-  LabelString      "MM"
-
-  # label font definition
   LabelFont 
     Series        Bold
   EndFont
@@ -226,6 +225,50 @@ Style Subsection*
   OptionalArgs     0
 End
 
+# Subsubsection style definition
+Style Subsubsection
+  Category         Section
+  Margin           First_Dynamic
+  LatexType        Command
+  LatexName        lyxframeend{}\subsubsection
+  NeedProtect      1
+  NextNoIndent     1
+  LabelSep         xx
+  ParSkip          0.4
+  TopSep           2
+  BottomSep        0.25
+  ParSep           0.5
+  Align            Left
+  LabelType        Counter
+  LabelCounter     subsubsection
+  LabelString      "Subsubsection \arabic{section}.\arabic{subsection}.\arabic{subsubsection}"
+       RefPrefix        sub
+  OptionalArgs     1
+
+  # standard font definition
+  Font 
+    Family         Roman
+    Series         Bold
+    Size           large
+  EndFont
+
+  LabelFont 
+    Color          latex
+  EndFont
+  LabelStringAppendix "\arabic{section}.\arabic{subsection}.\arabic{subsubsection}"
+  TocLevel 2
+End
+
+# Subsubsection* style definition
+Style Subsubsection*
+  CopyStyle        Subsubsection
+  Category         Unnumbered
+  Margin           Static
+  LatexName        lyxframeend{}\subsubsection*
+  LabelType        No_Label
+  OptionalArgs     0
+End
+
 # Frame control definition
 Style BeginFrame
   Category         Frames
@@ -259,7 +302,6 @@ Style BeginFrame
   EndFont
 
   Preamble
-    \makeatletter
     \long\def\lyxframe#1{\@lyxframe#1\@lyxframestop}%
     \def\@lyxframe{\@ifnextchar<{\@@lyxframe}{\@@lyxframe<*>}}%
     \def\@@lyxframe<#1>{\@ifnextchar[{\@@@lyxframe<#1>}{\@@@lyxframe<#1>[]}}
@@ -267,7 +309,6 @@ 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>[#2][#3]{\frametitle{#4}#5}}
-    \makeatother
   EndPreamble
 End
 
@@ -302,12 +343,10 @@ Style BeginPlainFrame
   EndFont
 
   Preamble
-    \makeatletter
     \long\def\lyxplainframe#1{\@lyxplainframe#1\@lyxframestop}%
     \def\@lyxplainframe{\@ifnextchar<{\@@lyxplainframe}{\@@lyxplainframe<*>}}%
     \long\def\@@lyxplainframe<#1>#2\@lyxframestop#3\lyxframeend{%
       \frame<#1>[plain]{\frametitle{#2}#3}}
-    \makeatother
   EndPreamble
 End
 
@@ -342,13 +381,11 @@ Style AgainFrame
   EndFont
 
   Preamble
-    \makeatletter
     \long\def\lyxagainframe#1{\@lyxagainframe#1\@lyxframestop}%
     \def\@lyxagainframe{\@ifnextchar<{\@@lyxagainframe}{\@@lyxagainframe<*>}}%
     \def\@@lyxagainframe<#1>{\@ifnextchar[{\@@@lyxagainframe<#1>}{\@@@lyxagainframe<#1>[]}}
     \long\def\@@@lyxagainframe<#1>[#2]#3\@lyxframestop{%
       \againframe<#1>[#2]{#3}}
-    \makeatother
   EndPreamble
 End
 
@@ -655,7 +692,7 @@ End
 # Blocks section
 Style Block
   Category         Blocks
-  Margin           First_Dynamic
+  Margin           Dynamic
   LatexType        Environment
   NextNoIndent     0
   ParIndent        MM
@@ -665,7 +702,6 @@ Style Block
 
   LatexName        block
   LabelString      "Block:"
-  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
@@ -692,7 +728,6 @@ Style ExampleBlock
 
   LatexName        exampleblock
   LabelString      "Example Block:"
-  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
@@ -723,7 +758,6 @@ Style AlertBlock
 
   LatexName        alertblock
   LabelString      "Alert Block:"
-  RequiredArgs     1
   
   ParSkip          0.5
   TopSep           1
@@ -844,7 +878,7 @@ Style Institute
   EndFont
 End
 
-InsetLayout InstituteMark
+InsetLayout "Flex:InstituteMark"
   LyxType          custom
   LatexType        command
   LatexName        inst
@@ -1161,7 +1195,7 @@ End
 
 # Charstyles:
 
-InsetLayout CharStyle:Alert
+InsetLayout Flex:Alert
   LyXType charstyle
   LabelString Alert
   LatexType        command
@@ -1172,7 +1206,7 @@ InsetLayout CharStyle:Alert
 End
 
 
-InsetLayout CharStyle:Structure
+InsetLayout Flex:Structure
   LyXType charstyle
   LabelString Structure
   LatexType        command
@@ -1183,7 +1217,7 @@ InsetLayout CharStyle:Structure
 End
 
 
-InsetLayout Custom:ArticleMode
+InsetLayout Flex:ArticleMode
    LyXType     custom
    LatexName   mode<article>
    LatexType   command
@@ -1193,7 +1227,7 @@ InsetLayout Custom:ArticleMode
 End
 
 
-InsetLayout Custom:PresentationMode
+InsetLayout Flex:PresentationMode
    LyXType     custom
    LatexName   mode<presentation>
    LatexType   command
@@ -1211,8 +1245,9 @@ Float
   NumberWithin     none
   Style            plain
   ListName         "List of Tables"
-  NeedsFloatPkg    false
-       ListCommand      listoftables
+  IsPredefined     true
+  UsesFloatPkg     false
+  ListCommand      listoftables
 End
 
 
@@ -1224,8 +1259,9 @@ Float
   NumberWithin     none
   Style            plain
   ListName         "List of Figures"
-  NeedsFloatPkg    false
-       ListCommand      listoffigures
+  IsPredefined     true
+  UsesFloatPkg     false
+  ListCommand      listoffigures
 End