Fix compilation with gcc 4.9

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index e17380bd2655b69e4853815c2befa5e4acf6cc84..d824522c8b35fafa56f165790048696722ad5b82 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -3,10 +3,10 @@
 #  \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 85
+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
@@ -525,7 +527,7 @@ Style Frame
     RightDelim     }
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         largest
     EndFont
     AutoInsert     1
@@ -621,7 +623,7 @@ Style FrameTitle
   Align            Block
   LabelType        No_Label
   Font
-    Color          Blue
+    Color          textlabel1
     Size           Largest
   EndFont
   Argument 1
@@ -652,7 +654,7 @@ Style FrameSubtitle
   Align            Block
   LabelType        No_Label
   Font
-    Color          Blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "On Slide"
@@ -666,12 +668,12 @@ End
 
 
 #
-# COLUMS
+# COLUMNS
 #
 
 Style Column
   Category         Columns
-  Margin           Static
+  Margin           Dynamic
   LatexType        Command
   LatexName        column
   ParSkip          0.5
@@ -689,7 +691,6 @@ Style Column
     LabelString    "Options"
     Tooltip        "Column options (see beamer manual)"
   EndArgument
-  LeftMargin       "Start column (increase depth!), width:xx"
   LabelFont
     Family         Roman
     Color          latex
@@ -699,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)"
@@ -732,7 +732,6 @@ Style ColumnsCenterAligned
   CopyStyle        Columns
   LatexParam       [c]
   LabelString      "Columns (center aligned)"
-  LeftMargin       "Columns (center aligned)xx"
   ResetArgs        1
 End
 
@@ -740,7 +739,6 @@ Style ColumnsTopAligned
   CopyStyle        Columns
   LatexParam       [t]
   LabelString      "Columns (top aligned)"
-  LeftMargin       "Columns (top aligned)xx"
   ResetArgs        1
 End
 
@@ -951,7 +949,7 @@ Style Block
     Mandatory      1
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         large
     EndFont
     AutoInsert     1
@@ -967,7 +965,7 @@ Style ExampleBlock
   LatexName        exampleblock
   LabelString      "Example Block:"
   Font
-    Color          green
+    Color          textlabel2
   EndFont
 End
 
@@ -976,7 +974,7 @@ Style AlertBlock
   LatexName        alertblock
   LabelString      "Alert Block:"
   Font
-    Color          red
+    Color          error
   EndFont
 End
 
@@ -1007,7 +1005,7 @@ Style Title
   Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
   DocBookTag       title
   DocBookTagType   paragraph
@@ -1043,8 +1041,10 @@ Style Subtitle
   Font
     Size           Large
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag       subtitle
+  DocBookInInfo    maybe
 End
 
 Style Author
@@ -1066,8 +1066,13 @@ Style Author
   EndArgument
   Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag            personname
+  DocBookTagType        paragraph
+  DocBookWrapperTag     author
+  DocBookWrapperTagType inline
+  DocBookInInfo         always
 End
 
 Style Institute
@@ -1089,7 +1094,7 @@ Style Institute
   EndArgument
   Font
     Size           Large
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1109,7 +1114,7 @@ InsetLayout "Flex:InstituteMark"
     Misc           No_Bar
   EndFont
   LabelFont
-    Color          blue
+    Color          textlabel1
     Size           Small
   EndFont
 End
@@ -1133,7 +1138,7 @@ Style Date
   EndArgument
   Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1153,7 +1158,7 @@ Style TitleGraphic
   Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1304,7 +1309,7 @@ Style Corollary
    KeepEmpty       1
    LabelFont
      Series        Bold
-     Color         Blue
+     Color         textlabel1
      Size          Large
    EndFont
   Argument 1
@@ -1342,7 +1347,7 @@ Style Example
   LabelString      "Example."
   LabelFont
     Series         Bold
-    Color          Green
+    Color          textlabel2
   EndFont
 End
 
@@ -1502,7 +1507,7 @@ InsetLayout Flex:Alert
   LatexType        command
   LatexName        alert
   Font
-    Color          red
+    Color          error
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1522,7 +1527,7 @@ InsetLayout Flex:Structure
   LatexType        command
   LatexName        structure
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1542,7 +1547,7 @@ InsetLayout Flex:Only
   LatexType        command
   LatexName        only
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1563,7 +1568,7 @@ InsetLayout Flex:Uncover
   LatexType        command
   LatexName        uncover
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1584,7 +1589,7 @@ InsetLayout Flex:Visible
   LatexType        command
   LatexName        visible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1605,7 +1610,7 @@ InsetLayout Flex:Invisible
   LatexType        command
   LatexName        invisible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1626,7 +1631,7 @@ InsetLayout Flex:Alternative
   LatexType        command
   LatexName        alt
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1635,11 +1640,13 @@ InsetLayout Flex:Alternative
     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
@@ -1652,7 +1659,7 @@ InsetLayout Flex:Beamer_Note
   LatexName        note
   Decoration       Classic
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"