X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmemoir.layout;h=e51feb083a78e018998f7007d22e6b3ad698397a;hb=0b7305024a33e6616ef3ae73a0df63c5a62e3d10;hp=3024bc34df6623e27c66fef73a3081730eaff86f;hpb=6196645ccefa4a03a0617e2741a824156ed9404f;p=features.git

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 3024bc34df..e51feb083a 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -7,16 +7,20 @@
 # feel free to contribute missing features!
 
 
-Format 60
+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
@@ -39,6 +44,12 @@ Style Standard
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
+	HTMLStyle
+		div.standard {
+			margin-bottom: 2ex;
+			text-align: left;
+		}
+	EndHTMLStyle
 End
 
 
@@ -244,6 +255,15 @@ End
 
 
 Input stdtitle.inc
+
+Style Title
+	NeedProtect          true
+End
+
+Style Author
+	NeedProtect          true
+End
+
 Input stdstruct.inc
 
 
@@ -254,6 +274,7 @@ Style Bibliography
 	  Series             Bold
 	  Size               Huge
 	EndFont
+	TocLevel             0
 End