RJournal template and layout: move ERTs to layout

[lyx.git] / lib / layouts / enumitem.module

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 8816f81fd61ec669aca4be6d0cae7866d44a2bcc..161900063165d21ab65f6bae14c8621343d8c4e6 100644 (file)
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -1,9 +1,7 @@
 #\DeclareLyXModule[enumitem.sty]{Customisable Lists (enumitem)}
 #DescriptionBegin
-# Control the layout of enumerate, itemize, description, and list/labeling
-# with an optional argument.
-# See http://mirror.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf
-# and example file shipped with LyX.
+# Controls the layout of enumerate, itemize, description, and list/labeling.
+# See section Customized Lists of the User's Guide for a detailed description.
 #DescriptionEnd
 # Author: Günter Milde <milde@users.berlios.de>
 # 
@@ -13,7 +11,7 @@
 #           both KOMA and non-KOMA document classes.
 # 2011-01-12 bugfix: set elabeling label font to \normalfont.
 
-Format 35
+Format 45
 
 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
@@ -52,48 +50,38 @@ EndPreamble
 # ------------------------
 
 # With enumitem, the three standard list environments take an optional
-# argument. See enumitem.pdf_ for possible values.
+# argument. See enumitem.pdf for possible values.
 
 IfStyle Itemize
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Itemize Options"
+               Tooltip       "Optional arguments for this list (see enumitem manual)"
+       EndArgument
 End
 
 IfStyle Enumerate
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Enumerate Options"
+               Tooltip       "Optional arguments for this list (see enumitem manual)"
+       EndArgument
 End
 
 IfStyle Description
-       OptionalArgs          1
+       Argument 1
+               LabelString   "Description Options"
+               Tooltip       "Optional arguments for this list (see enumitem manual)"
+       EndArgument
 End
 
 
 # Customisable LyX List
 # ---------------------
 
-# We expect this already to be defined, but there may be some classes
-# that do not include stdlists.inc or do not declare Labeling. So we
-# have copied the info from stdlists.inc.
-# To make sure that we are starting fresh, we first clear everything.
-NoStyle Labeling
+Input stdlyxlist.inc
 
 Style Labeling
-       # copied from stdlists.inc
        Category              List
        LatexName             elabeling
-       OptionalArgs          1
-       Margin                Manual
-       LatexType             List_Environment
-       NextNoindent          1
-       LabelSep              xxx
-       ParSkip               0.4
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.5
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Manual
-       LabelString           "00.00.0000"
-
        # FIXME This should probably be defined using \newlist instead
        Preamble
        % labeling-like list based on enumitem's description list with
@@ -104,24 +92,6 @@ Style Labeling
                                leftmargin=\lyxlabelwidth,#1]}
                {\end{description}}
        EndPreamble
-
-       HTMLTag               ol
-       HTMLAttr              class='lyxlist'
-       HTMLItem              li
-       HTMLLabel             span
-       HTMLLabelAttr         class='lyxlist'
-       HTMLStyle
-               ol.lyxlist {
-                       list-style-type: none;
-               }
-               li.labeling_item {
-                       text-indent: -5em;
-                       margin-left: 5em;
-               }
-               span.lyxlist {
-                       margin-right: 1em;
-               }
-       EndHTMLStyle
 End
 
 
@@ -131,13 +101,13 @@ End
 # Styles with pre-defined optional arguments for ease of use
 
 Style Enumerate-Resume
-        CopyStyle             Enumerate
+       CopyStyle             Enumerate
        LatexParam            [resume]
-       OptionalArgs          0
+       ResetArgs             1
        # a blue label to indicate that this is not a WYSIWYG label
        # because the numbering differs in the output
        LabelFont
-         Color               blue
+         Color blue
        EndFont
 End