X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fsimplecv.layout;h=c20c0ecba9cd6a271dcd2b89848c043edc769718;hb=c8c1c15631712d458e98b612ba8c049a7ae4d260;hp=a350eccef47a74832dd78c6ecc93132fa426da12;hpb=1832a388c5495210c30acb134414dd5b2edf3e7d;p=lyx.git

diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout
index a350eccef4..c20c0ecba9 100644
--- a/lib/layouts/simplecv.layout
+++ b/lib/layouts/simplecv.layout
@@ -1,10 +1,11 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{curriculum vitae (simple)}
+#  \DeclareLaTeXClass{Simple CV}
+#  \DeclareCategory{Curricula Vitae}
 # Simple CV textclass definition file.
 # Author : Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
 
 
-Format 21
+Format 98
 Columns                 1
 Sides                   1
 SecNumDepth             -1
@@ -13,7 +14,9 @@ TocDepth                -1
 Input stdcounters.inc
 Input stdinsets.inc
 
+
 Style Standard
+	Category              MainText
 	Margin                Static
 	LatexType             Paragraph
 	LatexName             dummy
@@ -22,10 +25,12 @@ Style Standard
 	Align                 Block
 	AlignPossible         Block, Left, Right, Center
 	LabelType             No_Label
+	DocBookTag            para
 End
 
 
 Style Section
+	Category              Sectioning
 	Margin                Dynamic
 	LatexType             Command
 	LatexName             section
@@ -42,7 +47,16 @@ Style Section
 	  Family              Sans
 	  Series              Bold
 	EndFont
-		TocLevel 1
+	TocLevel 1
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The section as it appears in the table of contents/running headers"
+		InsertCotext   1
+		IsTocCaption   1
+	EndArgument
+	DocBookTag            title
+	DocBookTagType        paragraph
+	DocBookSectionTag     section
 End
 
 
@@ -58,6 +72,16 @@ Style Topic
 	Margin                Manual
 	LatexType             Item_environment
 	LatexName             topic
+	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
 	NextNoIndent          1
 	LabelSep              xxx
 	ParSkip               0.4
@@ -68,19 +92,36 @@ Style Topic
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Manual
-	LabelString           "MMMMM"
 	LabelFont
 	  Family              Sans
 	  Shape               Slanted
 	EndFont
+	DocBookTag            variablelist
+	DocBookItemWrapperTag varlistentry
+	DocBookItemTag        listitem
+	DocBookItemInnerTag   para
+	DocBookItemLabelTag   term
+	DocBookItemLabelTagType   paragraph
 End
 
 
 Style Itemize
+	Category              List
 	Margin                Static
 	LatexType             Item_Environment
 	LatexName             itemize
+	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
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ItemSep               0.2
@@ -90,7 +131,12 @@ Style Itemize
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Itemize
-	LabelString           "*"
+	HTMLTag               ul
+	HTMLItem              li
+	HTMLLabel             NONE
+	DocBookTag            itemizedlist
+	DocBookItemTag        listitem
+	DocBookItemInnerTag   para
 End
 
 
@@ -108,6 +154,8 @@ Style Left_Header
 	Font
 	  Family              Sans
 	EndFont
+	DocBookTag            para
+	DocBookAttr           role='left-header'
 End
 
 
@@ -115,10 +163,13 @@ Style Right_Header
 	CopyStyle             Left_Header
 	LatexName             rightheader
 	Margin                Right_Address_Box
+	DocBookTag            para
+	DocBookAttr           role='right-header'
 End
 
 
 Style Title
+	Category              FrontMatter
 	Margin                Static
 	LatexType             Command
 	InTitle               1
@@ -136,17 +187,33 @@ Style Title
 	  Size                Largest
 	EndFont
 	HTMLTitle             true
+	DocBookTag            title
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End
 
 
 Style Bibliography
 	CopyStyle             Topic
+	Category              BackMatter
 	LatexName             thebibliography
 	LatexType             Bib_Environment
 	LabelType             Bibliography
-	LabelString           ""
 	LabelBottomSep        0.7
+	ToggleIndent          Never
 	LabelFont
 	  Size                Tiny
 	EndFont
+	TocLevel              1
+	IsTocCaption          0
+	Argument listpreamble:1
+	  LabelString    "Bib preamble"
+	  MenuString     "Bibliography Preamble"
+	  Tooltip        "LaTeX code to be inserted before the first bibliography item"
+	  PassThru       1
+	  Font
+	    Family typewriter
+	    Color latex
+	  EndFont
+	EndArgument
 End