Fix a bug involving module conflicts. We need to check not only that we

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

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 4ced45a79d23b33e5148bf9c03b7b358796947b0..3d4ab4916ffa88df5616ae5e5c85e56e892a1504 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -5,15 +5,14 @@
 # $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 2004/10/07 20:53:07 tantau Exp $
 
 # Includes
-Format 7
+Format 10
 Input stdcounters.inc
 Input stdinsets.inc
 
 # local counters
 
 # Is this needed? Could probably go -- MV 16/05/2007
-Counter
-  Name                 figure
+Counter figure
   Name                 lyxframeend{}\section
 End
 
@@ -891,6 +890,62 @@ Style Bibliography
   EndFont
 End
 
+Style Quotation
+  Category         MainText
+  Margin           Static
+  LatexType        Environment
+  LatexName        quotation}%{
+  NextNoIndent     1
+  LeftMargin       MMM
+  RightMargin      MMM
+  ParIndent        MM
+  ParSkip          0
+  ItemSep          0
+  TopSep           0.5
+  BottomSep        0.5
+  ParSep           0
+  Align            Block
+  AlignPossible    Block, Left, Right, Center
+End
+
+
+Style Quote
+  Category         MainText
+  Margin           Static
+  LatexType        Environment
+  LatexName        quote}%{
+  NextNoIndent     1
+  LeftMargin       MMM
+  RightMargin      MMM
+  TopSep           0.5
+  ParSep           0.5
+  BottomSep        0.5
+  Align            Block
+  AlignPossible    Block, Left, Right, Center
+  LabelType        No_Label
+End
+
+
+Style Verse
+  # LaTeX type is first dynamic because of LaTeX implementation.
+  # In LyX this does not make sense.
+  Category         MainText
+  LatexType        Environment
+  LatexName        verse}%{
+  Margin           First_Dynamic
+  NextNoIndent     1
+  LeftMargin       MMMM
+  LabelIndent      MMMM
+  ParSkip          0.4
+  TopSep           0.7
+  BottomSep        0.7
+  ParSep           0.5
+  Align            Block
+  AlignPossible    Block, Left
+  LabelType        No_Label
+End
+
+
 Style TitleGraphic
   Category         Titling
   Margin           Static
@@ -911,7 +966,6 @@ Style TitleGraphic
     Series         Bold
     Color          Blue
   EndFont
-
 End
 
 
@@ -1036,7 +1090,7 @@ Style LyX-Code
   # define the environment lyxcode
   Preamble
   \newenvironment{lyxcode}
-    {\begin{list}{}{
+    {\par\begin{list}{}{
       \setlength{\rightmargin}{\leftmargin}
       \setlength{\listparindent}{0pt}% needed for AMS classes
       \raggedright
@@ -1085,9 +1139,9 @@ End
 # Charstyles:
 
 InsetLayout CharStyle:Alert
-       LyXType charstyle
-       LabelString Alert
-  LatexType        Command
+  LyXType charstyle
+  LabelString Alert
+  LatexType        command
   LatexName        alert
   Font
     Color          red
@@ -1096,9 +1150,9 @@ End
 
 
 InsetLayout CharStyle:Structure
-       LyXType charstyle
-       LabelString Structure
-  LatexType        Command
+  LyXType charstyle
+  LabelString Structure
+  LatexType        command
   LatexName        structure
   Font
     Color          blue
@@ -1106,6 +1160,26 @@ InsetLayout CharStyle:Structure
 End
 
 
+InsetLayout Custom:ArticleMode
+   LyXType     custom
+   LatexName   mode<article>
+   LatexType   command
+   Decoration   classic
+   LabelString Article
+   MultiPar     true
+End
+
+
+InsetLayout Custom:PresentationMode
+   LyXType     custom
+   LatexName   mode<presentation>
+   LatexType   command
+   Decoration   classic
+   LabelString Presentation
+   MultiPar     true
+End
+
+
 Float
   Type             table
   GuiName          Table
@@ -1116,7 +1190,8 @@ Float
   ListName         "List of Tables"
   LaTeXBuiltin     true
 End
-  
+
+
 Float
   Type             figure
   GuiName          Figure
@@ -1128,6 +1203,7 @@ Float
   LaTeXBuiltin     true
 End
 
+
 # to give users the choice of a title frame with and without
 # head-/footline, we define our own maketitle command
 TitleLaTeXName makebeamertitle