X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmemoir.layout;h=aaaab45054ff1b3914b12eae1ff0fe8df2c11f29;hb=bbbd1820957f8a3584765eecc8533da6853a979f;hp=e154dd965ca68e9e2668afc6023269cc1420549d;hpb=1d2ebbb649c309d54e9b03c2324c1e058c3dba68;p=lyx.git

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index e154dd965c..aaaab45054 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -7,16 +7,20 @@
 # feel free to contribute missing features!
 
 
-Format 74
+Format 104
 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
@@ -45,6 +50,7 @@ Style Standard
 			text-align: left;
 		}
 	EndHTMLStyle
+	DocBookTag            para
 End
 
 
@@ -78,6 +84,7 @@ Style Chapter
 		InsertCotext  1
 		Requires      1
 	EndArgument
+	TocLevel 0
 End
 
 
@@ -102,6 +109,7 @@ Style Section
 		InsertCotext  1
 		Requires      1
 	EndArgument
+	TocLevel 1
 End
 
 
@@ -117,6 +125,7 @@ Style Subsection
 		InsertCotext  1
 		Requires      1
 	EndArgument
+	TocLevel 2
 End
 
 
@@ -132,6 +141,7 @@ Style Subsubsection
 		InsertCotext  1
 		Requires      1
 	EndArgument
+	TocLevel 3
 End
 
 
@@ -147,6 +157,7 @@ Style Paragraph
 		InsertCotext  1
 		Requires      1
 	EndArgument
+	TocLevel 4
 End
 
 
@@ -162,6 +173,7 @@ Style Subparagraph
 		InsertCotext  1
 		Requires      1
 	EndArgument
+	TocLevel 5
 End
 
 
@@ -234,6 +246,7 @@ Style Poemtitle
 	Font
 	   Series             Bold
 	EndFont
+    HTMLTag               h2
 End
 
 
@@ -285,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