X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmemoir.layout;h=b5c787c5903068587836d34e2657c8b35e4e221b;hb=b474aa5d4d8437eef35c751c7cfb9b6a30e7ee97;hp=d7800c12322063ca356aa4d9cb76fc4a927aa280;hpb=2a62a2c3957b89489580f59150c20e45a66e4b43;p=lyx.git

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index d7800c1232..b5c787c590 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -7,7 +7,7 @@
 # feel free to contribute missing features!
 
 
-Format 43
+Format 63
 Columns            1
 Sides              2
 SecNumDepth        1
@@ -30,6 +30,7 @@ End
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -54,23 +55,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
 
 
@@ -78,6 +79,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
 
@@ -86,13 +88,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
 
 
@@ -100,13 +103,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
 
 
@@ -114,13 +118,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
 
 
@@ -128,13 +133,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
 
 
@@ -142,13 +148,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
 
 
@@ -172,7 +179,7 @@ Style Chapterprecis
 End
 
 Style Epigraph
-	Category              Maintext
+	Category              MainText
 	Margin                Right_Address_Box
 	LatexType             Command
 	LatexName             epigraph
@@ -186,6 +193,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
@@ -202,10 +217,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
@@ -221,6 +238,7 @@ 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
 
@@ -243,7 +261,7 @@ Input lyxmacros.inc
 Input stdlayouts.inc
 
 Style Legend
-	Category            Maintext
+	Category            MainText
 	LatexType           Command
 	LatexName           legend
 	NeedProtect         1