From: Richard Heck <rgheck@lyx.org>
Date: Thu, 21 Jan 2016 21:42:55 +0000 (-0500)
Subject: enumitem and paralist should exclude each other.
X-Git-Tag: 2.2.0beta1~108^2
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d763840a2f22edfafeb84b2fe6a1c9e6950fc721;p=features.git

enumitem and paralist should exclude each other.

Reverts cb2fe78a64e9, which used the ExcludesModule tag, which
cannot be used in modules.
---

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 1f0a7c771c..4ab191b999 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.
diff --git a/lib/layouts/paralist.module b/lib/layouts/paralist.module
index 3083440b48..61a1384b65 100644
--- a/lib/layouts/paralist.module
+++ b/lib/layouts/paralist.module
@@ -6,13 +6,13 @@
 # arguments to format the labels. Additionally, the LaTeX environments
 # itemize and enumerate are extended to use a similar optional argument.
 #DescriptionEnd
+#Excludes: enumitem
+
 # Author: Georg Baum <baum@lyx.org>
 # (structuring taken from enumitem.module by Günter Milde)
 
 Format 59
 
-ExcludesModule enumitem
-
 AddToPreamble
 	\usepackage{paralist}
 EndPreamble