X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmemoir.layout;h=21fce08e1bd635a17801e9cc8811d8e3a5d49459;hb=2bd368fd6b276663b327e64acc6b46c87cc3c7a9;hp=4e40004d44cbc3436117f9b76a550105d6ba8f2f;hpb=7a05aeb4ec93dbfa91fd66481e97ab481961f385;p=lyx.git

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 4e40004d44..21fce08e1b 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 41
+Format 43
 Columns            1
 Sides              2
 SecNumDepth        1
@@ -30,6 +30,7 @@ End
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -52,8 +53,7 @@ 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"
 	EndArgument
 	TocLevel 	     -1
@@ -63,8 +63,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -78,8 +77,7 @@ 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"
 	EndArgument
 End
@@ -87,8 +85,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -102,8 +99,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -117,8 +113,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -132,8 +127,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -147,8 +141,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -179,7 +172,6 @@ Style Chapterprecis
 	EndFont
 End
 
-#FIXME: this takes two parameters!!!
 Style Epigraph
 	Category              Maintext
 	Margin                Right_Address_Box
@@ -189,10 +181,16 @@ 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
 End
 
 Style Poemtitle
-	Category              Section
+	Category              Sectioning
 	LatexType             Command
 	LatexName             PoemTitle
 	NeedProtect           1
@@ -203,8 +201,7 @@ 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"
 	EndArgument
 	Argument 2
@@ -223,8 +220,7 @@ 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"
 	EndArgument
 End