X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fenumitem.module;h=6539846886b80428c343b26d9087a0a5e92c6e59;hb=5c545573507bbf55f78c294188537c6aff959bc0;hp=bd70fae7ea34fe7e8307dff40a089231d94553f5;hpb=7195abcb4f404b4b00270a5f5514c5290c95a9b6;p=lyx.git

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index bd70fae7ea..6539846886 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 64
 
 # 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,18 +51,30 @@ 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
 
 
@@ -71,6 +84,7 @@ End
 Input stdlyxlist.inc
 
 Style Labeling
+	Category              List
 	LatexName             elabeling
 	# FIXME This should probably be defined using \newlist instead
 	Preamble
@@ -82,6 +96,7 @@ Style Labeling
 				leftmargin=\lyxlabelwidth,#1]}
 		{\end{description}}
 	EndPreamble
+	Requires enumitem
 End
 
 
@@ -92,13 +107,13 @@ End
 
 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
+	Argument 1
+		LabelString   "Enumerate Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+		PresetArg     "resume"
+	EndArgument
+	ResumeCounter true
+	Requires enumitem
 End
 
 # References