From: Georg Baum <baum@lyx.org>
Date: Sun, 20 Sep 2015 17:33:43 +0000 (+0200)
Subject: Use Require instead of AddToPreamble
X-Git-Tag: 2.2.0alpha1~305
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=141026b6b1ceae5b8bee0133f81a3a6e23edbc68;p=features.git

Use Require instead of AddToPreamble

This plays more nicely with other modules requiring enumitem as well.
---

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 966847a6ca..6d3d7c4692 100644
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -41,7 +41,6 @@ Format 54
 #       Preamble-Styling specific to this list type.
 
 AddToPreamble
-	\usepackage{enumitem}		% customizable list environments
 	\newlength{\lyxlabelwidth}      % auxiliary length 
 EndPreamble
 
@@ -57,6 +56,7 @@ IfStyle Itemize
 		LabelString   "Itemize Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
 IfStyle Enumerate
@@ -64,6 +64,7 @@ IfStyle Enumerate
 		LabelString   "Enumerate Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
 IfStyle Description
@@ -71,6 +72,7 @@ IfStyle Description
 		LabelString   "Description Options"
 		Tooltip       "Optional arguments for this list (see enumitem manual)"
 	EndArgument
+	Requires enumitem
 End
 
 
@@ -92,6 +94,7 @@ Style Labeling
 				leftmargin=\lyxlabelwidth,#1]}
 		{\end{description}}
 	EndPreamble
+	Requires enumitem
 End
 
 
@@ -112,6 +115,7 @@ Style Enumerate-Resume
 	LabelFont
 	  Color blue
 	EndFont
+	Requires enumitem
 End
 
 # References