Properly implement IsTocCaption for Arguments in standard TOC

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index f2611340a8fa64d08d356898b942ad7d705719d1..589d1ea000fdbf4444f48d220f7af02ac43c9b02 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.
 
 
-Format 54
+Format 66
 
 #
 # GLOBAL SETTINGS
@@ -87,6 +87,7 @@ Style Itemize
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument item:1
     LabelString   "Custom Item|s"
@@ -98,6 +99,7 @@ Style Itemize
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   NextNoIndent     1
   ToggleIndent     Never
@@ -121,6 +123,7 @@ Style Enumerate
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Mini Template"
@@ -136,6 +139,7 @@ Style Enumerate
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   NextNoIndent     1
   ToggleIndent     Never
@@ -161,6 +165,7 @@ Style Description
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Longest label|s"
@@ -172,6 +177,7 @@ Style Description
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   NextNoIndent     1
   LeftMargin       MM
@@ -204,11 +210,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
@@ -257,11 +265,13 @@ 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
     Family         Roman
@@ -288,6 +298,7 @@ Style Section*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
 End
@@ -316,11 +327,13 @@ Style Subsection
     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
     Family         Roman
@@ -347,6 +360,7 @@ Style Subsection*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
 End
@@ -375,11 +389,13 @@ 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
     Family         Roman
@@ -406,6 +422,7 @@ Style Subsubsection*
     Tooltip        "Specify in which mode (article, presentation etc.) this header appears"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   LaTeXParam       *
 End
@@ -443,12 +460,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"
@@ -466,7 +485,14 @@ Style Frame
       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
@@ -502,12 +528,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"
@@ -557,6 +585,7 @@ Style FrameTitle
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Short Frame Title|S"
@@ -586,6 +615,7 @@ Style FrameSubtitle
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -646,6 +676,11 @@ Style Columns
     Family         Roman
     Color          latex
   EndFont
+  AutoNests 
+       Standard,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
@@ -714,6 +749,7 @@ Style Overprint
     Tooltip       "Overlay specifications for this item"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
   NextNoIndent     1
@@ -789,6 +825,7 @@ Style Uncover
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -817,6 +854,7 @@ Style Only
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -850,6 +888,7 @@ Style Block
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Block Title"
@@ -862,6 +901,10 @@ Style Block
     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
@@ -1111,6 +1154,7 @@ Style Quotation
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1135,6 +1179,7 @@ Style Quote
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1161,6 +1206,7 @@ Style Verse
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
 
@@ -1196,11 +1242,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
@@ -1319,6 +1369,7 @@ Style NoteItem
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
 End
  
@@ -1342,8 +1393,9 @@ InsetLayout Flex:Bold
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Emphasize
@@ -1360,8 +1412,9 @@ InsetLayout Flex:Emphasize
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Alert
@@ -1378,8 +1431,9 @@ InsetLayout Flex:Alert
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Structure
@@ -1396,8 +1450,9 @@ InsetLayout Flex:Structure
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Only
@@ -1414,9 +1469,10 @@ InsetLayout Flex:Only
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Uncover
@@ -1433,9 +1489,10 @@ InsetLayout Flex:Uncover
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Visible
@@ -1452,9 +1509,10 @@ InsetLayout Flex:Visible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Invisible
@@ -1471,9 +1529,10 @@ InsetLayout Flex:Invisible
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
     AutoInsert     1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Alternative
@@ -1490,13 +1549,14 @@ InsetLayout Flex:Alternative
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
+    PassThru       1
   EndArgument
   Argument 2
     LabelString    "Default Text"
     Tooltip        "Enter the default text here"
     Mandatory      1
   EndArgument
-       ResetsFont true
+  ResetsFont       true
 End
 
 InsetLayout Flex:Beamer_Note
@@ -1514,12 +1574,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
@@ -1530,7 +1591,7 @@ InsetLayout Flex:ArticleMode
    Decoration      classic
    LabelString     Article
    MultiPar        true
-       ResetsFont true
+   ResetsFont      true
 End
 
 InsetLayout Flex:PresentationMode
@@ -1541,7 +1602,7 @@ InsetLayout Flex:PresentationMode
    Decoration      classic
    LabelString     Presentation
    MultiPar        true
-       ResetsFont true
+   ResetsFont      true
 End
 
 
@@ -1549,6 +1610,8 @@ End
 # FLOATS
 #
 
+Input stdfloatnames.inc
+
 Float
   Type             table
   GuiName          Table