Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 6e0be1b64cc08b73d7a3c020a831c58416fd984b..b65b876be01e8c1e8bfb8760e4d0892ef7c5e174 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -6,7 +6,7 @@
 #   Richard Heck <rgheck@lyx.org>, Martin Vermeer <martin.vermeer@hut.fi> and probably others.
 
 
-Format 45
+Format 62
 
 #
 # GLOBAL SETTINGS
@@ -83,7 +83,7 @@ Style Itemize
   LatexType        Item_Environment
   LatexName        itemize
   Argument 1
-    LabelString    "Overlay Specifications|S"
+    LabelString    "Overlay Specifications|v"
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
@@ -100,6 +100,7 @@ Style Itemize
     RightDelim     >
   EndArgument
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MMN
   LabelSep         xx
   ItemSep          0.2
@@ -116,7 +117,7 @@ Style Enumerate
   LatexType        Item_Environment
   LatexName        enumerate
   Argument 1
-    LabelString    "Overlay Specifications|S"
+    LabelString    "Overlay Specifications|v"
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
@@ -137,6 +138,7 @@ Style Enumerate
     RightDelim     >
   EndArgument
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MMN
   LabelSep         xx
   ParSkip          0.0
@@ -155,7 +157,7 @@ Style Description
   LatexType        Item_environment
   LatexName        description
   Argument 1
-    LabelString    "Overlay Specifications|S"
+    LabelString    "Overlay Specifications|v"
     Tooltip        "Overlay specifications for this list"
     LeftDelim      [<
     RightDelim     >]
@@ -181,7 +183,7 @@ Style Description
   ParSep           0.3
   Align            Left
   LabelType        Manual
-  LabelFont 
+  LabelFont
     Series         Bold
   EndFont
 End
@@ -206,9 +208,11 @@ Style Part
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The part as it appears in the table of contents/running headers"
+    InsertCotext   1
   EndArgument
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   Labelsep         xx
   ParSkip          0.4
   TopSep           4
@@ -218,7 +222,7 @@ Style Part
   LabelType        Static
   LabelString      "Part"
   RefPrefix        part
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           Huge
@@ -226,7 +230,7 @@ Style Part
   LabelFont
     Color          Latex
   EndFont
-  TocLevel         0
+  TocLevel         -1
 End
 
 Style Section
@@ -236,6 +240,7 @@ Style Section
   LatexName        section
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   LabelSep         xx
   ParSkip          0.4
   TopSep           2
@@ -256,13 +261,14 @@ Style Section
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The section as it appears in the table of contents/running headers"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           huge
   EndFont
-  LabelFont 
+  LabelFont
     Color          latex
   EndFont
   LabelStringAppendix "\Alph{section}"
@@ -293,6 +299,7 @@ Style Subsection
   LatexName        subsection
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   LabelSep         xx
   ParSkip          0.4
   TopSep           2
@@ -302,7 +309,7 @@ Style Subsection
   LabelType        Static
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
-  RefPrefix        sub
+  RefPrefix        subsec
   Argument 1
     LabelString    "Mode"
     MenuString     "Mode Specification|S"
@@ -313,13 +320,14 @@ Style Subsection
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The subsection as it appears in the table of contents/running headers"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           larger
   EndFont
-  LabelFont 
+  LabelFont
     Color          latex
   EndFont
   LabelStringAppendix "\arabic{section}.\arabic{subsection}"
@@ -350,6 +358,7 @@ Style Subsubsection
   LatexName        subsubsection
   NeedProtect      1
   NextNoIndent     1
+  ToggleIndent     Never
   LabelSep         xx
   ParSkip          0.4
   TopSep           2
@@ -370,13 +379,14 @@ Style Subsubsection
   Argument 2
     LabelString    "Short Title|S"
     Tooltip        "The subsubsection as it appears in the table of contents/running headers"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Family         Roman
     Series         Bold
     Size           large
   EndFont
-  LabelFont 
+  LabelFont
     Color          latex
   EndFont
   LabelStringAppendix "\arabic{section}.\arabic{subsection}.\arabic{subsubsection}"
@@ -407,10 +417,11 @@ End
 
 Style Frame
   Category         Frames
-  Margin           Dynamic
+  Margin           First_Dynamic
+  LeftMargin       xx
   LatexType        Environment
   LatexName        frame
