X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fenumitem.module;h=161900063165d21ab65f6bae14c8621343d8c4e6;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=4d10f1c34eff6e20f75962a9f8458c07bf0e77ed;hpb=6d67f264aa31f0d14b34563e26394d6a2472b1f9;p=lyx.git

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 4d10f1c34e..1619000631 100644
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -1,17 +1,18 @@
-#\DeclareLyXModule[enumitem.sty]{Customizable Lists (enumitem)}
+#\DeclareLyXModule[enumitem.sty]{Customisable Lists (enumitem)}
 #DescriptionBegin
-# Control the layout of enumerate, itemize and description
-# with an optional argument.
-# See http://mirror.ctan.org/macros/latex/contrib/enumitem/enumitem.pdf
+# 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>
 # 
-# 2008-12-04 first published version
+# 2008-12-04 first published version.
 # 2009-02-02 use name Labeling for "LyX-List/Labeling" list type,
 # 	     copy standard layout verbatim for failsave working with 
-#	     both KOMA and non-KOMA document classes
-# 2010-11-16 use Require keyword instead of \usepackage in preamble
-#
+#	     both KOMA and non-KOMA document classes.
+# 2011-01-12 bugfix: set elabeling label font to \normalfont.
+
+Format 45
+
 # The package enumitem provides user control over the layout of the three
 # basic list environments: enumerate, itemize and description. It supersedes
 # both enumerate and mdwlist (providing well-structured replacements for all
@@ -33,73 +34,63 @@
 # a) generally in the LaTeX preamble and 
 # b) per environment with optional arguments
 #
-# See enumitem.pdf for details and examples.
-#    http://dante.ctan.org/CTAN/macros/latex/contrib/enumitem/enumitem.pdf
+# See enumitem.pdf_ for details and examples.
 #
 # TODO: since version 2.0, enumitem supports "cloning" of lists.
 #       Producing a labeling as clone of a description allows
 #       Preamble-Styling specific to this list type.
 
-Format 30
-
 AddToPreamble
+	\usepackage{enumitem}		% customizable list environments
 	\newlength{\lyxlabelwidth}      % auxiliary length 
 EndPreamble
 
-# Customizable Basic Lists
+
+# Customisable Basic Lists
 # ------------------------
 
 # With enumitem, the three standard list environments take an optional
-# argument. See enumitem.pdf_ for possible values.
+# argument. See enumitem.pdf for possible values.
 
-Style Itemize
-	OptionalArgs          1
-	Requires	enumitem
+IfStyle Itemize
+	Argument 1
+		LabelString   "Itemize Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
 End
 
-Style Enumerate
-	OptionalArgs          1
-	Requires	enumitem
+IfStyle Enumerate
+	Argument 1
+		LabelString   "Enumerate Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
 End
 
-Style Description
-	OptionalArgs          1
-	Requires	enumitem
+IfStyle Description
+	Argument 1
+		LabelString   "Description Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
 End
 
-# Customizable LyX List
+
+# Customisable LyX List
 # ---------------------
 
+Input stdlyxlist.inc
+
 Style Labeling
-	# verbatim insert definition of List environment, 
-	# The KOMA script classes replace List with Labeling, 
-	# this leads to an error with "CopyStyle List"!
 	Category              List
-	Margin                Manual
-	LatexType             List_Environment
-	NextNoindent          1
-	LabelSep              xxx
-	ParSkip               0.4
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.5
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Manual
-	LabelString           "00.00.0000"
-	# en of verbatim copy
-	
 	LatexName             elabeling
-	OptionalArgs          1
-	Requires	      enumitem
+	# FIXME This should probably be defined using \newlist instead
 	Preamble
 	% labeling-like list based on enumitem's description list with
 	% mandatory second argument (label-pattern):
-	\newenvironment{elabeling}[2][]%
-	  {\settowidth{\lyxlabelwidth}{#2}
-	   \begin{description}[font=,style=sameline,
-			       leftmargin=\lyxlabelwidth,#1]}
-	  {\end{description}}
+		\newenvironment{elabeling}[2][]%
+		{\settowidth{\lyxlabelwidth}{#2}
+			\begin{description}[font=\normalfont,style=sameline,
+				leftmargin=\lyxlabelwidth,#1]}
+		{\end{description}}
 	EndPreamble
 End
 
@@ -112,12 +103,17 @@ End
 Style Enumerate-Resume
 	CopyStyle             Enumerate
 	LatexParam            [resume]
-	OptionalArgs          0
-	Requires	      enumitem
+	ResetArgs             1
 	# a blue label to indicate that this is not a WYSIWYG label
 	# because the numbering differs in the output
 	LabelFont
-	  Color		      blue
+	  Color blue
 	EndFont
 End
 
+# References
+# ----------
+#
+# .. _enumitem.pdf:
+#    http://dante.ctan.org/CTAN/macros/latex/contrib/enumitem/enumitem.pdf
+