Fix several layout related problems revealed by -dbg tclass.

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

diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc
index 641e55c82c23b7611d0c4fdc72f15c46a2089fc5..dad3485bfa62ffc8d3eb21fc798e66736adfadae 100644 (file)
--- a/lib/layouts/stdlists.inc
+++ b/lib/layouts/stdlists.inc
@@ -1,13 +1,16 @@
 
 # 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 include files contains various standard environments for lists.
 
 
+Format 31
+
 Style Itemize
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             itemize
@@ -21,11 +24,15 @@ Style Itemize
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Itemize
-       LabelString           *
+       LabelString           "*"
+       HTMLTag               ul
+       HTMLItem              li
+       HTMLLabel             NONE
 End
 
 
 Style Enumerate
+       Category              List
        Margin                Static
        LatexType             Item_Environment
        LatexName             enumerate
@@ -40,10 +47,15 @@ Style Enumerate
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Enumerate
+       LabelCounter          "enum"
+       HTMLTag               ol
+       HTMLItem              li
+       HTMLLabel             NONE
+       RefPrefix             enu
 End
 
-
 Style Description
+       Category              List
        Margin                First_Dynamic
        LatexType             Item_environment
        LatexName             description
@@ -58,14 +70,23 @@ Style Description
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Manual
-       LabelString           MM
+       LabelString           "MM"
        LabelFont
          Series              Bold
        EndFont
+       HTMLTag               dl
+       HTMLAttr              class='description'
+       HTMLItem              dd
+       HTMLLabel             dt
+       HTMLLabelFirst        1
+       HTMLStyle
+               dl.description dt { font-weight: bold; }
+       EndHTMLStyle
 End
 
 
-Style List
+Style Labeling
+       Category              List
        Margin                Manual
        LatexType             List_Environment
        LatexName             lyxlist
@@ -78,7 +99,12 @@ Style List
        Align                 Block
        AlignPossible         Block, Left
        LabelType             Manual
-       LabelString           00.00.0000
+       LabelString           "00.00.0000"
+       HTMLTag               ol
+       HTMLAttr              class='lyxlist'
+       HTMLItem              li
+       HTMLLabel             span
+       HTMLLabelAttr         class='lyxlist'
 
        #define the environment lyxlist
        Preamble
@@ -90,44 +116,22 @@ Style List
                                 \renewcommand{\makelabel}[1]{##1\hfil}}}
                        {\end{list}}
        EndPreamble
-End
 
+       HTMLStyle
+               ol.lyxlist {
+                       list-style-type: none;
+               }
+               li.labeling_item {
+                       text-indent: -5em;
+                       margin-left: 5em;
+               }
+               span.lyxlist {
+                       margin-right: 1em;
+               }
+       EndHTMLStyle
+End
 
-#
-# New environments (not active yet)
-#
-#Environment Itemize
-#       LaTeXHeader "\begin{itemize}"
-#       LaTeXFooter "\end{itemize}"
-#  LabelString          *
-#  Margin               Static
-#  LatexType            Item_Environment
-#  NextNoIndent         1
-#  LeftMargin           MMN
-#  LabelSep             xx
-#  ItemSep              0.2
-#  TopSep               0.7
-#  BottomSep            0.7
-#  ParSep               0.3
-#  Align                Block
-#  AlignPossible        Block, Left
-#  LabelType            Static
-#End
-
-#Environment Enumerate
-#  Margin               Static
-#  LatexType            Item_Environment
-#  LatexName            enumerate
-#  NextNoIndent         1
-#  LeftMargin           MMN
-#  LabelSep             xx
-#  ParSkip              0.0
-#  ItemSep              0.2
-#  TopSep               0.7
-#  BottomSep            0.7
-#  ParSep               0.3
-#  Align                Block
-#  AlignPossible        Block, Left
-#  LabelType            Enumerate
-#End
 
+Style List
+  Obsoletedby           Labeling
+End