X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmemoir.layout;h=daccad98a5c82bed5c4b0c68a382fb882615b7b3;hb=2841a1c06315edb7dd3a264746c093ee4c1a7c9f;hp=21fce08e1bd635a17801e9cc8811d8e3a5d49459;hpb=534efc5139911098f5a417fce1d28813a0a1ec93;p=lyx.git diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index 21fce08e1b..daccad98a5 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -7,16 +7,20 @@ # feel free to contribute missing features! -Format 43 +Format 100 Columns 1 Sides 2 SecNumDepth 1 TocDepth 1 DefaultStyle Standard PageStyle Headings +PageSize letter Provides makeidx 1 Provides framed 1 Provides subscript 1 +# Geometry is supported, but the package options and paper sizes +# are ignored +Provides geometry-light 1 # Memoir has support for line spacing, but uses different names from # what setspace.sty does. Provides SetSpace 1 @@ -24,6 +28,7 @@ Provides SetSpace 1 ClassOptions FontSize 9|10|11|12|14|17 + PageSize a3|a4|a5|a6|b3|b4|b5|b6|executive|legal|letter PageStyle empty|plain|headings|myheadings|ruled|Ruled|companion Other oldfontcommands End @@ -39,6 +44,13 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + HTMLStyle + div.standard { + margin-bottom: 2ex; + text-align: left; + } + EndHTMLStyle + DocBookTag para End @@ -55,23 +67,24 @@ 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 + TocLevel 0 End @@ -79,6 +92,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 @@ -87,10 +101,12 @@ 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 @@ -101,10 +117,12 @@ 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 @@ -115,10 +133,12 @@ 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 @@ -129,10 +149,12 @@ 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 @@ -143,10 +165,12 @@ 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 @@ -173,7 +197,7 @@ Style Chapterprecis End Style Epigraph - Category Maintext + Category MainText Margin Right_Address_Box LatexType Command LatexName epigraph @@ -187,6 +211,14 @@ Style Epigraph 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 @@ -203,15 +235,18 @@ 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 Series Bold EndFont + HTMLTag h2 End @@ -222,11 +257,21 @@ 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 Input stdtitle.inc + +Style Title + NeedProtect true +End + +Style Author + NeedProtect true +End + Input stdstruct.inc @@ -237,6 +282,7 @@ Style Bibliography Series Bold Size Huge EndFont + TocLevel 0 End @@ -244,7 +290,7 @@ Input lyxmacros.inc Input stdlayouts.inc Style Legend - Category Maintext + Category MainText LatexType Command LatexName legend NeedProtect 1 @@ -252,3 +298,51 @@ Style Legend ParSkip 0.4 Align Center End + +# +# Endnotes (called "pagenotes" in memoir) +# + +Counter endnotes + GuiName Endnotes + PrettyFormat "Endnote ##" +End + +InsetLayout Flex:Endnote + LyXType custom + LatexName pagenote + LatexType command + Counter endnotes + Decoration classic + Font + Size Small + EndFont + MultiPar true + LabelString endnote + Preamble + \makepagenote + EndPreamble + LangPreamble + \providecommand{\notesname}{_(Notes[[Endnotes]])} + EndLangPreamble + BabelPreamble + \addto\captions$$lang{\renewcommand{\notesname}{_(Notes[[Endnotes]])}} + EndBabelPreamble +End + +# We are only interested in the list +Float + Type pagenote + ListName "Endnotes (all)" + IsPredefined true + UsesFloatPkg false + ListCommand printpagenotes +End + +Float + Type pagenote* + ListName "Endnotes (sectioned)" + IsPredefined true + UsesFloatPkg false + ListCommand printpagenotes* +End