Better TOC output for XHTML, per Rob and Pavel.

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index c7c05e59ccc3373403d4024a172320f0a83794ec..0c9e88e7f34176f5b30adbcf82c1b3399aa44561 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -5,7 +5,7 @@
 # $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 34
 Input stdcounters.inc
 Input stdinsets.inc
 
@@ -259,7 +259,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 +266,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 +300,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 +338,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
 
@@ -1158,7 +1152,7 @@ End
 
 # Charstyles:
 
-InsetLayout CharStyle:Alert
+InsetLayout Flex:Alert
   LyXType charstyle
   LabelString Alert
   LatexType        command
@@ -1169,7 +1163,7 @@ InsetLayout CharStyle:Alert
 End
 
 
-InsetLayout CharStyle:Structure
+InsetLayout Flex:Structure
   LyXType charstyle
   LabelString Structure
   LatexType        command
@@ -1180,7 +1174,7 @@ InsetLayout CharStyle:Structure
 End
 
 
-InsetLayout Custom:ArticleMode
+InsetLayout Flex:ArticleMode
    LyXType     custom
    LatexName   mode<article>
    LatexType   command
@@ -1190,7 +1184,7 @@ InsetLayout Custom:ArticleMode
 End
 
 
-InsetLayout Custom:PresentationMode
+InsetLayout Flex:PresentationMode
    LyXType     custom
    LatexName   mode<presentation>
    LatexType   command
@@ -1208,8 +1202,9 @@ Float
   NumberWithin     none
   Style            plain
   ListName         "List of Tables"
-  NeedsFloatPkg    false
-       ListCommand      listoftables
+  IsPredefined     true
+  UsesFloatPkg     false
+  ListCommand      listoftables
 End
 
 
@@ -1221,8 +1216,9 @@ Float
   NumberWithin     none
   Style            plain
   ListName         "List of Figures"
-  NeedsFloatPkg    false
-       ListCommand      listoffigures
+  IsPredefined     true
+  UsesFloatPkg     false
+  ListCommand      listoffigures
 End