Change LFUN_FONT_CODE to LFUN_FONT_TYPEWERITER, possibly in preparation for a move...

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 9ceb3f1404c3ec67e16e6ea85650925590c8b15b..b2b5f7e4f8b9fae86769bf68874ac430b5dde0c4 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -5,8 +5,9 @@
 # $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $
 
 # Includes
-Format 4
+Format 5
 Input stdcounters.inc
+Input stdinsets.inc
 
 # local counters
 
@@ -51,6 +52,7 @@ Style Itemize
   Margin           Static
   LatexType        Item_Environment
   LatexName        itemize
+  OptionalArgs     1
   NextNoIndent     1
   LeftMargin       MMN
   LabelSep         xx
@@ -69,6 +71,7 @@ Style Enumerate
   Margin           Static
   LatexType        Item_Environment
   LatexName        enumerate
+  OptionalArgs     2
   NextNoIndent     1
   LeftMargin       MMN
   LabelSep         xx
@@ -87,9 +90,10 @@ Style Description
   Margin           First_Dynamic
   LatexType        Item_environment
   LatexName        description
+  OptionalArgs     2
   NextNoIndent     1
   LeftMargin       MM
-  LabelSep         xxx
+  LabelSep         xx
   ParSkip          0.4
   ItemSep          0.2
   TopSep           0.7
@@ -112,9 +116,10 @@ Style Part
   Margin           Dynamic
   LatexType        Command
   LatexName        part
+  OptionalArgs     1
   NeedProtect      1
   NextNoIndent     1
-  Labelsep         xxx
+  Labelsep         xx
   ParSkip          0.4
   TopSep           4
   BottomSep        4
@@ -122,7 +127,7 @@ Style Part
   Align            Center
   Alignpossible    Center
   LabelType        Static
-  LabelString      "Part "
+  LabelString      "Part"
 
   # standard font definition
   Font 
@@ -143,7 +148,7 @@ Style Section
   LatexName        lyxframeend{}\section
   NeedProtect      1
   NextNoIndent     1
-  LabelSep         xxx
+  LabelSep         xx
   ParSkip          0.4
   TopSep           2
   BottomSep        0.25
@@ -184,7 +189,7 @@ Style Subsection
   LatexName        lyxframeend{}\subsection
   NeedProtect      1
   NextNoIndent     1
-  LabelSep         xxx
+  LabelSep         xx
   ParSkip          0.4
   TopSep           2
   BottomSep        0.25
@@ -224,6 +229,7 @@ Style BeginFrame
   KeepEmpty        1
   LatexType        Command
   LatexName        lyxframeend{}\lyxframe
+  OptionalArgs     1
   Margin           First_Dynamic
   NextNoIndent     1
   ParSkip          0
@@ -235,7 +241,8 @@ Style BeginFrame
   LabelType        Static
   LabelBottomSep   0
   LeftMargin       M
-  LabelString      "Frame "
+  LabelSep         xx
+  LabelString      "Frame"
 
   Font
     Series         Bold
@@ -276,7 +283,8 @@ Style BeginPlainFrame
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
-  LabelString       "Frame (no head/foot/sidebars)__"
+  LabelSep          xx
+  LabelString       "Frame (no head/foot/sidebars)"
 
   Font
     Series          Bold
@@ -303,6 +311,7 @@ Style AgainFrame
   KeepEmpty         0
   LatexType         Command
   LatexName         lyxframeend{}\lyxagainframe
+  OptionalArgs      2
   Margin            First_Dynamic
   NextNoIndent      1
   ParSkip           0
@@ -314,7 +323,8 @@ Style AgainFrame
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
-  LabelString       "Again frame with label__"
+  LabelSep          xx
+  LabelString       "Again frame with label"
 
   Font
     Color           latex
@@ -352,7 +362,7 @@ Style EndFrame
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
-  LabelString       "________________________________" 
+  LabelString       "________________________________"
 
   LabelFont 
     Family          typewriter
@@ -402,9 +412,9 @@ Style Column
   Align            Left
   LabelType        Static
   LabelSep         xx
-  LabelString      "start column (increase depth!), width:" 
+  LabelString      "Start column (increase depth!), width:"
   OptionalArgs     1
-  LeftMargin       "start column (increase depth!), width:"
+  LeftMargin       "Start column (increase depth!), width:xx"
 
   # standard font definition
   LabelFont 
@@ -415,7 +425,6 @@ End
 
 
 Style Columns
-
   KeepEmpty        1
   Margin           Static
   LatexType        Environment
@@ -423,11 +432,11 @@ Style Columns
   ParIndent        MM
   Align            Left
   LabelType        Static
