Fix typos in comments

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 6e0be1b64cc08b73d7a3c020a831c58416fd984b..787f18a40de73fd12279b99017c59e7ffbc16a36 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1,12 +1,12 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[beamer,amssymb.sty,hyperref.sty,pgf.sty,xcolor.sty,xxcolor.sty]{Beamer}
+#  \DeclareLaTeXClass[beamer]{Beamer}
 #  \DeclareCategory{Presentations}
 # Original Author: Till Tantau <tantau@users.sourceforge.net>
 # Revised and extended by Jürgen Spitzmüller <spitz@lyx.org>, Uwe Stöhr <uwestoehr@lyx.org>,
-#   Richard Heck <rgheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
+#   Richard Kimberly Heck <rikiheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
 
 
-Format 45
+Format 98
 
 #
 # GLOBAL SETTINGS
@@ -18,6 +18,8 @@ Input stdinsets.inc
 
 # Beamer does not work with enumitem.
 # See bug #7047.
+# For upstream (Beamer) feature request:
+#   https://github.com/josephwright/beamer/issues/342
 ExcludesModule enumitem
 
 # General textclass parameters
@@ -28,6 +30,7 @@ TocDepth           2
 DefaultStyle       Standard
 
 # Pre-loaded packages
+Provides amsmath   1
 Provides hyperref  1
 Provides geometry  1
 Provides color     1
@@ -70,6 +73,7 @@ Style Standard
   Align            Left
   AlignPossible    Block, Left, Right, Center
   LabelType        No_Label
+  DocBookTag       para
 End
 
 
@@ -83,10 +87,11 @@ Style Itemize
   LatexType        Item_Environment
   LatexName        itemize
   Argument 1
-    LabelString    "Overlay Specifications|S"
+    LabelString    "Overlay Specifications|v"
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument item:1
     LabelString   "Custom Item|s"
@@ -98,8 +103,20 @@ Style Itemize
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
+  EndArgument
+  Argument listpreamble:1
+    LabelString    "List preamble"
+    MenuString     "List Preamble"
+    Tooltip        "LaTeX code to be inserted before the first item"
+    PassThru       1
+    Font
+      Family typewriter
+      Color latex
+    EndFont
   EndArgument
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MMN
   LabelSep         xx
   ItemSep          0.2
@@ -108,6 +125,9 @@ Style Itemize
   ParSep           0.3
   Align            Left
   LabelType        Itemize
+  DocBookTag            itemizedlist
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
 End
 
 Style Enumerate
@@ -116,10 +136,11 @@ Style Enumerate
   LatexType        Item_Environment
   LatexName        enumerate
   Argument 1
-    LabelString    "Overlay Specifications|S"
+    LabelString    "Overlay Specifications|v"
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Mini Template"
@@ -135,8 +156,20 @@ Style Enumerate
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
+  EndArgument
+  Argument listpreamble:1
+    LabelString    "List preamble"
+    MenuString     "List Preamble"
+    Tooltip        "LaTeX code to be inserted before the first item"
+    PassThru       1
+    Font
+      Family typewriter
+      Color latex
+    EndFont
   EndArgument
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MMN
   LabelSep         xx
   ParSkip          0.0
@@ -147,6 +180,15 @@ Style Enumerate
   Align            Left
   LabelType        Enumerate
   RefPrefix        enu
+  DocBookTag            orderedlist
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
+  HTMLStyle
+      ol.enumi   { list-style-type: decimal; }
+      ol.enumii  { list-style-type: lower-latin; }
+      ol.enumiii { list-style-type: lower-roman; }
+      ol.enumiv  { list-style-type: upper-latin; }
+  EndHTMLStyle
 End
 
 Style Description
@@ -155,21 +197,33 @@ Style Description
   LatexType        Item_environment
   LatexName        description
   Argument 1
-    LabelString    "Overlay Specifications|S"
+    LabelString    "Overlay Specifications|v"
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Longest label|s"
     Tooltip        "The longest label in this list (to determine the indendation width)"
   EndArgument
+  Argument listpreamble:1
+    LabelString    "List preamble"
+    MenuString     "List Preamble"
+    Tooltip        "LaTeX code to be inserted before the first item"
+    PassThru       1
+    Font
+      Family typewriter
+      Color latex
+    EndFont
+  EndArgument
   Argument item:1
     MenuString    "Item Overlay Specifications"
     LabelString   "On Slide"
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   NextNoIndent     1
   LeftMargin       MM
@@ -181,9 +235,15 @@ Style Description
   ParSep           0.3
   Align            Left
   LabelType        Manual
-  LabelFont 
+  LabelFont
     Series         Bold
   EndFont
