X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fenumitem.module;h=db9ff32d986f0e0653b663a3f40647b5b39e16af;hb=bf88ad495cead6e97a05fee59e41414648145fc1;hp=5496ae4ac455ad36f71f57eed6fc608574fc0582;hpb=460b44b8f5e94d2e48302ea8cdeae475295f624b;p=lyx.git

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 5496ae4ac4..db9ff32d98 100644
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -1,9 +1,12 @@
 #\DeclareLyXModule[enumitem.sty]{Customisable Lists (enumitem)}
+#\DeclareCategory{List Enhancements}
 #DescriptionBegin
 # 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>
+#Excludes: paralist
+
+# Author: Günter Milde <milde@lyx.org>
 # 
 # 2008-12-04 first published version.
 # 2009-02-02 use name Labeling for "LyX-List/Labeling" list type,
@@ -11,7 +14,7 @@
 #	     both KOMA and non-KOMA document classes.
 # 2011-01-12 bugfix: set elabeling label font to \normalfont.
 
-Format 44
+Format 74
 
 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
@@ -41,7 +44,6 @@ Format 44
 #       Preamble-Styling specific to this list type.
 
 AddToPreamble
-	\usepackage{enumitem}		% customizable list environments
 	\newlength{\lyxlabelwidth}      % auxiliary length 
 EndPreamble
 
@@ -52,25 +54,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 +97,7 @@ Style Labeling
 				leftmargin=\lyxlabelwidth,#1]}
 		{\end{description}}
 	EndPreamble
+	Requires enumitem
 End
 
 
@@ -102,13 +108,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