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 b2b5f7e4f8b9fae86769bf68874ac430b5dde0c4..964158ec4143262c2c632abb6809758e067c19cf 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -61,7 +61,6 @@ Style Itemize
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Itemize
   LabelString      "*"
 End
@@ -81,7 +80,6 @@ Style Enumerate
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Enumerate
 End
 
@@ -100,7 +98,6 @@ Style Description
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Manual
   LabelString      "MM"
 
@@ -125,7 +122,6 @@ Style Part
   BottomSep        4
   ParSep           0.8
   Align            Center
-  Alignpossible    Center
   LabelType        Static
   LabelString      "Part"
 
@@ -154,7 +150,6 @@ Style Section
   BottomSep        0.25
   ParSep           0.7
   Align            Left
-  AlignPossible    Left
   LabelType        Counter
   LabelCounter     section
   LabelString      "Section \arabic{section}"
@@ -195,7 +190,6 @@ Style Subsection
   BottomSep        0.25
   ParSep           0.5
   Align            Left
-  AlignPossible    Left
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
@@ -226,6 +220,7 @@ End
 
 # Frame control definition
 Style BeginFrame
+  TocLevel         4
   KeepEmpty        1
   LatexType        Command
   LatexName        lyxframeend{}\lyxframe
@@ -237,7 +232,6 @@ Style BeginFrame
   BottomSep        0.5
   ParSep           0
   Align            Center
-  AlignPossible    Center
   LabelType        Static
   LabelBottomSep   0
   LeftMargin       M
@@ -269,6 +263,7 @@ Style BeginFrame
 End
 
 Style BeginPlainFrame
+  TocLevel          4
   KeepEmpty         1
   LatexType         Command
   LatexName         lyxframeend{}\lyxplainframe
@@ -279,7 +274,6 @@ Style BeginPlainFrame
   BottomSep         0.5
   ParSep            0
   Align             Center
-  AlignPossible     center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
@@ -319,7 +313,6 @@ Style AgainFrame
   BottomSep         3
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
@@ -358,7 +351,6 @@ Style EndFrame
   BottomSep         3
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
@@ -387,7 +379,6 @@ Style FrameSubtitle
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -525,7 +516,6 @@ Style Pause
   BottomSep         0.25
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
@@ -737,7 +727,6 @@ Style Title
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -750,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
@@ -761,7 +758,6 @@ Style Subtitle
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -785,7 +781,6 @@ Style Author
   BottomSep        0.7
   ParSep           0.7
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -807,7 +802,6 @@ Style Institute
   BottomSep        0.5
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -829,7 +823,6 @@ Style Date
   BottomSep        0.5
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -854,7 +847,6 @@ Style Bibliography
   BottomSep        0.7
   ParSep           0.5
   Align            Left
-  AlignPossible    Left
   LabelType        Bibliography
   LabelString      "References"
   LabelBottomSep   0.7
@@ -877,7 +869,6 @@ Style TitleGraphic
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
 
   # standard font definition
@@ -1099,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}}