X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdlists.inc;h=0eef65c665a9ead0e7b168ffe01ab68898722991;hb=761648b1f7d1df9de87921143b8004b6d3dd21e9;hp=24b6cc2a56fc41a1521db6c347bc7b914749c5e1;hpb=2d2d946fc67fe55bfd858d5cf437793302bf6a12;p=lyx.git

diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc
index 24b6cc2a56..0eef65c665 100644
--- a/lib/layouts/stdlists.inc
+++ b/lib/layouts/stdlists.inc
@@ -1,4 +1,3 @@
-
 # Standard textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich <ettrich@informatik.uni-tuebingen.de>
 # Transposed by Pascal André <andre@via.ecp.fr>
@@ -7,7 +6,9 @@
 # This include files contains various standard environments for lists.
 
 
-Format 35
+Format 82
+
+Input stdlyxlist.inc
 
 Style Itemize
 	Category              List
@@ -15,6 +16,7 @@ Style Itemize
 	LatexType             Item_Environment
 	LatexName             itemize
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ItemSep               0.2
@@ -24,10 +26,26 @@ Style Itemize
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Itemize
-	LabelString           "*"
 	HTMLTag               ul
 	HTMLItem              li
 	HTMLLabel             NONE
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
+	Argument listpreamble:1
+		LabelString    "List preamble"
+		MenuString     "List Preamble"
+		Tooltip        "LaTeX code to be inserted before the first item"
+		PassThru       1
+		Font
+			Family typewriter
+			Color latex
+		EndFont
+	EndArgument
+	DocBookTag            itemizedlist
+	DocBookItemTag        listitem
+	DocBookItemInnerTag   para
 End
 
 
@@ -37,6 +55,7 @@ Style Enumerate
 	LatexType             Item_Environment
 	LatexName             enumerate
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ParSkip               0.0
@@ -52,6 +71,23 @@ Style Enumerate
 	HTMLItem              li
 	HTMLLabel             NONE
 	RefPrefix             enu
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
+	Argument listpreamble:1
+		LabelString    "List preamble"
+		MenuString     "List Preamble"
+		Tooltip        "LaTeX code to be inserted before the first item"
+		PassThru       1
+		Font
+			Family typewriter
+			Color latex
+		EndFont
+	EndArgument
+	DocBookTag            orderedlist
+	DocBookItemTag        listitem
+	DocBookItemInnerTag   para
 End
 
 Style Description
@@ -70,7 +106,6 @@ Style Description
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Manual
-	LabelString           "MM"
 	LabelFont
 	  Series              Bold
 	EndFont
@@ -82,53 +117,21 @@ Style Description
 	HTMLStyle
 		dl.description dt { font-weight: bold; }
 	EndHTMLStyle
-End
-
-
-Style Labeling
-	Category              List
-	Margin                Manual
-	LatexType             List_Environment
-	LatexName             lyxlist
-	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"
-	HTMLTag               ol
-	HTMLAttr              class='lyxlist'
-	HTMLItem              li
-	HTMLLabel             span
-	HTMLLabelAttr         class='lyxlist'
-
-	#define the environment lyxlist
-	Preamble
-		\newenvironment{lyxlist}[1]
-			{\begin{list}{}
-				{\settowidth{\labelwidth}{#1}
-				 \setlength{\leftmargin}{\labelwidth}
-				 \addtolength{\leftmargin}{\labelsep}
-				 \renewcommand{\makelabel}[1]{##1\hfil}}}
-			{\end{list}}
-	EndPreamble
-
-	HTMLStyle
-		ol.lyxlist {
-			list-style-type: none;
-		}
-		li.labeling_item {
-			text-indent: -5em;
-			margin-left: 5em;
-		}
-		span.lyxlist {
-			margin-right: 1em;
-		}
-	EndHTMLStyle
+	Argument listpreamble:1
+		LabelString    "List preamble"
+		MenuString     "List Preamble"
+		Tooltip        "LaTeX code to be inserted before the first item"
+		PassThru       1
+		Font
+			Family typewriter
+			Color latex
+		EndFont
+	EndArgument
+	DocBookTag            variablelist
+	DocBookItemWrapperTag varlistentry
+	DocBookItemTag        listitem
+	DocBookItemInnerTag   para
+	DocBookItemLabelTag   term
 End