-  LabelString      "Frame"  
+  LabelString      "Frame"
   TocLevel         4
   KeepEmpty        1
   NextNoIndent     1
@@ -428,7 +439,7 @@ Style Frame
   EndFont
   Argument 1
     LabelString     "Action"
-    MenuString      "Overlay Specifications|S"
+    MenuString      "Overlay Specifications|v"
     Tooltip         "Overlay specifications for this frame"
     LeftDelim       <
     RightDelim      >
@@ -487,7 +498,7 @@ Style AgainFrame
   LatexName         againframe
   Argument 1
     LabelString     "Slide"
-    MenuString      "Overlay Specifications|S"
+    MenuString      "Overlay Specifications|v"
     Tooltip         "Overlay specifications for this frame"
     LeftDelim       <
     RightDelim      >
@@ -517,7 +528,7 @@ Style AgainFrame
   Font
     Color           latex
   EndFont
-  LabelFont 
+  LabelFont
     Family          Roman
     Color           latex
     Size            Largest
@@ -536,13 +547,13 @@ Style FrameTitle
   ParSep           1
   Align            Block
   LabelType        No_Label
-  Font 
+  Font
     Color          Blue
     Size           Largest
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -550,6 +561,7 @@ Style FrameTitle
   Argument 2
     LabelString    "Short Frame Title|S"
     Tooltip        "A short form of the frame title used in some themes"
+    InsertCotext   1
   EndArgument
 End
 
@@ -565,12 +577,12 @@ Style FrameSubtitle
   ParSep           1
   Align            Block
   LabelType        No_Label
-  Font 
+  Font
     Color          Blue
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -596,13 +608,14 @@ Style Column
   LabelType        Static
   LabelSep         xx
   LabelString      "Start column (increase depth!), width:"
+  ToggleIndent     Never
   Argument 1
     MenuString     "Column Options"
     LabelString    "Options"
     Tooltip        "Column options (see beamer manual)"
   EndArgument
   LeftMargin       "Start column (increase depth!), width:xx"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -629,7 +642,7 @@ Style Columns
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -713,7 +726,7 @@ Style Overprint
   Align            Left
   LabelType        Static
   LabelString      "Overprint"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -734,7 +747,7 @@ Style OverlayArea
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
@@ -766,13 +779,13 @@ Style Uncover
   TopSep           1
   BottomSep        1
   ParSep           0
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          Latex
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -800,7 +813,7 @@ Style Only
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -890,8 +903,9 @@ Style Title
   Argument 1
     LabelString   "Short Title|S"
     Tooltip       "Short title which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Huge
     Series         Bold
     Color          Blue
@@ -922,8 +936,9 @@ Style Subtitle
   Argument 1
     LabelString   "Short Subtitle|S"
     Tooltip       "Short subtitle which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Large
     Series         Bold
     Color          Blue
@@ -945,8 +960,9 @@ Style Author
   Argument 1
     LabelString   "Short Author|S"
     Tooltip       "Short author which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Largest
     Color          Blue
   EndFont
@@ -967,8 +983,9 @@ Style Institute
   Argument 1
     LabelString   "Short Institute|S"
     Tooltip       "Short institute which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Large
     Color          Blue
   EndFont
@@ -1010,8 +1027,9 @@ Style Date
   Argument 1
     LabelString   "Short Date|S"
     Tooltip       "Short date which appears in the sidebar/header"
+    InsertCotext   1
   EndArgument
-  Font 
+  Font
     Size           Largest
     Color          Blue
   EndFont
@@ -1030,7 +1048,7 @@ Style TitleGraphic
   ParSep           1
   Align            Center
   LabelType        No_Label
-  Font 
+  Font
     Size           Huge
     Series         Bold
     Color          Blue
@@ -1048,6 +1066,7 @@ Style Bibliography
   LatexType        Bib_Environment
   LatexName        thebibliography
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MM
   ParSkip          0.4
   ItemSep          0
@@ -1058,7 +1077,7 @@ Style Bibliography
   LabelType        Bibliography
   LabelString      "References"
   LabelBottomSep   0.7
-  LabelFont 
+  LabelFont
     Series         Bold
     Size           Larger
   EndFont
@@ -1075,6 +1094,7 @@ Style Quotation
   LatexType        Environment
   LatexName        quotation
   NextNoIndent     1
+  ToggleIndent     Always
   LeftMargin       MMM
   RightMargin      MMM
   ParIndent        MM
