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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index c2acb7aaa7..e51feb083a 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -7,16 +7,20 @@
 # feel free to contribute missing features!
 
 
-Format 43
+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
 
 
@@ -55,23 +66,23 @@ Style Part
 	Argument 1
 		LabelString   "Short Title|S"
 		Tooltip       "The part as it appears in the table of contents/running headers"
+		InsertCotext   1
 	EndArgument
-	TocLevel 	     -1
 End
-      	
 
 
 Style Chapter
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The chapter as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The chapter as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
-	TocLevel 	     0
 End
 
 
@@ -79,6 +90,7 @@ Style Chapter*
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The chapter as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 End
 
@@ -87,13 +99,14 @@ Style Section
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The section as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The section as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
-	TocLevel 1
 End
 
 
@@ -101,13 +114,14 @@ Style Subsection
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The subsection as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The subsection as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
-	TocLevel 2
 End
 
 
@@ -115,13 +129,14 @@ Style Subsubsection
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The subsubsection as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The subsubsection as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
-	TocLevel 3
 End
 
 
@@ -129,13 +144,14 @@ Style Paragraph
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The paragraph as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The paragraph as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
-	TocLevel 4
 End
 
 
@@ -143,13 +159,14 @@ Style Subparagraph
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The subparagraph as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The subparagraph as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
-	TocLevel 5
 End
 
 
@@ -187,6 +204,14 @@ Style Epigraph
 		Tooltip       "The source/author of this epigraph"
 		Mandatory     1
 	EndArgument
+	HTMLStyle
+		div.epigraph {
+			float: right;
+			width: 33%;
+			font-size: small;
+			margin: 0.5em 0em 0.5em 1em;
+		}
+	EndHTMLStyle
 End
 
 Style Poemtitle
@@ -203,10 +228,12 @@ Style Poemtitle
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The poem title as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 	Argument 2
 		LabelString   "Short Title (Header)"
 		Tooltip       "The poem title as it appears in the running headers"
+		InsertCotext  1
 		Requires      1
 	EndArgument
 	Font
@@ -222,11 +249,21 @@ Style Poemtitle*
 	Argument 1
 		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The poem title as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 End
 
 
 Input stdtitle.inc
+
+Style Title
+	NeedProtect          true
+End
+
+Style Author
+	NeedProtect          true
+End
+
 Input stdstruct.inc
 
 
@@ -237,6 +274,7 @@ Style Bibliography
 	  Series             Bold
 	  Size               Huge
 	EndFont
+	TocLevel             0
 End