X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmoderncv.layout;h=212151e6caaae99cd6418633f3a5a1cee73bb30c;hb=b6a041643db81094a24c7f80813d0edbb6e5f70e;hp=0bf79110d9922373d2f1c4dc970871d1968f4405;hpb=c94c3a0f1cad129a6479e9f26a0f3034bd9fbd12;p=lyx.git

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 0bf79110d9..212151e6ca 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,71 +1,197 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{curriculum vitae (modern)}
+#  \DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{Modern CV}
+#  \DeclareCategory{Curricula Vitae}
 # modern CV textclass definition file.
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
 # General textclass parameters
-Format 3
-Columns			1
-Sides			1
-SecNumDepth		-1
-TocDepth		-1
+Format 40
+	Columns			1
+	Sides			1
+	SecNumDepth		-1
+	TocDepth		-1
+
+Provides hyperref  1
+Provides url       1
 
 
 # Standard style definition
 Style Standard
-	Margin                Static
-	LatexType             Paragraph
-	LatexName             dummy
-	ParIndent             MM
-	ParSkip               0.4
-	Align                 Block
-	AlignPossible         Block, Left, Right, Center
-	LabelType             No_Label
+	Margin			Static
+	LatexType		Paragraph
+	LatexName		dummy
+	ParIndent		MM
+	ParSkip			0.4
+	Align			Block
+	AlignPossible		Block, Left, Right, Center
+	LabelType		No_Label
 End
 
 Input stdcounters.inc
+Input stdinsets.inc
 
 Style Section
-	Margin                Dynamic
-	LatexType             Command
-	LatexName             section
-	NeedProtect           1
-	NextNoIndent          1
-	LabelSep              xxx
-	ParSkip               0.4
-	TopSep                1.3
-	BottomSep             0.7
-	ParSep                0.7
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             No_Label
+	Margin			Dynamic
+	LatexType		Command
+	LatexName		section
+	NeedProtect		1
+	NextNoIndent		1
+	ParSkip			0.4
+	TopSep			1.3
+	BottomSep		0.7
+	ParSep			0.7
+	Align			Block
+	LabelSep		xxx
+	LabelType		No_Label
+	Font
+	  Family		Sans
+	  Series		Bold
+	EndFont
+		TocLevel 1
+End
+
+Style Subsection
+	CopyStyle		Section
+	LatexName		subsection
+	TopSep			0.9
+	BottomSep		0
+	ParSep			0.5
 	Font
-	  Family              Sans
-	  Series              Bold
+	  Family		Sans
+	  Series		Medium
 	EndFont
+	TocLevel 2
+End
+
+Style Entry
+	Margin			Dynamic
+	LatexType		Command
+	LatexName		cventry
+	Argument 1
+		LabelString   "Entry Option"
+		Tooltip       "Optional argument to the cventry command"
+	EndArgument
+	ParSkip			0.4
+	Align			Block
+	LabelSep		xx
+	LabelType		Static
+	LabelString		"Entry:"
+	LabelFont
+	  Series		Bold
+	  Color			Blue
+	EndFont
+End
+
+Style Item
+	Margin			Dynamic
+	LatexType		Command
+	LatexName		cvitem
+	Argument 1
+		LabelString   "Item Option"
+		Tooltip       "Optional argument to the cvitem command"
+	EndArgument
+	ParSkip			0.4
+	Align			Block
+	LabelSep		xx
+	LabelType		Static
+	LabelString		"Item:"
+	LabelFont
+	  Series		Bold
+	  Color			Blue
+	EndFont
+End
+
+Style ListItem
+	CopyStyle		Item
+	LatexName		cvlistitem
+	LabelString		"List Item:"
+End
+
+Style DoubleItem
+	CopyStyle		Item
+	LatexName		cvlistdoubleitem
+	LabelString		"Double Item:"
+End
+
+Style Space
+	CopyStyle		Item
+	LatexName		vspace*
+	LabelString		"Space:"
+End
+
+Style Language
+	CopyStyle		Item
+	LatexName		cvlanguage
+	LabelString		"Language:"
+End
+
+Style Computer
+	CopyStyle		Item
+	LatexName		cvcomputer
+	LabelString		"Computer:"
+End
+
+Style EmptySection
+	Margin			Dynamic
+	LatexType		Command
+	LatexName		emptysection{}
+	KeepEmpty		1
+	ParSkip			0.4
+	Align			Block
+	LabelSep		xx
+	LabelType		Static
+	LabelString		"Empty Section"
+	LabelFont
+	  Series		Bold
+	  Color			Green
+	EndFont
+End
+
+Style CloseSection
+	CopyStyle		EmptySection
+	LatexName		closesection{}
+	LabelString		"Close Section"
 End
 
 Style Bibliography
-	Margin                First_Dynamic
-	LatexType             Bib_Environment
-	LatexName             thebibliography
-	NextNoIndent          1
-	LeftMargin            MM
-	ParSkip               0.4
-	ItemSep               0
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.5
+	Margin			First_Dynamic
+	LatexType		Bib_Environment
+	LatexName		thebibliography
+	NextNoIndent		1
+	LeftMargin		MM
+	ParSkip			0.4
+	ItemSep			0
+	TopSep			0.7
+	BottomSep		0.7
+	ParSep			0.5
+	Align			Block
+	AlignPossible		Block, Left
+	LabelType		Bibliography
+	LabelString		"References"
+	LabelBottomSep		1.2
+	LabelFont
+	  Series		Bold
+	  Size			Larger
+	  Family		Sans
+	EndFont
+End
+
+Style --Separator--
+	KeepEmpty             1
+	Margin                Dynamic
+	LatexType             Paragraph
+	LatexName             dummy
+	ParIndent             MM
 	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Bibliography
-	LabelString           "References"
-	LabelBottomSep        1.2
+	LabelType             Static
+	LabelString           "--- Separate Environment ---"
 	LabelFont
-	  Series              Bold
-	  Size                Larger
-	  Family              Sans
+	  Family              Roman
+	  Series              Medium
+	  Size                Normal
+	  Color               Blue
 	EndFont
+	HTMLLabel             NONE
 End