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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 371f86323c..21fce08e1b 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -1,12 +1,13 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[memoir]{book (Memoir)}
+#  \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 27
+Format 43
 Columns            1
 Sides              2
 SecNumDepth        1
@@ -15,6 +16,7 @@ DefaultStyle       Standard
 PageStyle          Headings
 Provides makeidx   1
 Provides framed    1
+Provides subscript 1
 # Memoir has support for line spacing, but uses different names from
 # what setspace.sty does.  
 Provides SetSpace  1
@@ -28,6 +30,7 @@ End
 
 
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -49,49 +52,103 @@ Input numreport.inc
 
 
 Style Part
-	OptionalArgs         1
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The part as it appears in the table of contents/running headers"
+	EndArgument
 	TocLevel 	     -1
 End
       	
 
 
 Style Chapter
-	OptionalArgs         2
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The chapter as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The chapter as it appears in the running headers"
+		Requires      1
+	EndArgument
 	TocLevel 	     0
 End
 
 
 Style Chapter*
-	OptionalArgs         1
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The chapter as it appears in the table of contents"
+	EndArgument
 End
 
 
 Style Section
-	OptionalArgs         2
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The section as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The section as it appears in the running headers"
+		Requires      1
+	EndArgument
 	TocLevel 1
 End
 
 
 Style Subsection
-	OptionalArgs         2
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The subsection as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The subsection as it appears in the running headers"
+		Requires      1
+	EndArgument
 	TocLevel 2
 End
 
 
 Style Subsubsection
-	OptionalArgs         2
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The subsubsection as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The subsubsection as it appears in the running headers"
+		Requires      1
+	EndArgument
 	TocLevel 3
 End
 
 
 Style Paragraph
-	OptionalArgs         2
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The paragraph as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The paragraph as it appears in the running headers"
+		Requires      1
+	EndArgument
 	TocLevel 4
 End
 
 
 Style Subparagraph
-	OptionalArgs         2
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The subparagraph as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The subparagraph as it appears in the running headers"
+		Requires      1
+	EndArgument
 	TocLevel 5
 End
 
@@ -115,7 +172,6 @@ Style Chapterprecis
 	EndFont
 End
 
-#FIXME: this takes two parameters!!!
 Style Epigraph
 	Category              Maintext
 	Margin                Right_Address_Box
@@ -125,14 +181,18 @@ 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
 
-#FIXME: what is actually documented is \PoemTitle
-#but \poemtitle is defined nevertheless. Weird.
 Style Poemtitle
-	Category              Section
+	Category              Sectioning
 	LatexType             Command
-	LatexName             poemtitle
+	LatexName             PoemTitle
 	NeedProtect           1
 	NextNoIndent          1
 	LabelSep              xxx
@@ -140,7 +200,15 @@ Style Poemtitle
 	TopSep                0.4
 	ParSep                0.4
 	Align                 center
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The poem title as it appears in the table of contents"
+	EndArgument
+	Argument 2
+		LabelString   "Short Title (Header)"
+		Tooltip       "The poem title as it appears in the running headers"
+		Requires      1
+	EndArgument
 	Font
 	   Series             Bold
 	EndFont
@@ -150,8 +218,11 @@ End
 Style Poemtitle*
 	CopyStyle             Poemtitle
 	Category              Unnumbered
-	LatexName             poemtitle*
-	OptionalArgs          0
+	LatexName             PoemTitle*
+	Argument 1
+		LabelString   "Short Title (TOC)|S"
+		Tooltip       "The poem title as it appears in the table of contents"
+	EndArgument
 End