Use footnotehyper rather than footnote if hyperref is used

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index cd6ef4fefef790254cd475ca547083234d652a37..8500d89e8fcb3d51ff4dffb0c0c5125a1df6f210 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 63
+Format 68
 
 #
 # GLOBAL SETTINGS
@@ -216,6 +216,7 @@ Style Part
     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
@@ -270,6 +271,7 @@ Style Section
     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
@@ -331,6 +333,7 @@ Style Subsection
     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
@@ -392,6 +395,7 @@ Style Subsubsection
     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
@@ -481,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
@@ -550,6 +561,7 @@ Style AgainFrame
     Color           latex
     Size            Largest
   EndFont
+  TocLevel          4
 End
 
 Style FrameTitle
@@ -665,6 +677,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
@@ -885,6 +902,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
@@ -1104,6 +1125,8 @@ Style Bibliography
     Series         Bold
     Size           Larger
   EndFont
+  TocLevel         1
+  IsTocCaption     0
 End
 
 
@@ -1228,6 +1251,9 @@ Style Corollary
     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
@@ -1373,6 +1399,7 @@ InsetLayout Flex:Bold
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Emphasize
@@ -1392,6 +1419,7 @@ InsetLayout Flex:Emphasize
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alert
@@ -1411,6 +1439,7 @@ InsetLayout Flex:Alert
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Structure
@@ -1430,6 +1459,7 @@ InsetLayout Flex:Structure
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Only
@@ -1450,6 +1480,7 @@ InsetLayout Flex:Only
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Uncover
@@ -1470,6 +1501,7 @@ InsetLayout Flex:Uncover
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Visible
@@ -1490,6 +1522,7 @@ InsetLayout Flex:Visible
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Invisible
@@ -1510,6 +1543,7 @@ InsetLayout Flex:Invisible
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alternative
@@ -1534,6 +1568,7 @@ InsetLayout Flex:Alternative
     Mandatory      1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Beamer_Note
@@ -1587,6 +1622,8 @@ End
 # FLOATS
 #
 
+Input stdfloatnames.inc
+
 Float
   Type             table
   GuiName          Table