+  DocBookTag            variablelist
+  DocBookItemWrapperTag varlistentry
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
+  DocBookItemLabelTag   term
+  DocBookItemLabelTagType   paragraph
 End
 
 
@@ -202,13 +262,17 @@ Style Part
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The part as it appears in the table of contents/running headers"
+    InsertCotext   1
+    IsTocCaption   1
   EndArgument
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   Labelsep         xx
   ParSkip          0.4
   TopSep           4
@@ -218,7 +282,7 @@ Style Part
   LabelType        Static
   LabelString      "Part"
   RefPrefix        part
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           Huge
@@ -226,7 +290,7 @@ Style Part
   LabelFont
     Color          Latex
   EndFont
-  TocLevel         0
+  TocLevel         -1
 End
 
 Style Section
@@ -236,6 +300,7 @@ Style Section
   LatexName        section
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   LabelSep         xx
   ParSkip          0.4
   TopSep           2
@@ -252,17 +317,20 @@ Style Section
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The section as it appears in the table of contents/running headers"
+    InsertCotext   1
+    IsTocCaption   1
   EndArgument
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           huge
   EndFont
-  LabelFont 
+  LabelFont
     Color          latex
   EndFont
   LabelStringAppendix "\Alph{section}"
@@ -282,8 +350,10 @@ Style Section*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 Style Subsection
@@ -293,6 +363,7 @@ Style Subsection
   LatexName        subsection
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   LabelSep         xx
   ParSkip          0.4
   TopSep           2
@@ -302,24 +373,27 @@ Style Subsection
   LabelType        Static
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
-  RefPrefix        sub
+  RefPrefix        subsec
   Argument 1
     LabelString    "Mode"
     MenuString     "Mode Specification|S"
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The subsection as it appears in the table of contents/running headers"
+    InsertCotext   1
+    IsTocCaption   1
   EndArgument
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           larger
   EndFont
-  LabelFont 
+  LabelFont
     Color          latex
   EndFont
   LabelStringAppendix "\arabic{section}.\arabic{subsection}"
@@ -339,8 +413,10 @@ Style Subsection*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 Style Subsubsection
@@ -350,6 +426,7 @@ Style Subsubsection
   LatexName        subsubsection
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   LabelSep         xx
   ParSkip          0.4
   TopSep           2
@@ -366,17 +443,20 @@ Style Subsubsection
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The subsubsection as it appears in the table of contents/running headers"
+    InsertCotext   1
+    IsTocCaption   1
   EndArgument
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           large
   EndFont
-  LabelFont 
+  LabelFont
     Color          latex
   EndFont
   LabelStringAppendix "\arabic{section}.\arabic{subsection}.\arabic{subsubsection}"
@@ -396,8 +476,10 @@ Style Subsubsection*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 
@@ -407,10 +489,11 @@ End
 
 Style Frame
   Category         Frames
-  Margin           Dynamic
+  Margin           First_Dynamic
+  LeftMargin       xx
   LatexType        Environment
   LatexName        frame
-  LabelString      "Frame"  
+  LabelString      "Frame"
   TocLevel         4
   KeepEmpty        1
   NextNoIndent     1
@@ -428,16 +511,18 @@ Style Frame
   EndFont
   Argument 1
     LabelString     "Action"
-    MenuString      "Overlay Specifications|S"
+    MenuString      "Overlay Specifications|v"
     Tooltip         "Overlay specifications for this frame"
     LeftDelim       <
     RightDelim      >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString     "Default Overlay Specifications"
     Tooltip         "Default overlay specifications within this frame"
     LeftDelim       [<
     RightDelim      >]
+    PassThru       1
   EndArgument
   Argument 3
     MenuString      "Frame Options"
@@ -451,11 +536,18 @@ Style Frame
     RightDelim     }
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         largest
     EndFont
     AutoInsert     1
+    IsTocCaption   1
   EndArgument
+  AutoNests 
+       Standard,Itemize,Enumerate,Description,FrameTitle,FrameSubtitle,Column,
+       Columns,ColumnsCenterAligned,ColumnsTopAligned,Pause,Overprint,OverlayArea,Only,Block,
+       ExampleBlock,AlertBlock,Bibliography,Quotation,Quote,Verse,Corollary,Definition,Definitions,
+       Example,Examples,Fact,Lemma,Proof,Theorem,LyX-Code
+  EndAutoNests
 End
 
 Style PlainFrame
@@ -487,16 +579,18 @@ Style AgainFrame
   LatexName         againframe
   Argument 1
     LabelString     "Slide"
