Fix output of formatted counters.

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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index d75d00a5aae943afff6af7829641cbdacc54988e..001497e36f6d301fde3c15bce752128f37cdcf19 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -6,7 +6,7 @@
 # feel free to contribute missing features!
 
 
-Format 6
+Format 22
 Columns            1
 Sides              2
 SecNumDepth        2
@@ -15,6 +15,9 @@ DefaultStyle       Standard
 PageStyle          Headings
 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
@@ -47,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
 
 
@@ -152,6 +166,6 @@ Style Legend
        LatexName           legend
        NeedProtect         1
        NextNoIndent        1
-       ParSkip              0.4
-       Align                   Center
+       ParSkip             0.4
+       Align               Center
 End