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

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index d7598d8049..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 48
+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 48
 #       Preamble-Styling specific to this list type.
 
 AddToPreamble
-	\usepackage{enumitem}		% customizable list environments
 	\newlength{\lyxlabelwidth}      % auxiliary length 
 EndPreamble
 
@@ -52,25 +53,28 @@ 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)"
 	EndArgument
+	Requires enumitem
 End
 
-IfStyle Enumerate
+ModifyStyle Enumerate
 	Argument 1
 		LabelString   "Enumerate Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
-IfStyle Description
+ModifyStyle Description
 	Argument 1
 		LabelString   "Description Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
 
@@ -92,6 +96,7 @@ Style Labeling
 				leftmargin=\lyxlabelwidth,#1]}
 		{\end{description}}
 	EndPreamble
+	Requires enumitem
 End
 
 
@@ -107,11 +112,8 @@ 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
 
 # References