French docs translation updates by Siegfried

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index c2fe2ff4f7bfcad633e67e8b7d3ae5e02f620f87..964158ec4143262c2c632abb6809758e067c19cf 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
 
@@ -60,7 +61,6 @@ Style Itemize
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Itemize
   LabelString      "*"
 End
@@ -80,7 +80,6 @@ Style Enumerate
   BottomSep        0.7
   ParSep           0.3
   Align            Left
-  AlignPossible    Left
   LabelType        Enumerate
 End
 
@@ -92,14 +91,13 @@ Style 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"
 
@@ -118,13 +116,12 @@ Style 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"
 
@@ -147,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}"
@@ -188,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}"
@@ -225,6 +220,7 @@ End
 
 # Frame control definition
 Style BeginFrame
+  TocLevel         4
   KeepEmpty        1
   LatexType        Command
   LatexName        lyxframeend{}\lyxframe
@@ -236,11 +232,10 @@ Style BeginFrame
   BottomSep        0.5
   ParSep           0
   Align            Center
-  AlignPossible    Center
   LabelType        Static
   LabelBottomSep   0
   LeftMargin       M
-  LabelSep         xxx
+  LabelSep         xx
   LabelString      "Frame"
 
   Font
@@ -268,6 +263,7 @@ Style BeginFrame
 End
 
 Style BeginPlainFrame
+  TocLevel          4
   KeepEmpty         1
   LatexType         Command
   LatexName         lyxframeend{}\lyxplainframe
@@ -278,11 +274,10 @@ Style BeginPlainFrame
   BottomSep         0.5
   ParSep            0
   Align             Center
-  AlignPossible     center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
-  LabelSep          xxx
+  LabelSep          xx
   LabelString       "Frame (no head/foot/sidebars)"
 
   Font
@@ -318,11 +313,10 @@ Style AgainFrame
   BottomSep         3
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        M
-  LabelSep          xxx
+  LabelSep          xx
   LabelString       "Again frame with label"
 
   Font
@@ -357,11 +351,10 @@ Style EndFrame
   BottomSep         3
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
-  LabelString       "________________________________" 
+  LabelString       "________________________________"
 
   LabelFont 
     Family          typewriter
@@ -386,7 +379,6 @@ Style FrameSubtitle
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -411,7 +403,7 @@ 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:xx"
 
@@ -431,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
@@ -459,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
@@ -489,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
@@ -524,7 +516,6 @@ Style Pause
   BottomSep         0.25
   ParSep            0
   Align             Center
-  AlignPossible     Center
   LabelType         Static
   LabelBottomSep    0
   LeftMargin        MMMMM
@@ -548,7 +539,7 @@ Style Overprint
   LabelSep         xx
 
   LatexName        overprint
-  LabelString      "Overprint" 
+  LabelString      "Overprint"
 
   ParSkip          0.5
   TopSep           1
@@ -599,7 +590,7 @@ Style Uncover
 
   LatexName        uncoverenv}%{
   LabelSep         xx
-  LabelString      "Uncovered on slides" 
+  LabelString      "Uncovered on slides"
 
   ParSkip          0.5
   TopSep           1
@@ -736,7 +727,6 @@ Style Title
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -749,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
@@ -760,7 +758,6 @@ Style Subtitle
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -784,7 +781,6 @@ Style Author
   BottomSep        0.7
   ParSep           0.7
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -806,7 +802,6 @@ Style Institute
   BottomSep        0.5
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -828,7 +823,6 @@ Style Date
   BottomSep        0.5
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
   OptionalArgs     1
 
@@ -853,7 +847,6 @@ Style Bibliography
   BottomSep        0.7
   ParSep           0.5
   Align            Left
-  AlignPossible    Left
   LabelType        Bibliography
   LabelString      "References"
   LabelBottomSep   0.7
@@ -876,7 +869,6 @@ Style TitleGraphic
   BottomSep        1
   ParSep           1
   Align            Center
-  AlignPossible    Center
   LabelType        No_Label
 
   # standard font definition
@@ -1054,7 +1046,9 @@ End
 
 # Charstyles:
 
-CharStyle Alert
+InsetLayout CharStyle:Alert
+       LyXType charstyle
+       LabelString Alert
   LatexType        Command
   LatexName        alert
   Font
@@ -1063,7 +1057,9 @@ CharStyle Alert
 End
 
 
-CharStyle Structure
+InsetLayout CharStyle:Structure
+       LyXType charstyle
+       LabelString Structure
   LatexType        Command
   LatexName        structure
   Font
@@ -1094,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}}