include intl/libintl.h that is relative to $TOP_SRCDIR/src

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index fb6622fb4d69e0840518bf78c9f3e6db533e82d6..964158ec4143262c2c632abb6809758e067c19cf 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -5,11 +5,13 @@
 # $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
 
+# Is this needed? Could probably go -- MV 16/05/2007
 Counter
   Name                 figure
   Name                 lyxframeend{}\section
@@ -50,6 +52,7 @@ Style Itemize
   Margin           Static
   LatexType        Item_Environment
   LatexName        itemize
+  OptionalArgs     1
   NextNoIndent     1
   LeftMargin       MMN
   LabelSep         xx
@@ -58,7 +61,6 @@ Style Itemize
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Itemize
   LabelString      "*"
 End
@@ -68,6 +70,7 @@ Style Enumerate
   Margin           Static
   LatexType        Item_Environment
   LatexName        enumerate
+  OptionalArgs     2
   NextNoIndent     1
   LeftMargin       MMN
   LabelSep         xx
@@ -77,7 +80,6 @@ Style Enumerate
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Enumerate
 End
 
@@ -86,16 +88,16 @@ 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
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Manual
   LabelString      "MM"
 
@@ -111,17 +113,17 @@ 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
   ParSep           0.8
   Align            Center
-  Alignpossible    Center
   LabelType        Static
-  LabelString      "Part "
+  LabelString      "Part"
 
   # standard font definition
   Font 
@@ -142,13 +144,12 @@ Style Section
   LatexName        lyxframeend{}\section
   NeedProtect      1
   NextNoIndent     1
-  LabelSep         xxx
+  LabelSep         xx
   ParSkip          0.4
   TopSep           2
   BottomSep        0.25
   ParSep           0.7
   Align            Left
-  AlignPossible    Left
   LabelType        Counter
   LabelCounter     section
   LabelString      "Section \arabic{section}"
@@ -183,13 +184,12 @@ Style Subsection
   LatexName        lyxframeend{}\subsection
   NeedProtect      1
   NextNoIndent     1
-  LabelSep         xxx
+  LabelSep         xx
   ParSkip          0.4
   TopSep           2
   BottomSep        0.25
   ParSep           0.5
   Align            Left
-  AlignPossible    Left
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
@@ -220,9 +220,11 @@ End
 
 # Frame control definition
 Style BeginFrame
+  TocLevel         4
   KeepEmpty        1
   LatexType        Command
   LatexName        lyxframeend{}\lyxframe
+  OptionalArgs     1
   Margin           First_Dynamic
   NextNoIndent     1
   ParSkip          0
@@ -230,11 +232,11 @@ Style BeginFrame
   BottomSep        0.5
   ParSep           0
   Align            Center
-  AlignPossible    Center
   LabelType        Static
   LabelBottomSep   0
   LeftMargin       M
-  LabelString      "Frame "
+  LabelSep         xx
+  LabelString      "Frame"
 
   Font
     Series         Bold
@@ -261,6 +263,7 @@ Style BeginFrame
 End
 
 Style BeginPlainFrame
+  TocLevel          4
   KeepEmpty         1
   LatexType         Command
   LatexName         lyxframeend{}\lyxplainframe
@@ -271,11 +274,11 @@ Style BeginPlainFrame
   BottomSep         0.5
   ParSep            0
   Align             Center
-  AlignPossible     center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
-  LabelString       "Frame (no head/foot/sidebars)__"
+  LabelSep          xx
+  LabelString       "Frame (no head/foot/sidebars)"
 
   Font
     Series          Bold
@@ -302,6 +305,7 @@ Style AgainFrame
   KeepEmpty         0
   LatexType         Command
   LatexName         lyxframeend{}\lyxagainframe
+  OptionalArgs      2
   Margin            First_Dynamic
   NextNoIndent      1
   ParSkip           0
@@ -309,11 +313,11 @@ Style AgainFrame
   BottomSep         3
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
-  LabelString       "Again frame with label__"
+  LabelSep          xx
+  LabelString       "Again frame with label"
 
   Font
     Color           latex
@@ -347,11 +351,10 @@ Style EndFrame
   BottomSep         3
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
-  LabelString       "________________________________" 
+  LabelString       "________________________________"
 
   LabelFont 
     Family          typewriter
@@ -376,7 +379,6 @@ Style FrameSubtitle
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -401,9 +403,9 @@ Style Column
   Align            Left
   LabelType        Static
   LabelSep         xx
-  LabelString      "start column of width:" 
+  LabelString      "Start column (increase depth!), width:"
   OptionalArgs     1
-  LeftMargin       "start column of width:"
+  LeftMargin       "Start column (increase depth!), width:xx"
 
   # standard font definition
   LabelFont 
@@ -414,7 +416,6 @@ End
 
 
 Style Columns
-
   KeepEmpty        1
   Margin           Static
   LatexType        Environment
@@ -422,11 +423,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
@@ -450,11 +451,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
@@ -480,11 +481,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
@@ -508,13 +509,13 @@ Style Pause
   LatexType         Command
   LatexName         pause
   Margin            First_Dynamic
+  OptionalArgs      1
   NextNoIndent      1
   ParSkip           0
   TopSep            0
   BottomSep         0.25
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
@@ -538,7 +539,7 @@ Style Overprint
   LabelSep         xx
 
   LatexName        overprint
