Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index fbdbd76266f9b7f5c07a0ccddb396952a01b3d32..d824522c8b35fafa56f165790048696722ad5b82 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 50
+Format 95
 
 #
 # 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
 
 
@@ -87,6 +91,7 @@ Style Itemize
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument item:1
     LabelString   "Custom Item|s"
@@ -98,6 +103,17 @@ 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
@@ -109,6 +125,9 @@ Style Itemize
   ParSep           0.3
   Align            Left
   LabelType        Itemize
+  DocBookTag            itemizedlist
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
 End
 
 Style Enumerate
@@ -121,6 +140,7 @@ Style Enumerate
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Mini Template"
@@ -136,6 +156,17 @@ 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
@@ -149,6 +180,9 @@ Style Enumerate
   Align            Left
   LabelType        Enumerate
   RefPrefix        enu
+  DocBookTag            orderedlist
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
 End
 
 Style Description
@@ -161,17 +195,29 @@ Style Description
     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
@@ -183,9 +229,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
 
 
@@ -204,10 +256,13 @@ 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
@@ -221,7 +276,7 @@ Style Part
   LabelType        Static
   LabelString      "Part"
   RefPrefix        part
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           Huge
@@ -256,17 +311,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}"
@@ -286,6 +344,7 @@ Style Section*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
 End
@@ -307,24 +366,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}"
@@ -344,6 +406,7 @@ Style Subsection*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
 End
@@ -372,17 +435,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}"
@@ -402,6 +468,7 @@ Style Subsubsection*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
 End
@@ -413,10 +480,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
@@ -438,12 +506,14 @@ Style Frame
     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"
@@ -457,11 +527,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
@@ -497,12 +574,14 @@ Style AgainFrame
     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"
@@ -523,11 +602,12 @@ Style AgainFrame
   Font
     Color           latex
   EndFont
-  LabelFont 
+  LabelFont
     Family          Roman
     Color           latex
     Size            Largest
   EndFont
+  TocLevel          4
 End
 
 Style FrameTitle
@@ -542,8 +622,8 @@ Style FrameTitle
   ParSep           1
   Align            Block
   LabelType        No_Label
-  Font 
-    Color          Blue
+  Font
+    Color          textlabel1
     Size           Largest
   EndFont
   Argument 1
@@ -552,10 +632,12 @@ Style FrameTitle
     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
 
@@ -571,8 +653,8 @@ Style FrameSubtitle
   ParSep           1
   Align            Block
   LabelType        No_Label
-  Font 
-    Color          Blue
+  Font
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "On Slide"
@@ -580,17 +662,18 @@ Style FrameSubtitle
     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
@@ -608,8 +691,7 @@ Style Column
     LabelString    "Options"
     Tooltip        "Column options (see beamer manual)"
   EndArgument
-  LeftMargin       "Start column (increase depth!), width:xx"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -618,16 +700,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)"
@@ -636,17 +717,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
 
@@ -654,7 +739,6 @@ Style ColumnsTopAligned
   CopyStyle        Columns
   LatexParam       [t]
   LabelString      "Columns (top aligned)"
-  LeftMargin       "Columns (top aligned)xx"
   ResetArgs        1
 End
 
@@ -702,12 +786,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
@@ -720,7 +815,7 @@ Style Overprint
   Align            Left
   LabelType        Static
   LabelString      "Overprint"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -741,7 +836,7 @@ Style OverlayArea
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -773,7 +868,7 @@ Style Uncover
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          Latex
   EndFont
@@ -783,6 +878,7 @@ Style Uncover
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -811,6 +907,7 @@ Style Only
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -844,6 +941,7 @@ Style Block
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Block Title"
@@ -851,11 +949,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
@@ -863,7 +965,7 @@ Style ExampleBlock
   LatexName        exampleblock
   LabelString      "Example Block:"
   Font
-    Color          green
+    Color          textlabel2
   EndFont
 End
 
@@ -872,7 +974,7 @@ Style AlertBlock
   LatexName        alertblock
   LabelString      "Alert Block:"
   Font
-    Color          red
+    Color          error
   EndFont
 End
 
@@ -897,12 +999,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)
@@ -929,12 +1036,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
@@ -952,11 +1062,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
@@ -974,10 +1090,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
 