-  LabelSep         x
+  LabelSep         xx
 
   LatexName        columns}%{
-  LabelString      "columns" 
-  LeftMargin       "columnsx"
+  LabelString      "Columns"
+  LeftMargin       "Columnsxx"
 
   ParSkip          0.5
   TopSep           1
@@ -451,11 +460,11 @@ Style ColumnsCenterAligned
   ParIndent        MM
   Align            left
   LabelType        Static
-  LabelSep         x
+  LabelSep         xx
 
   LatexName        centercolumns}%{
-  LabelString      "columns (center aligned)" 
-  LeftMargin       "columns (center aligned) x"
+  LabelString      "Columns (center aligned)"
+  LeftMargin       "Columns (center aligned)xx"
 
   ParSkip          0.5
   TopSep           1
@@ -481,11 +490,11 @@ Style ColumnsTopAligned
   ParIndent        MM
   Align            left
   LabelType        Static
-  LabelSep         x
+  LabelSep         xx
 
   LatexName        topcolumns}%{
-  LabelString      "columns (top aligned)" 
-  LeftMargin       "columns (top aligned) x"
+  LabelString      "Columns (top aligned)"
+  LeftMargin       "Columns (top aligned)xx"
 
   ParSkip          0.5
   TopSep           1
@@ -509,6 +518,7 @@ Style Pause
   LatexType         Command
   LatexName         pause
   Margin            First_Dynamic
+  OptionalArgs      1
   NextNoIndent      1
   ParSkip           0
   TopSep            0
@@ -539,7 +549,7 @@ Style Overprint
   LabelSep         xx
 
   LatexName        overprint
-  LabelString      "overprint" 
+  LabelString      "Overprint"
 
   ParSkip          0.5
   TopSep           1
@@ -565,7 +575,7 @@ Style OverlayArea
   LabelSep         xx
 
   LatexName        overlayarea
-  LabelString      "overlayarea"
+  LabelString      "Overlayarea"
 
   ParSkip          0.5
   TopSep           1
@@ -589,7 +599,8 @@ Style Uncover
   LabelType        Static
 
   LatexName        uncoverenv}%{
-  LabelString      "uncovered on slides " 
+  LabelSep         xx
+  LabelString      "Uncovered on slides"
 
   ParSkip          0.5
   TopSep           1
@@ -613,7 +624,8 @@ Style Only
   LabelType        Static
 
   LatexName        onlyenv}%{
-  LabelString      "only on slides_"
+  LabelSep         xx
+  LabelString      "Only on slides"
 
   ParSkip          0.5
   TopSep           1
@@ -639,7 +651,7 @@ Style Block
   LabelSep         xx
 
   LatexName        block
-  LabelString      "block ( ERT[{title}] body ): "
+  LabelString      "Block ( ERT[{title}] body ):"
 
   ParSkip          0.5
   TopSep           1
@@ -664,7 +676,7 @@ Style ExampleBlock
   LabelSep         xx
 
   LatexName        exampleblock
-  LabelString      "block ( ERT[{title}] example text ): "
+  LabelString      "Block ( ERT[{title}] example text ):"
 
   ParSkip          0.5
   TopSep           1
@@ -693,7 +705,7 @@ Style AlertBlock
   LabelSep         xx
 
   LatexName        alertblock
-  LabelString      "block ( ERT[{title}] alert text ): "
+  LabelString      "Block ( ERT[{title}] alert text ):"
 
   ParSkip          0.5
   TopSep           1
@@ -768,7 +780,6 @@ Style Author
   LatexType        Command
   InTitle          1
   LatexName        author
-  LabelSep         xxx
   ParSkip          0.4
   TopSep           1.3
   BottomSep        0.7
@@ -791,7 +802,6 @@ Style Institute
   LatexType        Command
   InTitle          1
   LatexName        institute
-  LabelSep         xxx
   ParSkip          0.4
   TopSep           0.9
   BottomSep        0.5
@@ -814,7 +824,6 @@ Style Date
   LatexType        Command
   InTitle          1
   LatexName        date
-  LabelSep         xxx
   ParSkip          0.4
   TopSep           0.9
   BottomSep        0.5
@@ -892,7 +901,7 @@ Style Corollary
    LabelSep        xx
 
    LatexName       corollary}%{
-   LabelString     "Corollary_"
+   LabelString     "Corollary."
  
    ParSkip         0.5
    TopSep          1
@@ -912,19 +921,19 @@ End
 Style Definition
   CopyStyle        Corollary
   LatexName        definition}%{
-  LabelString      "Definition. "
+  LabelString      "Definition."
 End
 
 Style Definitions
   CopyStyle        Corollary
   LatexName        definitions}%{
-  LabelString      "Definitions. "
+  LabelString      "Definitions."
 End
 
 Style Example
   CopyStyle        Corollary
   LatexName        example}%{
-  LabelString      "Example. "
+  LabelString      "Example."
 
   LabelFont
     Series         Bold
@@ -935,26 +944,26 @@ End
 Style Examples
   CopyStyle        Corollary
   LatexName        examples}%{
-  LabelString      "Examples. "
+  LabelString      "Examples."
 End
 
 
 Style Fact
   CopyStyle        Corollary
   LatexName        fact}%{
-  LabelString      "Fact. "
+  LabelString      "Fact."
 End
 
 Style Proof
   CopyStyle        Corollary
   LatexName        proof}%{
-  LabelString      "Proof. "
+  LabelString      "Proof."
 End
 
 Style Theorem
   CopyStyle        Corollary
   LatexName        theorem}%{
-  LabelString      "Theorem. "
+  LabelString      "Theorem."
 End
 
 # Misc. section
@@ -1030,9 +1039,9 @@ Style NoteItem
   Align            Left
   LabelType        Static
   LabelSep         xx
-  LabelString      "note: "
+  LabelString      "Note:"
   OptionalArgs     1
-  LeftMargin       MMM
+  LeftMargin       "Note:xx"
  
   # standard font definition
   LabelFont 
@@ -1046,7 +1055,9 @@ End
 
 # Charstyles:
 
-CharStyle Alert
+InsetLayout CharStyle:Alert
+       LyXType charstyle
+       LabelString Alert
   LatexType        Command
   LatexName        alert
   Font
@@ -1055,7 +1066,9 @@ CharStyle Alert
 End
 
 
-CharStyle Structure
+InsetLayout CharStyle:Structure
+       LyXType charstyle
+       LabelString Structure
   LatexType        Command
   LatexName        structure
   Font