-  LabelString      "overprint" 
+  LabelString      "Overprint"
 
   ParSkip          0.5
   TopSep           1
@@ -564,7 +565,7 @@ Style OverlayArea
   LabelSep         xx
 
   LatexName        overlayarea
-  LabelString      "overlayarea"
+  LabelString      "Overlayarea"
 
   ParSkip          0.5
   TopSep           1
@@ -588,7 +589,8 @@ Style Uncover
   LabelType        Static
 
   LatexName        uncoverenv}%{
-  LabelString      "uncovered on slides " 
+  LabelSep         xx
+  LabelString      "Uncovered on slides"
 
   ParSkip          0.5
   TopSep           1
@@ -612,7 +614,8 @@ Style Only
   LabelType        Static
 
   LatexName        onlyenv}%{
-  LabelString      "only on slides_"
+  LabelSep         xx
+  LabelString      "Only on slides"
 
   ParSkip          0.5
   TopSep           1
@@ -638,7 +641,7 @@ Style Block
   LabelSep         xx
 
   LatexName        block
-  LabelString      "block ( ERT[{title}] body ): "
+  LabelString      "Block ( ERT[{title}] body ):"
 
   ParSkip          0.5
   TopSep           1
@@ -663,7 +666,7 @@ Style ExampleBlock
   LabelSep         xx
 
   LatexName        exampleblock
-  LabelString      "block ( ERT[{title}] example text ): "
+  LabelString      "Block ( ERT[{title}] example text ):"
 
   ParSkip          0.5
   TopSep           1
@@ -692,7 +695,7 @@ Style AlertBlock
   LabelSep         xx
 
   LatexName        alertblock
-  LabelString      "block ( ERT[{title}] alert text ): "
+  LabelString      "Block ( ERT[{title}] alert text ):"
 
   ParSkip          0.5
   TopSep           1
@@ -724,7 +727,6 @@ Style Title
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -737,6 +739,14 @@ Style Title
 
 End
 
+Style Title_(Plain_Frame)
+  CopyStyle        Title
+  Preamble
+     % plain title style, override default
+     \renewcommand\makebeamertitle{\frame[plain]{\maketitle}}%
+  EndPreamble
+End
+
 Style Subtitle
   Margin           Static
   LatexType        Command
@@ -748,7 +758,6 @@ Style Subtitle
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -767,13 +776,11 @@ Style Author
   LatexType        Command
   InTitle          1
   LatexName        author
-  LabelSep         xxx
   ParSkip          0.4
   TopSep           1.3
   BottomSep        0.7
   ParSep           0.7
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -790,13 +797,11 @@ Style Institute
   LatexType        Command
   InTitle          1
   LatexName        institute
-  LabelSep         xxx
   ParSkip          0.4
   TopSep           0.9
   BottomSep        0.5
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -813,13 +818,11 @@ Style Date
   LatexType        Command
   InTitle          1
   LatexName        date
-  LabelSep         xxx
   ParSkip          0.4
   TopSep           0.9
   BottomSep        0.5
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -844,7 +847,6 @@ Style Bibliography
   BottomSep        0.7
   ParSep           0.5
   Align            Left
-  AlignPossible    Left
   LabelType        Bibliography
   LabelString      "References"
   LabelBottomSep   0.7
@@ -867,7 +869,6 @@ Style TitleGraphic
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
 
   # standard font definition
@@ -891,7 +892,7 @@ Style Corollary
    LabelSep        xx
 
    LatexName       corollary}%{
-   LabelString     "Corollary_"
+   LabelString     "Corollary."
  
    ParSkip         0.5
    TopSep          1
@@ -911,19 +912,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
@@ -934,26 +935,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
@@ -1029,9 +1030,9 @@ Style NoteItem
   Align            Left
   LabelType        Static
   LabelSep         xx
-  LabelString      "note: "
+  LabelString      "Note:"
   OptionalArgs     1
-  LeftMargin       MMM
+  LeftMargin       "Note:xx"
  
   # standard font definition
   LabelFont 
@@ -1045,7 +1046,9 @@ End
 
 # Charstyles:
 
-CharStyle Alert
+InsetLayout CharStyle:Alert
+       LyXType charstyle
+       LabelString Alert
   LatexType        Command
   LatexName        alert
   Font
@@ -1054,7 +1057,9 @@ CharStyle Alert
 End
 
 
-CharStyle Structure
+InsetLayout CharStyle:Structure
+       LyXType charstyle
+       LabelString Structure
   LatexType        Command
   LatexName        structure
   Font
@@ -1085,10 +1090,13 @@ Float
   LaTeXBuiltin     true
 End
 
-TitleLaTeXName frame{\maketitle}
-
+# to give users the choice of a title frame with and without
+# head-/footline, we define our own maketitle command
+TitleLaTeXName makebeamertitle
 
 Preamble
+  % this default might be overridden by plain title style
+  \newcommand\makebeamertitle{\frame{\maketitle}}%
   \AtBeginDocument{
     \let\origtableofcontents=\tableofcontents
     \def\tableofcontents{\@ifnextchar[{\origtableofcontents}{\gobbletableofcontents}}