-    MenuString      "Overlay Specifications|S"
+    MenuString      "Overlay Specifications|v"
     Tooltip         "Overlay specifications for this frame"
     LeftDelim       <
     RightDelim      >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString     "Default Overlay Specifications"
     Tooltip         "Default overlay specifications within this frame"
     LeftDelim       [<
     RightDelim      >]
+    PassThru       1
   EndArgument
   Argument 3
     MenuString      "Frame Options"
@@ -517,11 +611,12 @@ Style AgainFrame
   Font
     Color           latex
   EndFont
-  LabelFont 
+  LabelFont
     Family          Roman
     Color           latex
     Size            Largest
   EndFont
+  TocLevel          4
 End
 
 Style FrameTitle
@@ -536,20 +631,22 @@ Style FrameTitle
   ParSep           1
   Align            Block
   LabelType        No_Label
-  Font 
-    Color          Blue
+  Font
+    Color          textlabel1
     Size           Largest
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Short Frame Title|S"
     Tooltip        "A short form of the frame title used in some themes"
+    InsertCotext   1
   EndArgument
 End
 
@@ -565,26 +662,27 @@ Style FrameSubtitle
   ParSep           1
   Align            Block
   LabelType        No_Label
-  Font 
-    Color          Blue
+  Font
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
 
 #
-# COLUMS
+# COLUMNS
 #
 
 Style Column
   Category         Columns
-  Margin           Static
+  Margin           Dynamic
   LatexType        Command
   LatexName        column
   ParSkip          0.5
@@ -596,13 +694,13 @@ Style Column
   LabelType        Static
   LabelSep         xx
   LabelString      "Start column (increase depth!), width:"
+  ToggleIndent     Never
   Argument 1
     MenuString     "Column Options"
     LabelString    "Options"
     Tooltip        "Column options (see beamer manual)"
   EndArgument
-  LeftMargin       "Start column (increase depth!), width:xx"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -611,16 +709,15 @@ End
 Style Columns
   Category         Columns
   KeepEmpty        1
-  Margin           Static
+  Margin           First_Dynamic
   LatexType        Environment
-  NextNoIndent     0
+  NextNoIndent     1
   ParIndent        MM
   Align            Left
   LabelType        Static
   LabelSep         xx
   LatexName        columns
   LabelString      "Columns"
-  LeftMargin       "Columnsxx"
   Argument 1
     LabelString    "Column Placement Options"
     Tooltip        "Column placement options (t, T, c, b)"
@@ -629,17 +726,21 @@ Style Columns
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
+  AutoNests 
+       Standard,Column,Itemize,Enumerate,Description,Pause,Overprint,OverlayArea,Only,Block,
+       ExampleBlock,AlertBlock,Bibliography,Quotation,Quote,Verse,Corollary,Definition,Definitions,
+       Example,Examples,Fact,Lemma,Proof,Theorem,LyX-Code
+  EndAutoNests
 End
 
 Style ColumnsCenterAligned
   CopyStyle        Columns
   LatexParam       [c]
   LabelString      "Columns (center aligned)"
-  LeftMargin       "Columns (center aligned)xx"
   ResetArgs        1
 End
 
@@ -647,7 +748,6 @@ Style ColumnsTopAligned
   CopyStyle        Columns
   LatexParam       [t]
   LabelString      "Columns (top aligned)"
-  LeftMargin       "Columns (top aligned)xx"
   ResetArgs        1
 End
 
@@ -695,12 +795,23 @@ Style Overprint
     LabelString    "Width"
     Tooltip        "The width of the overprint area (default: text width)"
   EndArgument
+  Argument listpreamble:1
+    LabelString    "List preamble"
+    MenuString     "List Preamble"
+    Tooltip        "LaTeX code to be inserted before the first item"
+    PassThru       1
+    Font
+      Family typewriter
+      Color latex
+    EndFont
+  EndArgument
   Argument item:1
     MenuString    "Item Overlay Specifications"
     LabelString   "On Slide"
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
   NextNoIndent     1
@@ -713,7 +824,7 @@ Style Overprint
   Align            Left
   LabelType        Static
   LabelString      "Overprint"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -734,7 +845,7 @@ Style OverlayArea
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -766,16 +877,17 @@ Style Uncover
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          Latex
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -800,10 +912,11 @@ Style Only
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -837,6 +950,7 @@ Style Block
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Block Title"
@@ -844,11 +958,15 @@ Style Block
     Mandatory      1
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         large
     EndFont
     AutoInsert     1
   EndArgument
