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

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index f8557db2f5..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 57
+Format 68
 
 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
@@ -51,7 +53,7 @@ EndPreamble
 # With enumitem, the three standard list environments take an optional
 # argument. See enumitem.pdf for possible values.
 
-IfStyle Itemize
+ModifyStyle Itemize
 	Argument 1
 		LabelString   "Itemize Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
@@ -59,7 +61,7 @@ IfStyle Itemize
 	Requires enumitem
 End
 
-IfStyle Enumerate
+ModifyStyle Enumerate
 	Argument 1
 		LabelString   "Enumerate Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
@@ -67,7 +69,7 @@ IfStyle Enumerate
 	Requires enumitem
 End
 
-IfStyle Description
+ModifyStyle Description
 	Argument 1
 		LabelString   "Description Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
@@ -110,11 +112,7 @@ Style Enumerate-Resume
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 		PresetArg     "resume"
 	EndArgument
-	# a blue label to indicate that this is not a WYSIWYG label
-	# because the numbering differs in the output
-	LabelFont
-	  Color blue
-	EndFont
+	ResumeCounter true
 	Requires enumitem
 End