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

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index e3433a5aad..1b78f936a5 100644
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -3,6 +3,8 @@
 # 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.
@@ -11,7 +13,7 @@
 #	     both KOMA and non-KOMA document classes.
 # 2011-01-12 bugfix: set elabeling label font to \normalfont.
 
-Format 40
+Format 68
 
 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
@@ -41,7 +43,6 @@ Format 40
 #       Preamble-Styling specific to this list type.
 
 AddToPreamble
-	\usepackage{enumitem}		% customizable list environments
 	\newlength{\lyxlabelwidth}      % auxiliary length 
 EndPreamble
 
@@ -50,27 +51,30 @@ 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
-	Argument option
+ModifyStyle Itemize
+	Argument 1
 		LabelString   "Itemize Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
-IfStyle Enumerate
-	Argument option
+ModifyStyle Enumerate
+	Argument 1
 		LabelString   "Enumerate Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
-IfStyle Description
-	Argument option
+ModifyStyle Description
+	Argument 1
 		LabelString   "Description Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
 
@@ -80,6 +84,7 @@ End
 Input stdlyxlist.inc
 
 Style Labeling
+	Category              List
 	LatexName             elabeling
 	# FIXME This should probably be defined using \newlist instead
 	Preamble
@@ -91,6 +96,7 @@ Style Labeling
 				leftmargin=\lyxlabelwidth,#1]}
 		{\end{description}}
 	EndPreamble
+	Requires enumitem
 End
 
 
@@ -101,13 +107,13 @@ End
 
 Style Enumerate-Resume
 	CopyStyle             Enumerate
-	LatexParam            [resume]
-	ResetArgs             1
-	# a blue label to indicate that this is not a WYSIWYG label
-	# because the numbering differs in the output
-	LabelFont
-	  Color blue
-	EndFont
+	Argument 1
+		LabelString   "Enumerate Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+		PresetArg     "resume"
+	EndArgument
+	ResumeCounter true
+	Requires enumitem
 End
 
 # References