X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fenumitem.module;h=1b78f936a55beec1fdd41ab1f950d98a851dcb82;hb=f8f9eec358c5dcd45665defed13d51c0b304fb8e;hp=8816f81fd61ec669aca4be6d0cae7866d44a2bcc;hpb=5fabde2f8ead84d8618b20985061e32c69a4ac96;p=lyx.git

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 8816f81fd6..1b78f936a5 100644
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -1,10 +1,10 @@
 #\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
+#Excludes: paralist
+
 # Author: Günter Milde <milde@users.berlios.de>
 # 
 # 2008-12-04 first published version.
@@ -13,7 +13,7 @@
 #	     both KOMA and non-KOMA document classes.
 # 2011-01-12 bugfix: set elabeling label font to \normalfont.
 
-Format 35
+Format 68
 
 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
@@ -43,7 +43,6 @@ Format 35
 #       Preamble-Styling specific to this list type.
 
 AddToPreamble
-	\usepackage{enumitem}		% customizable list environments
 	\newlength{\lyxlabelwidth}      % auxiliary length 
 EndPreamble
 
@@ -52,48 +51,41 @@ EndPreamble
 # ------------------------
 
 # With enumitem, the three standard list environments take an optional
-# argument. See enumitem.pdf_ for possible values.
-
-IfStyle Itemize
-	OptionalArgs          1
+# argument. See enumitem.pdf for possible values.
+
+ModifyStyle Itemize
+	Argument 1
+		LabelString   "Itemize Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
+	Requires enumitem
 End
 
-IfStyle Enumerate
-	OptionalArgs          1
+ModifyStyle Enumerate
+	Argument 1
+		LabelString   "Enumerate Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
+	Requires enumitem
 End
 
-IfStyle Description
-	OptionalArgs          1
+ModifyStyle Description
+	Argument 1
+		LabelString   "Description Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
+	Requires enumitem
 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 +96,7 @@ 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
+	Requires enumitem
 End
 
 
@@ -131,14 +106,14 @@ End
 # Styles with pre-defined optional arguments for ease of use
 
 Style Enumerate-Resume
-        CopyStyle             Enumerate
-	LatexParam            [resume]
-	OptionalArgs          0
-	# a blue label to indicate that this is not a WYSIWYG label
-	# because the numbering differs in the output
-	LabelFont
-	  Color		      blue
-	EndFont
+	CopyStyle             Enumerate
+	Argument 1
+		LabelString   "Enumerate Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+		PresetArg     "resume"
+	EndArgument
+	ResumeCounter true
+	Requires enumitem
 End
 
 # References