Update tex2lyx test files

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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index e51fd559baa40b9294c2b3206a4348e77f2de31f..af04f6713b9326c431ce32363ab114016cab79cc 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -1,17 +1,25 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{memoir}
+#  \DeclareLaTeXClass[memoir]{Memoir}
+#  \DeclareCategory{Books}
 # Memoir textclass definition file
-# Author: Jürgen Spitzmüller <spitzmueller@gmx.de>
+# Author: Jürgen Spitzmüller <spitzmueller@gmx.de>
 # Improvements by: Bennett Helm <bennett.helm@fandm.edu>
 # feel free to contribute missing features!
 
 
+Format 40
 Columns            1
-Sides                 2
-SecNumDepth   2
-TocDepth           2
+Sides              2
+SecNumDepth        1
+TocDepth           1
 DefaultStyle       Standard
-PageStyle           Headings
+PageStyle          Headings
+Provides makeidx   1
+Provides framed    1
+Provides subscript 1
+# Memoir has support for line spacing, but uses different names from
+# what setspace.sty does.  
+Provides SetSpace  1
 
 
 ClassOptions
@@ -33,12 +41,61 @@ Style Standard
 End
 
 
+Input stdinsets.inc
 Input stdlists.inc
 Input stdcounters.inc
 Input stdfloats.inc
-Input numreport.inc
 Input stdsections.inc
 Input stdstarsections.inc
+Input numreport.inc
+
+
+Style Part
+       OptionalArgs         1
+       TocLevel             -1
+End
+       
+
+
+Style Chapter
+       OptionalArgs         2
+       TocLevel             0
+End
+
+
+Style Chapter*
+       OptionalArgs         1
+End
+
+
+Style Section
+       OptionalArgs         2
+       TocLevel 1
+End
+
+
+Style Subsection
+       OptionalArgs         2
+       TocLevel 2
+End
+
+
+Style Subsubsection
+       OptionalArgs         2
+       TocLevel 3
+End
+
+
+Style Paragraph
+       OptionalArgs         2
+       TocLevel 4
+End
+
+
+Style Subparagraph
+       OptionalArgs         2
+       TocLevel 5
+End
 
 
 Style Chapterprecis
@@ -54,15 +111,15 @@ Style Chapterprecis
        BottomSep            0
        ParSep               0.4
        Align                Block
-       AlignPossible        Block
        Font
          Shape              Italic
          Size               Normal
        EndFont
 End
 
-
+#FIXME: this takes two parameters!!!
 Style Epigraph
+       Category              Maintext
        Margin                Right_Address_Box
        LatexType             Command
        LatexName             epigraph
@@ -70,11 +127,12 @@ Style Epigraph
        BottomSep             1.5
        ParSep                1.5
        Align                 Left
-       AlignPossible         Left
 End
 
-
+#FIXME: what is actually documented is \PoemTitle
+#but \poemtitle is defined nevertheless. Weird.
 Style Poemtitle
+       Category              Section
        LatexType             Command
        LatexName             poemtitle
        NeedProtect           1
@@ -84,7 +142,6 @@ Style Poemtitle
        TopSep                0.4
        ParSep                0.4
        Align                 center
-       AlignPossible         center
        OptionalArgs          1
        Font
           Series             Bold
@@ -94,6 +151,7 @@ End
 
 Style Poemtitle*
        CopyStyle             Poemtitle
+       Category              Unnumbered
        LatexName             poemtitle*
        OptionalArgs          0
 End
@@ -105,7 +163,7 @@ Input stdstruct.inc
 
 Style Bibliography
        TopSep               4
-       LabelString          Bibliography
+       LabelString          "Bibliography"
        LabelFont
          Series             Bold
          Size               Huge
@@ -117,11 +175,11 @@ Input lyxmacros.inc
 Input stdlayouts.inc
 
 Style Legend
+       Category            Maintext
        LatexType           Command
        LatexName           legend
        NeedProtect         1
        NextNoIndent        1
-       ParSkip              0.4
-       Align                   Center
-       AlignPossible      Center
+       ParSkip             0.4
+       Align               Center
 End