Revert "Fix Ticket #9741 misleading name for font-encoding setting "default"."

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

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 6f00a041121aa5b4a077e7533ba4ff1010a1d35c..56326359d96d97bea550880967d8577ac32709a0 100644 (file)
--- 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 62
 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
 
 
@@ -171,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
@@ -181,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
@@ -197,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
@@ -216,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
 
@@ -238,7 +261,7 @@ Input lyxmacros.inc
 Input stdlayouts.inc
 
 Style Legend
-       Category            Maintext
+       Category            MainText
        LatexType           Command
        LatexName           legend
        NeedProtect         1