@@ -997,7 +1114,7 @@ InsetLayout "Flex:InstituteMark"
     Misc           No_Bar
   EndFont
   LabelFont
-    Color          blue
+    Color          textlabel1
     Size           Small
   EndFont
 End
@@ -1017,10 +1134,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
 
@@ -1037,10 +1155,10 @@ Style TitleGraphic
   ParSep           1
   Align            Center
   LabelType        No_Label
-  Font 
+  Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1066,10 +1184,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
 
 
@@ -1100,6 +1230,7 @@ Style Quotation
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1124,6 +1255,7 @@ Style Quote
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1150,6 +1282,7 @@ Style Verse
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1176,7 +1309,7 @@ Style Corollary
    KeepEmpty       1
    LabelFont
      Series        Bold
-     Color         Blue
+     Color         textlabel1
      Size          Large
    EndFont
   Argument 1
@@ -1185,11 +1318,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
@@ -1210,7 +1347,7 @@ Style Example
   LabelString      "Example."
   LabelFont
     Series         Bold
-    Color          Green
+    Color          textlabel2
   EndFont
 End
 
@@ -1278,9 +1415,12 @@ Style LyX-Code
      \item[]}
     {\end{list}}
   EndPreamble
-  Font 
+  Font
     Family         Typewriter
   EndFont
+  DocBookTag            programlisting
+  DocBookTagType        paragraph
+  DocBookAttr                  language='lyx'
 End
  
 Style NoteItem
@@ -1298,7 +1438,7 @@ Style NoteItem
   LabelSep         xx
   LabelString      "Note:"
   LeftMargin       "Note:xx"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -1308,7 +1448,11 @@ Style NoteItem
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
+  IsAutoNestedBy
+    Itemize,Enumerate
+  EndIsAutoNestedBy
 End
  
 
@@ -1331,8 +1475,10 @@ InsetLayout Flex:Bold
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Emphasize
@@ -1349,8 +1495,10 @@ InsetLayout Flex:Emphasize
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alert
@@ -1359,7 +1507,7 @@ InsetLayout Flex:Alert
   LatexType        command
   LatexName        alert
   Font
-    Color          red
+    Color          error
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1367,8 +1515,10 @@ InsetLayout Flex:Alert
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Structure
@@ -1377,7 +1527,7 @@ InsetLayout Flex:Structure
   LatexType        command
   LatexName        structure
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1385,8 +1535,10 @@ InsetLayout Flex:Structure
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Only
@@ -1395,7 +1547,7 @@ InsetLayout Flex:Only
   LatexType        command
   LatexName        only
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1403,9 +1555,11 @@ InsetLayout Flex:Only
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Uncover
@@ -1414,7 +1568,7 @@ InsetLayout Flex:Uncover
   LatexType        command
   LatexName        uncover
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1422,9 +1576,11 @@ InsetLayout Flex:Uncover
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Visible
@@ -1433,7 +1589,7 @@ InsetLayout Flex:Visible
   LatexType        command
   LatexName        visible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1441,9 +1597,11 @@ InsetLayout Flex:Visible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Invisible
@@ -1452,7 +1610,7 @@ InsetLayout Flex:Invisible
   LatexType        command
   LatexName        invisible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1460,9 +1618,11 @@ InsetLayout Flex:Invisible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alternative
@@ -1471,7 +1631,7 @@ InsetLayout Flex:Alternative
   LatexType        command
   LatexName        alt
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1479,13 +1639,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
+  ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Beamer_Note
@@ -1495,7 +1659,7 @@ InsetLayout Flex:Beamer_Note
   LatexName        note
   Decoration       Classic
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1503,12 +1667,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
+  ResetsFont       true
 End
 
 InsetLayout Flex:ArticleMode
@@ -1519,7 +1684,7 @@ InsetLayout Flex:ArticleMode
    Decoration      classic
    LabelString     Article
    MultiPar        true
-       ResetsFont true
+   ResetsFont      true
 End
 
 InsetLayout Flex:PresentationMode
@@ -1530,7 +1695,7 @@ InsetLayout Flex:PresentationMode
    Decoration      classic
    LabelString     Presentation
    MultiPar        true
-       ResetsFont true
+   ResetsFont      true
 End
 
 
@@ -1538,6 +1703,8 @@ End
 # FLOATS
 #
 
+Input stdfloatnames.inc
+
 Float
   Type             table
   GuiName          Table