@@ -1087,7 +1107,7 @@ Style Quotation
   AlignPossible    Block, Left, Right, Center
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -1100,6 +1120,7 @@ Style Quote
   LatexType        Environment
   LatexName        quote
   NextNoIndent     1
+  ToggleIndent     Never
   LeftMargin       MMM
   RightMargin      MMM
   TopSep           0.5
@@ -1110,7 +1131,7 @@ Style Quote
   LabelType        No_Label
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -1136,7 +1157,7 @@ Style Verse
   LabelType        No_Label
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -1216,6 +1237,12 @@ Style Fact
   LabelString      "Fact."
 End
 
+Style Lemma
+  CopyStyle        Corollary
+  LatexName        lemma
+  LabelString      "Lemma."
+End
+
 Style Proof
   CopyStyle        Corollary
   LatexName        proof
@@ -1233,29 +1260,6 @@ End
 # MISC.
 #
 
-Style Separator
-  Category         MainText
-  LatexType        Paragraph
-  LatexName        dummy
-  ParIndent        MM
-  ParSkip          0.4
-  Align            Left
-  AlignPossible    Block, Left, Right, Center
-  Margin           First_Dynamic
-  TopSep           0
-  BottomSep        0
-  ParSep           0
-  LabelType        Static
-  LabelBottomSep   0
-  LabelString      "___"
-  KeepEmpty        1
-  LabelFont 
-    Series         Medium
-    Size           Normal
-    Color          latex
-  EndFont
-End
- 
 Style LyX-Code
   Category         MainText
   Margin           Static
@@ -1285,7 +1289,7 @@ Style LyX-Code
      \item[]}
     {\end{list}}
   EndPreamble
-  Font 
+  Font
     Family         Typewriter
   EndFont
 End
@@ -1305,13 +1309,13 @@ Style NoteItem
   LabelSep         xx
   LabelString      "Note:"
   LeftMargin       "Note:xx"
-  LabelFont 
+  LabelFont
     Family         Roman
     Color          latex
   EndFont
   Argument 1
     LabelString    "On Slide"
-    MenuString     "Overlay Specifications|S"
+    MenuString     "Overlay Specifications|v"
     Tooltip        "Specify the overlay settings (see beamer manual)"
     LeftDelim      <
     RightDelim     >
@@ -1339,6 +1343,7 @@ InsetLayout Flex:Bold
     LeftDelim      <
     RightDelim     >
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Emphasize
@@ -1356,6 +1361,7 @@ InsetLayout Flex:Emphasize
     LeftDelim      <
     RightDelim     >
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Alert
@@ -1373,6 +1379,7 @@ InsetLayout Flex:Alert
     LeftDelim      <
     RightDelim     >
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Structure
@@ -1390,6 +1397,7 @@ InsetLayout Flex:Structure
     LeftDelim      <
     RightDelim     >
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Only
@@ -1408,6 +1416,7 @@ InsetLayout Flex:Only
     RightDelim     >
     AutoInsert     1
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Uncover
@@ -1426,6 +1435,7 @@ InsetLayout Flex:Uncover
     RightDelim     >
     AutoInsert     1
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Visible
@@ -1444,6 +1454,7 @@ InsetLayout Flex:Visible
     RightDelim     >
     AutoInsert     1
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Invisible
@@ -1462,6 +1473,7 @@ InsetLayout Flex:Invisible
     RightDelim     >
     AutoInsert     1
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Alternative
@@ -1484,6 +1496,7 @@ InsetLayout Flex:Alternative
     Tooltip        "Enter the default text here"
     Mandatory      1
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:Beamer_Note
@@ -1506,6 +1519,7 @@ InsetLayout Flex:Beamer_Note
     LabelString    "Note Options"
     Tooltip        "Specifiy note options (see beamer manual)"
   EndArgument
+       ResetsFont true
 End
 
 InsetLayout Flex:ArticleMode
@@ -1516,6 +1530,7 @@ InsetLayout Flex:ArticleMode
    Decoration      classic
    LabelString     Article
    MultiPar        true
+       ResetsFont true
 End
 
 InsetLayout Flex:PresentationMode
@@ -1526,6 +1541,7 @@ InsetLayout Flex:PresentationMode
    Decoration      classic
    LabelString     Presentation
    MultiPar        true
+       ResetsFont true
 End