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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 003d438a75..b5c787c590 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -2,12 +2,12 @@
 #  \DeclareLaTeXClass[memoir]{Memoir}
 #  \DeclareCategory{Books}
 # Memoir textclass definition file
-# Author: Jürgen Spitzmüller <spitzmueller@gmx.de>
+# Author: Jürgen Spitzmüller <spitz@lyx.org>
 # Improvements by: Bennett Helm <bennett.helm@fandm.edu>
 # feel free to contribute missing features!
 
 
-Format 40
+Format 63
 Columns            1
 Sides              2
 SecNumDepth        1
@@ -30,6 +30,7 @@ End
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -52,111 +53,109 @@ Input numreport.inc
 
 Style Part
 	Argument 1
-		LabelString   "Short Title"
-		Shortcut      S
+		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)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
-	TocLevel 	     0
 End
 
 
 Style Chapter*
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The chapter as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 End
 
 
 Style Section
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
-	TocLevel 1
 End
 
 
 Style Subsection
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
-	TocLevel 2
 End
 
 
 Style Subsubsection
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
-	TocLevel 3
 End
 
 
 Style Paragraph
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
-	TocLevel 4
 End
 
 
 Style Subparagraph
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
-	TocLevel 5
 End
 
 
@@ -179,9 +178,8 @@ Style Chapterprecis
 	EndFont
 End
 
-#FIXME: this takes two parameters!!!
 Style Epigraph
-	Category              Maintext
+	Category              MainText
 	Margin                Right_Address_Box
 	LatexType             Command
 	LatexName             epigraph
@@ -189,10 +187,24 @@ Style Epigraph
 	BottomSep             1.5
 	ParSep                1.5
 	Align                 Left
+	Argument post:1
+		MenuString    "Epigraph Source|S"
+		LabelString   "Source"
+		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
-	Category              Section
+	Category              Sectioning
 	LatexType             Command
 	LatexName             PoemTitle
 	NeedProtect           1
@@ -203,14 +215,15 @@ Style Poemtitle
 	ParSep                0.4
 	Align                 center
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		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"
-		Requires      shorttitle
+		InsertCotext  1
+		Requires      1
 	EndArgument
 	Font
 	   Series             Bold
@@ -223,9 +236,9 @@ Style Poemtitle*
 	Category              Unnumbered
 	LatexName             PoemTitle*
 	Argument 1
-		LabelString   "Short Title (TOC)"
-		Shortcut      S
+		LabelString   "Short Title (TOC)|S"
 		Tooltip       "The poem title as it appears in the table of contents"
+		InsertCotext   1
 	EndArgument
 End
 
@@ -248,7 +261,7 @@ Input lyxmacros.inc
 Input stdlayouts.inc
 
 Style Legend
-	Category            Maintext
+	Category            MainText
 	LatexType           Command
 	LatexName           legend
 	NeedProtect         1