X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fenumitem.module;h=db9ff32d986f0e0653b663a3f40647b5b39e16af;hb=bf88ad495cead6e97a05fee59e41414648145fc1;hp=74c66af2c485d613cd7402caa5e73d256a34b8b0;hpb=04e6f69a42291fa8c2282ca9d28e7cfc403e53bf;p=lyx.git

diff --git a/lib/layouts/enumitem.module b/lib/layouts/enumitem.module
index 74c66af2c4..db9ff32d98 100644
--- a/lib/layouts/enumitem.module
+++ b/lib/layouts/enumitem.module
@@ -1,17 +1,21 @@
-#\DeclareLyXModule[enumitem.sty]{Customizable Lists (enumitem)}
+#\DeclareLyXModule[enumitem.sty]{Customisable Lists (enumitem)}
+#\DeclareCategory{List Enhancements}
 #DescriptionBegin
-# Controls 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>
+#Excludes: paralist
+
+# Author: Günter Milde <milde@lyx.org>
 # 
-# 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 74
+
 # 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,74 +37,67 @@
 # 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
 	\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
+ModifyStyle Itemize
+	Argument 1
+		LabelString   "Itemize Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
+	Requires enumitem
 End
 
-Style Enumerate
-	OptionalArgs          1
-	Requires	enumitem
+ModifyStyle Enumerate
+	Argument 1
+		LabelString   "Enumerate Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
+	Requires enumitem
 End
 
-Style Description
-	OptionalArgs          1
-	Requires	enumitem
+ModifyStyle Description
+	Argument 1
+		LabelString   "Description Options"
+		Tooltip       "Optional arguments for this list (see enumitem manual)"
+	EndArgument
+	Requires enumitem
 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
+	Requires enumitem
 End
 
 
@@ -111,13 +108,18 @@ End
 
 Style Enumerate-Resume
 	CopyStyle             Enumerate
-	LatexParam            [resume]
-	OptionalArgs          0
-	Requires	      enumitem
-	# 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
+# ----------
+#
+# .. _enumitem.pdf:
+#    http://dante.ctan.org/CTAN/macros/latex/contrib/enumitem/enumitem.pdf
+