memoir: small changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7834 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0b773ed5efb862d0a6b2ac57fdc63afba227be70..21fdcd114c3c6cb7617ea8f23db7e0071fb24eab 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * layouts/memoir.layout: More sensible order; new env "legend".
+
 2003-09-25  Angus Leeming  <leeming@lyx.org>
 
        * *.xpm: ensured that they all have the same style of colour table.

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 165ce9ae5d169e4988507058faa418e78bd5c8e4..e51fd559baa40b9294c2b3206a4348e77f2de31f 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -1,15 +1,17 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass{memoir}
-# Memoir textclass definition file (poor man's version).
+# Memoir textclass definition file
 # Author: Jürgen Spitzmüller <spitzmueller@gmx.de>
+# Improvements by: Bennett Helm <bennett.helm@fandm.edu>
 # feel free to contribute missing features!
 
-Input stdclass.inc
-Input numreport.inc
-
 
-Sides                  2
-PageStyle              Headings
+Columns            1
+Sides                 2
+SecNumDepth   2
+TocDepth           2
+DefaultStyle       Standard
+PageStyle           Headings
 
 
 ClassOptions
@@ -19,16 +21,26 @@ ClassOptions
 End
 
 
-Style Bibliography
-       TopSep               4
-       LabelString          Bibliography
-       LabelFont
-         Series             Bold
-         Size               Huge
-       EndFont
+Style Standard
+       Margin                Static
+       LatexType             Paragraph
+       LatexName             dummy
+       ParIndent             MM
+       ParSkip               0.4
+       Align                 Block
+       AlignPossible         Block, Left, Right, Center
+       LabelType             No_Label
 End
 
 
+Input stdlists.inc
+Input stdcounters.inc
+Input stdfloats.inc
+Input numreport.inc
+Input stdsections.inc
+Input stdstarsections.inc
+
+
 Style Chapterprecis
        Margin               Static
        LatexType            Command
@@ -85,3 +97,31 @@ Style Poemtitle*
        LatexName             poemtitle*
        OptionalArgs          0
 End
+
+
+Input stdtitle.inc
+Input stdstruct.inc
+
+
+Style Bibliography
+       TopSep               4
+       LabelString          Bibliography
+       LabelFont
+         Series             Bold
+         Size               Huge
+       EndFont
+End
+
+
+Input lyxmacros.inc
+Input stdlayouts.inc
+
+Style Legend
+       LatexType           Command
+       LatexName           legend
+       NeedProtect         1
+       NextNoIndent        1
+       ParSkip              0.4
+       Align                   Center
+       AlignPossible      Center
+End