svcommon.inc, theorems-without-preamble.inc: correction from previous commit

[lyx.git] / lib / layouts / memoir.layout

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 59a847acb3dc77505d033b7aabcc302caa3c6303..1704b2e22479bc3a674f6de61c079abf6e483180 100644 (file)
--- 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 34
+Format 41
 Columns            1
 Sides              2
 SecNumDepth        1
@@ -50,49 +51,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
 
@@ -128,12 +183,10 @@ Style Epigraph
        Align                 Left
 End
 
-#FIXME: what is actually documented is \PoemTitle
-#but \poemtitle is defined nevertheless. Weird.
 Style Poemtitle
        Category              Section
        LatexType             Command
-       LatexName             poemtitle
+       LatexName             PoemTitle
        NeedProtect           1
        NextNoIndent          1
        LabelSep              xxx
@@ -141,7 +194,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
@@ -151,8 +212,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