Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / layouts / stdclass.inc

diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc
index e7ce94005f587d6cd48cc6347f415e0d60c07fab..1e389dd44d9a17893c4691082ac3ddd0bf5f82e5 100644 (file)
--- a/lib/layouts/stdclass.inc
+++ b/lib/layouts/stdclass.inc
@@ -1,17 +1,18 @@
 # Standard textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
-# Transposed by Pascal André <andre@via.ecp.fr>
+# Transposed by Pascal André <andre@via.ecp.fr>
 # Heavily modifed and enhanced by several developers.
 
 # This is a base layout which is designed to be included from other
 # ``standard'' layouts, like article and friends.
 
-# General textclass parameters
+
+Format 80
 Columns                 1
 Sides                   1
 SecNumDepth             2
 TocDepth                2
-DefaultStyle Standard
+DefaultStyle            Standard
 
 # This is just to show how to declare the default font.
 # The defaults are exactly those shown here.
@@ -23,8 +24,9 @@ DefaultFont
        Color                 None
 EndFont
 
-# Standard style definition
+
 Style Standard
+       Category              MainText
        Margin                Static
        LatexType             Paragraph
        LatexName             dummy
@@ -33,8 +35,19 @@ Style Standard
        Align                 Block
        AlignPossible         Block, Left, Right, Center
        LabelType             No_Label
+       # FIXME This ought to be set dynamically.
+       HTMLStyle
+               div.standard {
+                       margin-bottom: 2ex;
+               }
+       EndHTMLStyle
 End
 
+#Input stdcharstyles.inc
+#Input stdcustom.inc
+Input stdfloats.inc
+Input stdcounters.inc
+Input stdinsets.inc
 Input stdlists.inc
 Input stdsections.inc
 Input stdstarsections.inc
@@ -42,6 +55,3 @@ Input stdtitle.inc
 Input stdstruct.inc
 Input lyxmacros.inc
 Input stdlayouts.inc
-Input stdfloats.inc
-Input stdcounters.inc
-Input obsolete.inc