+  AutoNests 
+       Standard,Itemize,Enumerate,Description,Pause,Overprint,OverlayArea,Only,Quotation,
+       Quote,Verse,Corollary,Definition,Definitions,Example,Examples,Fact,Lemma,Proof,Theorem,LyX-Code
+  EndAutoNests
 End
 
 Style ExampleBlock
@@ -856,7 +974,7 @@ Style ExampleBlock
   LatexName        exampleblock
   LabelString      "Example Block:"
   Font
-    Color          green
+    Color          textlabel2
   EndFont
 End
 
@@ -865,7 +983,7 @@ Style AlertBlock
   LatexName        alertblock
   LabelString      "Alert Block:"
   Font
-    Color          red
+    Color          error
   EndFont
 End
 
@@ -890,12 +1008,17 @@ Style Title
   Argument 1
     LabelString   "Short Title|S"
     Tooltip       "Short title which appears in the sidebar/header"
+    InsertCotext   1
+       # TODO: In DocBook, output it in a titleabbrev outside this title.
   EndArgument
-  Font 
+  Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag       title
+  DocBookTagType   paragraph
+  DocBookInInfo    maybe
 End
 
 Style Title_(Plain_Frame)
@@ -922,12 +1045,15 @@ Style Subtitle
   Argument 1
     LabelString   "Short Subtitle|S"
     Tooltip       "Short subtitle which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Large
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag       subtitle
+  DocBookInInfo    maybe
 End
 
 Style Author
@@ -945,11 +1071,17 @@ Style Author
   Argument 1
     LabelString   "Short Author|S"
     Tooltip       "Short author which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag            personname
+  DocBookTagType        paragraph
+  DocBookWrapperTag     author
+  DocBookWrapperTagType inline
+  DocBookInInfo         always
 End
 
 Style Institute
@@ -967,10 +1099,11 @@ Style Institute
   Argument 1
     LabelString   "Short Institute|S"
     Tooltip       "Short institute which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Large
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -990,7 +1123,7 @@ InsetLayout "Flex:InstituteMark"
     Misc           No_Bar
   EndFont
   LabelFont
-    Color          blue
+    Color          textlabel1
     Size           Small
   EndFont
 End
@@ -1010,10 +1143,11 @@ Style Date
   Argument 1
     LabelString   "Short Date|S"
     Tooltip       "Short date which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1030,10 +1164,10 @@ Style TitleGraphic
   ParSep           1
   Align            Center
   LabelType        No_Label
-  Font 
+  Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1048,6 +1182,7 @@ Style Bibliography
   LatexType        Bib_Environment
   LatexName        thebibliography
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MM
   ParSkip          0.4
   ItemSep          0
@@ -1058,10 +1193,22 @@ Style Bibliography
   LabelType        Bibliography
   LabelString      "References"
   LabelBottomSep   0.7
-  LabelFont 
+  LabelFont
     Series         Bold
     Size           Larger
   EndFont
+  TocLevel         1
+  IsTocCaption     0
+  Argument listpreamble:1
+    LabelString    "Bib preamble"
+    MenuString     "Bibliography Preamble"
+    Tooltip        "LaTeX code to be inserted before the first bibliography item"
+    PassThru       1
+    Font
+      Family typewriter
+      Color latex
+    EndFont
+  EndArgument
 End
 
 
@@ -1075,6 +1222,7 @@ Style Quotation
   LatexType        Environment
   LatexName        quotation
   NextNoIndent     1
+  ToggleIndent     Always
   LeftMargin       MMM
   RightMargin      MMM
   ParIndent        MM
@@ -1087,10 +1235,11 @@ Style Quotation
   AlignPossible    Block, Left, Right, Center
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1100,6 +1249,7 @@ Style Quote
   LatexType        Environment
   LatexName        quote
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MMM
   RightMargin      MMM
   TopSep           0.5
@@ -1110,10 +1260,11 @@ Style Quote
   LabelType        No_Label
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1136,10 +1287,11 @@ Style Verse
   LabelType        No_Label
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1166,7 +1318,7 @@ Style Corollary
    KeepEmpty       1
    LabelFont
      Series        Bold
-     Color         Blue
+     Color         textlabel1
      Size          Large
    EndFont
   Argument 1
@@ -1175,11 +1327,15 @@ Style Corollary
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Additional Theorem Text"
     Tooltip        "Additional text appended to the theorem header"
   EndArgument
+  AutoNests 
+       Standard,Itemize,Enumerate,Description,Pause,Overprint,OverlayArea,Only,LyX-Code
+  EndAutoNests
 End
 
 Style Definition
@@ -1200,7 +1356,7 @@ Style Example
   LabelString      "Example."
   LabelFont
     Series         Bold
-    Color          Green
+    Color          textlabel2
   EndFont
 End
 
