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 bc00a400e9d57953b7390188c9dc51b369051241..0c9e88e7f34176f5b30adbcf82c1b3399aa44561 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1,11 +1,11 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[beamer,pgf.sty,xcolor.sty]{presentation (beamer)}
+#  \DeclareLaTeXClass[beamer,amssymb.sty,hyperref.sty,pgf.sty,xcolor.sty,xxcolor.sty]{presentation (beamer)}
 # 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 22
+Format 34
 Input stdcounters.inc
 Input stdinsets.inc
 
@@ -78,6 +78,7 @@ Style Enumerate
   ParSep           0.3
   Align            Left
   LabelType        Enumerate
+  RefPrefix        enu
 End
 
 # Description style definition
@@ -123,6 +124,7 @@ Style Part
   Align            Center
   LabelType        Static
   LabelString      "Part"
+       RefPrefix        part
 
   # standard font definition
   Font 
@@ -154,6 +156,7 @@ Style Section
   LabelType        Counter
   LabelCounter     section
   LabelString      "Section \arabic{section}"
+       RefPrefix        sec
   OptionalArgs     1
 
   Font 
@@ -196,6 +199,7 @@ Style Subsection
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
+       RefPrefix        sub
   OptionalArgs     1
 
   # standard font definition
@@ -255,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>[]}}
@@ -263,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
 
@@ -298,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
 
@@ -338,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
 
@@ -660,8 +658,8 @@ Style Block
   LabelSep         xx
 
   LatexName        block
-  LabelString      "Block ( ERT[{title}] body ):"
-
+  LabelString      "Block:"
+  
   ParSkip          0.5
   TopSep           1
   BottomSep        1
@@ -686,8 +684,8 @@ Style ExampleBlock
   LabelSep         xx
 
   LatexName        exampleblock
-  LabelString      "Block ( ERT[{title}] example text ):"
-
+  LabelString      "Example Block:"
+  
   ParSkip          0.5
   TopSep           1
   BottomSep        1
@@ -716,8 +714,8 @@ Style AlertBlock
   LabelSep         xx
 
   LatexName        alertblock
-  LabelString      "Block ( ERT[{title}] alert text ):"
-
+  LabelString      "Alert Block:"
+  
   ParSkip          0.5
   TopSep           1
   BottomSep        1
@@ -1154,7 +1152,7 @@ End
 
 # Charstyles:
 
-InsetLayout CharStyle:Alert
+InsetLayout Flex:Alert
   LyXType charstyle
   LabelString Alert
   LatexType        command
@@ -1165,7 +1163,7 @@ InsetLayout CharStyle:Alert
 End
 
 
-InsetLayout CharStyle:Structure
+InsetLayout Flex:Structure
   LyXType charstyle
   LabelString Structure
   LatexType        command
@@ -1176,7 +1174,7 @@ InsetLayout CharStyle:Structure
 End
 
 
-InsetLayout Custom:ArticleMode
+InsetLayout Flex:ArticleMode
    LyXType     custom
    LatexName   mode<article>
    LatexType   command
@@ -1186,7 +1184,7 @@ InsetLayout Custom:ArticleMode
 End
 
 
-InsetLayout Custom:PresentationMode
+InsetLayout Flex:PresentationMode
    LyXType     custom
    LatexName   mode<presentation>
    LatexType   command
@@ -1204,7 +1202,9 @@ Float
   NumberWithin     none
   Style            plain
   ListName         "List of Tables"
-  LaTeXBuiltin     true
+  IsPredefined     true
+  UsesFloatPkg     false
+  ListCommand      listoftables
 End
 
 
@@ -1216,7 +1216,9 @@ Float
   NumberWithin     none
   Style            plain
   ListName         "List of Figures"
-  LaTeXBuiltin     true
+  IsPredefined     true
+  UsesFloatPkg     false
+  ListCommand      listoffigures
 End
 
 
@@ -1224,7 +1226,7 @@ End
 # head-/footline, we define our own maketitle command
 TitleLaTeXName makebeamertitle
 
-Preamble
+AddToPreamble
   % this default might be overridden by plain title style
   \newcommand\makebeamertitle{\frame{\maketitle}}%
   \AtBeginDocument{
@@ -1234,3 +1236,4 @@ Preamble
   }
 EndPreamble
 
+Input theorems-refprefix.inc