Bump layout format

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index d4ad53be75abf3587c35c5bd7a7bd168c6d54abb..a550a034681f08157da5194edf8e6b0c3c57b98b 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -6,11 +6,7 @@
 #   Richard Heck <rgheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
 
 
-Format 41
-
-# Beamer does not work with enumitem.
-# See bug #7047.
-ExcludesModule enumitem
+Format 42
 
 #
 # GLOBAL SETTINGS
@@ -20,6 +16,10 @@ ExcludesModule enumitem
 Input stdcounters.inc
 Input stdinsets.inc
 
+# Beamer does not work with enumitem.
+# See bug #7047.
+ExcludesModule enumitem
+
 # General textclass parameters
 Columns            1
 Sides              1
@@ -688,29 +688,37 @@ End
 
 Style Overprint
   Category         Overlays
-  Margin           First_Dynamic
-  LatexType        Environment
-  NextNoIndent     0
-  ParIndent        MM
+  Margin           Static
+  LatexType        Item_Environment
+  LatexName        overprint
+  ItemCommand      onslide
+  Argument 1
+    MenuString     "Overprint Area Width"
+    LabelString    "Width"
+    Tooltip        "The width of the overprint area (default: text width)"
+  EndArgument
+  Argument item:1
+    MenuString    "Item Overlay Specifications"
+    LabelString   "On Slide"
+    Tooltip       "Overlay specifications for this item"
+    LeftDelim      <
+    RightDelim     >
+    AutoInsert     1
+  EndArgument
+  NextNoIndent     1
+  LeftMargin       MMMMMMMMN
+  LabelSep         xx
+  ItemSep          0.2
+  TopSep           0.7
+  BottomSep        0.7
+  ParSep           0.3
   Align            Left
   LabelType        Static
-  LabelSep         xx
-  LatexName        overprint
   LabelString      "Overprint"
-  ParSkip          0.5
-  TopSep           1
-  BottomSep        1
-  ParSep           0
-  KeepEmpty        1
   LabelFont 
     Family         Roman
     Color          latex
   EndFont
-  Argument 1
-    MenuString     "Overprint Area Width"
-    LabelString    "Width"
-    Tooltip        "The width of the overprint area (default: text width)"
-  EndArgument
 End
 
 Style OverlayArea
@@ -811,11 +819,12 @@ Style Block
   Margin           Dynamic
   LatexType        Environment
   NextNoIndent     1
+  KeepEmpty        1
   Align            Left
   LabelType        Static
   LabelSep         xx
   LatexName        block
-  LabelString      "Block:"  
+  LabelString      "Block:"
   ParSkip          0.5
   TopSep           1
   BottomSep        1
@@ -840,6 +849,7 @@ Style Block
       Color        blue
       Size         large
     EndFont
+    AutoInsert     1
   EndArgument
 End
 
@@ -1315,9 +1325,27 @@ End
 # CHARSTYLES
 #
 
+
+InsetLayout Flex:Bold
+  LyXType          charstyle
+  LabelString      Bold
+  LatexType        command
+  LatexName        textbf
+  Font
+    Series         bold
+  EndFont
+  Argument 1
+    LabelString    "Action"
+    MenuString     "Action Specifications|S"
+    Tooltip        "Specify the overlay settings (see beamer manual)"
+    LeftDelim      <
+    RightDelim     >
+  EndArgument
+End
+
 InsetLayout Flex:Emphasize
   LyXType          charstyle
-  LabelString      Emphasize
+  LabelString      Emph.
   LatexType        command
   LatexName        emph
   Font
@@ -1380,6 +1408,7 @@ InsetLayout Flex:Only
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    AutoInsert     1
   EndArgument
 End
 
@@ -1397,6 +1426,7 @@ InsetLayout Flex:Uncover
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    AutoInsert     1
   EndArgument
 End
 
@@ -1414,6 +1444,7 @@ InsetLayout Flex:Visible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    AutoInsert     1
   EndArgument
 End
 
@@ -1431,6 +1462,7 @@ InsetLayout Flex:Invisible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    AutoInsert     1
   EndArgument
 End