@@ -1216,6 +1372,12 @@ Style Fact
   LabelString      "Fact."
 End
 
+Style Lemma
+  CopyStyle        Corollary
+  LatexName        lemma
+  LabelString      "Lemma."
+End
+
 Style Proof
   CopyStyle        Corollary
   LatexName        proof
@@ -1233,29 +1395,6 @@ End
 # MISC.
 #
 
-Style Separator
-  Category         MainText
-  LatexType        Paragraph
-  LatexName        dummy
-  ParIndent        MM
-  ParSkip          0.4
-  Align            Left
-  AlignPossible    Block, Left, Right, Center
-  Margin           First_Dynamic
-  TopSep           0
-  BottomSep        0
-  ParSep           0
-  LabelType        Static
-  LabelBottomSep   0
-  LabelString      "___"
-  KeepEmpty        1
-  LabelFont 
-    Series         Medium
-    Size           Normal
-    Color          latex
-  EndFont
-End
- 
 Style LyX-Code
   Category         MainText
   Margin           Static
@@ -1285,9 +1424,12 @@ Style LyX-Code
      \item[]}
     {\end{list}}
   EndPreamble
-  Font 
+  Font
     Family         Typewriter
   EndFont
+  DocBookTag            programlisting
+  DocBookTagType        paragraph
+  DocBookAttr                  language='lyx'
 End
  
 Style NoteItem
@@ -1305,17 +1447,21 @@ Style NoteItem
   LabelSep         xx
   LabelString      "Note:"
   LeftMargin       "Note:xx"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
+  IsAutoNestedBy
+    Itemize,Enumerate
+  EndIsAutoNestedBy
 End
  
 
@@ -1338,7 +1484,10 @@ InsetLayout Flex:Bold
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Emphasize
@@ -1355,7 +1504,10 @@ InsetLayout Flex:Emphasize
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alert
@@ -1364,7 +1516,7 @@ InsetLayout Flex:Alert
   LatexType        command
   LatexName        alert
   Font
-    Color          red
+    Color          error
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1372,7 +1524,10 @@ InsetLayout Flex:Alert
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Structure
@@ -1381,7 +1536,7 @@ InsetLayout Flex:Structure
   LatexType        command
   LatexName        structure
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1389,7 +1544,10 @@ InsetLayout Flex:Structure
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Only
@@ -1398,7 +1556,7 @@ InsetLayout Flex:Only
   LatexType        command
   LatexName        only
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1406,8 +1564,11 @@ InsetLayout Flex:Only
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Uncover
@@ -1416,7 +1577,7 @@ InsetLayout Flex:Uncover
   LatexType        command
   LatexName        uncover
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1424,8 +1585,11 @@ InsetLayout Flex:Uncover
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Visible
@@ -1434,7 +1598,7 @@ InsetLayout Flex:Visible
   LatexType        command
   LatexName        visible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1442,8 +1606,11 @@ InsetLayout Flex:Visible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Invisible
@@ -1452,7 +1619,7 @@ InsetLayout Flex:Invisible
   LatexType        command
   LatexName        invisible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1460,8 +1627,11 @@ InsetLayout Flex:Invisible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alternative
@@ -1470,7 +1640,7 @@ InsetLayout Flex:Alternative
   LatexType        command
   LatexName        alt
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1478,12 +1648,17 @@ InsetLayout Flex:Alternative
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
+    AutoInsert     1
   EndArgument
   Argument 2
     LabelString    "Default Text"
     Tooltip        "Enter the default text here"
     Mandatory      1
+    AutoInsert     1
   EndArgument
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Beamer_Note
@@ -1493,7 +1668,7 @@ InsetLayout Flex:Beamer_Note
   LatexName        note
   Decoration       Classic
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1501,11 +1676,13 @@ InsetLayout Flex:Beamer_Note
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Note Options"
     Tooltip        "Specifiy note options (see beamer manual)"
   EndArgument
+  ResetsFont       true
 End
 
 InsetLayout Flex:ArticleMode
@@ -1516,6 +1693,7 @@ InsetLayout Flex:ArticleMode
    Decoration      classic
    LabelString     Article
    MultiPar        true
+   ResetsFont      true
 End
 
 InsetLayout Flex:PresentationMode
@@ -1526,6 +1704,7 @@ InsetLayout Flex:PresentationMode
    Decoration      classic
    LabelString     Presentation
    MultiPar        true
+   ResetsFont      true
 End
 
 
@@ -1533,6 +1712,8 @@ End
 # FLOATS
 #
 
+Input stdfloatnames.inc
+
 Float
   Type             table
   GuiName          Table