Fix typos in comments

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 81d26f77f661b6e156c9a65d20ccae68500f4142..787f18a40de73fd12279b99017c59e7ffbc16a36 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -6,7 +6,7 @@
 #   Richard Kimberly Heck <rikiheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
 
 
-Format 89
+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
@@ -181,6 +183,12 @@ Style Enumerate
   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
@@ -345,6 +353,7 @@ Style Section*
     PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 Style Subsection
@@ -407,6 +416,7 @@ Style Subsection*
     PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 Style Subsubsection
@@ -469,6 +479,7 @@ Style Subsubsection*
     PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 
@@ -525,7 +536,7 @@ Style Frame
     RightDelim     }
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         largest
     EndFont
     AutoInsert     1
@@ -621,7 +632,7 @@ Style FrameTitle
   Align            Block
   LabelType        No_Label
   Font
-    Color          Blue
+    Color          textlabel1
     Size           Largest
   EndFont
   Argument 1
@@ -652,7 +663,7 @@ Style FrameSubtitle
   Align            Block
   LabelType        No_Label
   Font
-    Color          Blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "On Slide"
@@ -666,12 +677,12 @@ End
 
 
 #
-# COLUMS
+# COLUMNS
 #
 
 Style Column
   Category         Columns
-  Margin           Static
+  Margin           Dynamic
   LatexType        Command
   LatexName        column
   ParSkip          0.5
@@ -689,7 +700,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 +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)"
@@ -732,7 +741,6 @@ Style ColumnsCenterAligned
   CopyStyle        Columns
   LatexParam       [c]
   LabelString      "Columns (center aligned)"
-  LeftMargin       "Columns (center aligned)xx"
   ResetArgs        1
 End
 
@@ -740,7 +748,6 @@ Style ColumnsTopAligned
   CopyStyle        Columns
   LatexParam       [t]
   LabelString      "Columns (top aligned)"
-  LeftMargin       "Columns (top aligned)xx"
   ResetArgs        1
 End
 
@@ -951,7 +958,7 @@ Style Block
     Mandatory      1
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         large
     EndFont
     AutoInsert     1
@@ -967,7 +974,7 @@ Style ExampleBlock
   LatexName        exampleblock
   LabelString      "Example Block:"
   Font
-    Color          green
+    Color          textlabel2
   EndFont
 End
 
@@ -976,7 +983,7 @@ Style AlertBlock
   LatexName        alertblock
   LabelString      "Alert Block:"
   Font
-    Color          red
+    Color          error
   EndFont
 End
 
@@ -1007,7 +1014,7 @@ Style Title
   Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
   DocBookTag       title
   DocBookTagType   paragraph
@@ -1043,7 +1050,7 @@ Style Subtitle
   Font
     Size           Large
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
   DocBookTag       subtitle
   DocBookInInfo    maybe
@@ -1068,7 +1075,7 @@ Style Author
   EndArgument
   Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
   DocBookTag            personname
   DocBookTagType        paragraph
@@ -1096,7 +1103,7 @@ Style Institute
   EndArgument
   Font
     Size           Large
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1116,7 +1123,7 @@ InsetLayout "Flex:InstituteMark"
     Misc           No_Bar
   EndFont
   LabelFont
-    Color          blue
+    Color          textlabel1
     Size           Small
   EndFont
 End
@@ -1140,7 +1147,7 @@ Style Date
   EndArgument
   Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1160,7 +1167,7 @@ Style TitleGraphic
   Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1311,7 +1318,7 @@ Style Corollary
    KeepEmpty       1
    LabelFont
      Series        Bold
-     Color         Blue
+     Color         textlabel1
      Size          Large
    EndFont
   Argument 1
@@ -1349,7 +1356,7 @@ Style Example
   LabelString      "Example."
   LabelFont
     Series         Bold
-    Color          Green
+    Color          textlabel2
   EndFont
 End
 
@@ -1509,7 +1516,7 @@ InsetLayout Flex:Alert
   LatexType        command
   LatexName        alert
   Font
-    Color          red
+    Color          error
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1529,7 +1536,7 @@ InsetLayout Flex:Structure
   LatexType        command
   LatexName        structure
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1549,7 +1556,7 @@ InsetLayout Flex:Only
   LatexType        command
   LatexName        only
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1570,7 +1577,7 @@ InsetLayout Flex:Uncover
   LatexType        command
   LatexName        uncover
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1591,7 +1598,7 @@ InsetLayout Flex:Visible
   LatexType        command
   LatexName        visible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1612,7 +1619,7 @@ InsetLayout Flex:Invisible
   LatexType        command
   LatexName        invisible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1633,7 +1640,7 @@ InsetLayout Flex:Alternative
   LatexType        command
   LatexName        alt
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1642,11 +1649,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
@@ -1659,7 +1668,7 @@ InsetLayout Flex:Beamer_Note
   LatexName        note
   Decoration       Classic
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"