Use generic paper size names rather than LaTeXisms such as "letterpaper"

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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 63bca2651512cdfeceab4d96069eb3140b01a122..e51feb083a78e018998f7007d22e6b3ad698397a 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -7,16 +7,20 @@
 # feel free to contribute missing features!
 
 
-Format 65
+Format 78
 Columns            1
 Sides              2
 SecNumDepth        1
 TocDepth           1
 DefaultStyle       Standard
 PageStyle          Headings
+PageSize           letter
 Provides makeidx   1
 Provides framed    1
 Provides subscript 1
+# Geometry is supported, but the package options and paper sizes
+# are ignored
+Provides geometry-light  1
 # Memoir has support for line spacing, but uses different names from
 # what setspace.sty does.  
 Provides SetSpace  1
@@ -24,6 +28,7 @@ Provides SetSpace  1
 
 ClassOptions
        FontSize             9|10|11|12|14|17
+       PageSize             a3|a4|a5|a6|b3|b4|b5|b6|executive|legal|letter
        PageStyle            empty|plain|headings|myheadings|ruled|Ruled|companion
        Other                oldfontcommands
 End
@@ -250,6 +255,15 @@ End
 
 
 Input stdtitle.inc
+
+Style Title
+       NeedProtect          true
+End
+
+Style Author
+       NeedProtect          true
+End
+
 Input stdstruct.inc
 
 
@@ -260,6 +274,7 @@ Style Bibliography
          Series             Bold
          Size               Huge
        EndFont
+       TocLevel             0
 End