Fix typos in comments

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 0ee73b7e50d17e95ff969346414b4ceefe738403..787f18a40de73fd12279b99017c59e7ffbc16a36 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 69
+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
 
 
@@ -121,6 +125,9 @@ Style Itemize
   ParSep           0.3
   Align            Left
   LabelType        Itemize
+  DocBookTag            itemizedlist
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
 End
 
 Style Enumerate
@@ -173,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
@@ -222,6 +238,12 @@ Style Description
   LabelFont
     Series         Bold
   EndFont
+  DocBookTag            variablelist
+  DocBookItemWrapperTag varlistentry
+  DocBookItemTag        listitem
+  DocBookItemInnerTag   para
+  DocBookItemLabelTag   term
+  DocBookItemLabelTagType   paragraph
 End
 
 
@@ -331,6 +353,7 @@ Style Section*
     PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 Style Subsection
@@ -393,6 +416,7 @@ Style Subsection*
     PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 Style Subsubsection
@@ -455,6 +479,7 @@ Style Subsubsection*
     PassThru       1
   EndArgument
   LaTeXParam       *
+  HTMLInToc        0
 End
 
 
@@ -511,7 +536,7 @@ Style Frame
     RightDelim     }
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         largest
     EndFont
     AutoInsert     1
@@ -607,7 +632,7 @@ Style FrameTitle
   Align            Block
   LabelType        No_Label
   Font
-    Color          Blue
+    Color          textlabel1
     Size           Largest
   EndFont
   Argument 1
@@ -638,7 +663,7 @@ Style FrameSubtitle
   Align            Block
   LabelType        No_Label
   Font
-    Color          Blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "On Slide"
@@ -652,12 +677,12 @@ End
 
 
 #
-# COLUMS
+# COLUMNS
 #
 
 Style Column
   Category         Columns
-  Margin           Static
+  Margin           Dynamic
   LatexType        Command
   LatexName        column
   ParSkip          0.5
@@ -675,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
@@ -685,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)"
@@ -708,7 +731,7 @@ Style Columns
     Color          latex
   EndFont
   AutoNests 
-       Standard,Itemize,Enumerate,Description,Pause,Overprint,OverlayArea,Only,Block,
+       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
@@ -718,7 +741,6 @@ Style ColumnsCenterAligned
   CopyStyle        Columns
   LatexParam       [c]
   LabelString      "Columns (center aligned)"
-  LeftMargin       "Columns (center aligned)xx"
   ResetArgs        1
 End
 
@@ -726,7 +748,6 @@ Style ColumnsTopAligned
   CopyStyle        Columns
   LatexParam       [t]
   LabelString      "Columns (top aligned)"
-  LeftMargin       "Columns (top aligned)xx"
   ResetArgs        1
 End
 
@@ -937,7 +958,7 @@ Style Block
     Mandatory      1
     Decoration     conglomerate
     Font
-      Color        blue
+      Color        textlabel1
       Size         large
     EndFont
     AutoInsert     1
@@ -953,7 +974,7 @@ Style ExampleBlock
   LatexName        exampleblock
   LabelString      "Example Block:"
   Font
-    Color          green
+    Color          textlabel2
   EndFont
 End
 
@@ -962,7 +983,7 @@ Style AlertBlock
   LatexName        alertblock
   LabelString      "Alert Block:"
   Font
-    Color          red
+    Color          error
   EndFont
 End
 
@@ -988,12 +1009,16 @@ Style Title
     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
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag       title
+  DocBookTagType   paragraph
+  DocBookInInfo    maybe
 End
 
 Style Title_(Plain_Frame)
@@ -1025,8 +1050,10 @@ Style Subtitle
   Font
     Size           Large
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
+  DocBookTag       subtitle
+  DocBookInInfo    maybe
 End
 
 Style Author
@@ -1048,8 +1075,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
@@ -1071,7 +1103,7 @@ Style Institute
   EndArgument
   Font
     Size           Large
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1091,7 +1123,7 @@ InsetLayout "Flex:InstituteMark"
     Misc           No_Bar
   EndFont
   LabelFont
-    Color          blue
+    Color          textlabel1
     Size           Small
   EndFont
 End
@@ -1115,7 +1147,7 @@ Style Date
   EndArgument
   Font
     Size           Largest
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1135,7 +1167,7 @@ Style TitleGraphic
   Font
     Size           Huge
     Series         Bold
-    Color          Blue
+    Color          textlabel1
   EndFont
 End
 
@@ -1286,7 +1318,7 @@ Style Corollary
    KeepEmpty       1
    LabelFont
      Series        Bold
-     Color         Blue
+     Color         textlabel1
      Size          Large
    EndFont
   Argument 1
@@ -1324,7 +1356,7 @@ Style Example
   LabelString      "Example."
   LabelFont
     Series         Bold
-    Color          Green
+    Color          textlabel2
   EndFont
 End
 
@@ -1395,6 +1427,9 @@ Style LyX-Code
   Font
     Family         Typewriter
   EndFont
+  DocBookTag            programlisting
+  DocBookTagType        paragraph
+  DocBookAttr                  language='lyx'
 End
  
 Style NoteItem
@@ -1481,7 +1516,7 @@ InsetLayout Flex:Alert
   LatexType        command
   LatexName        alert
   Font
-    Color          red
+    Color          error
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1501,7 +1536,7 @@ InsetLayout Flex:Structure
   LatexType        command
   LatexName        structure
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1521,7 +1556,7 @@ InsetLayout Flex:Only
   LatexType        command
   LatexName        only
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1542,7 +1577,7 @@ InsetLayout Flex:Uncover
   LatexType        command
   LatexName        uncover
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1563,7 +1598,7 @@ InsetLayout Flex:Visible
   LatexType        command
   LatexName        visible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1584,7 +1619,7 @@ InsetLayout Flex:Invisible
   LatexType        command
   LatexName        invisible
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1605,7 +1640,7 @@ InsetLayout Flex:Alternative
   LatexType        command
   LatexName        alt
   Font
-    Color          red
+    Color          textlabel3
   EndFont
   Argument 1
     LabelString    "Action"
@@ -1614,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
@@ -1631,7 +1668,7 @@ InsetLayout Flex:Beamer_Note
   LatexName        note
   Decoration       Classic
   Font
-    Color          blue
+    Color          textlabel1
   EndFont
   Argument 1
     LabelString    "Action"