Fix output of formatted counters.

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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 5c3322da20bd1ffa1f572d4be6860c743b8349e7..001497e36f6d301fde3c15bce752128f37cdcf19 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -6,14 +6,18 @@
 # feel free to contribute missing features!
 
 
-Format 5
+Format 22
 Columns            1
 Sides              2
 SecNumDepth        2
 TocDepth           2
 DefaultStyle       Standard
 PageStyle          Headings
-Provides makeidx    1
+Provides makeidx   1
+Provides framed    1
+# Memoir has support for line spacing, but uses different names from
+# what setspace.sty does.  
+Provides SetSpace  1
 
 
 ClassOptions
@@ -46,31 +50,42 @@ Input numreport.inc
 
 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
 
 
@@ -87,7 +102,6 @@ Style Chapterprecis
        BottomSep            0
        ParSep               0.4
        Align                Block
-       AlignPossible        Block
        Font
          Shape              Italic
          Size               Normal
@@ -103,7 +117,6 @@ Style Epigraph
        BottomSep             1.5
        ParSep                1.5
        Align                 Left
-       AlignPossible         Left
 End
 
 
@@ -117,7 +130,6 @@ Style Poemtitle
        TopSep                0.4
        ParSep                0.4
        Align                 center
-       AlignPossible         center
        OptionalArgs          1
        Font
           Series             Bold
@@ -154,7 +166,6 @@ Style Legend
        LatexName           legend
        NeedProtect         1
        NextNoIndent        1
-       ParSkip              0.4
-       Align                   Center
-       AlignPossible      Center
+       ParSkip             0.4
+       Align               Center
 End