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

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 79ec97d3f0..212151e6ca 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,16 +1,20 @@
 #% 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 4
+Format 40
 	Columns			1
 	Sides			1
 	SecNumDepth		-1
 	TocDepth		-1
 
+Provides hyperref  1
+Provides url       1
+
 
 # Standard style definition
 Style Standard
@@ -25,6 +29,7 @@ Style Standard
 End
 
 Input stdcounters.inc
+Input stdinsets.inc
 
 Style Section
 	Margin			Dynamic
@@ -37,25 +42,41 @@ Style Section
 	BottomSep		0.7
 	ParSep			0.7
 	Align			Block
-	AlignPossible         	Block, Left
 	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		Medium
+	EndFont
+	TocLevel 2
 End
 
 Style Entry
 	Margin			Dynamic
 	LatexType		Command
 	LatexName		cventry
-	OptionalArgs		1
+	Argument 1
+		LabelString   "Entry Option"
+		Tooltip       "Optional argument to the cventry command"
+	EndArgument
 	ParSkip			0.4
 	Align			Block
 	LabelSep		xx
 	LabelType		Static
-	LabelString		Entry:
+	LabelString		"Entry:"
 	LabelFont
 	  Series		Bold
 	  Color			Blue
@@ -66,12 +87,15 @@ Style Item
 	Margin			Dynamic
 	LatexType		Command
 	LatexName		cvitem
-	OptionalArgs		1
+	Argument 1
+		LabelString   "Item Option"
+		Tooltip       "Optional argument to the cvitem command"
+	EndArgument
 	ParSkip			0.4
 	Align			Block
 	LabelSep		xx
 	LabelType		Static
-	LabelString		Item:
+	LabelString		"Item:"
 	LabelFont
 	  Series		Bold
 	  Color			Blue
@@ -79,83 +103,33 @@ Style Item
 End
 
 Style ListItem
-	Margin			Dynamic
-	LatexType		Command
+	CopyStyle		Item
 	LatexName		cvlistitem
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
 	LabelString		"List Item:"
-	LabelFont
-	  Series		Bold
-	  Color			Blue
-	EndFont
 End
 
 Style DoubleItem
-	Margin			Dynamic
-	LatexType		Command
+	CopyStyle		Item
 	LatexName		cvlistdoubleitem
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
 	LabelString		"Double Item:"
-	LabelFont
-	  Series		Bold
-	  Color			Blue
-	EndFont
 End
 
 Style Space
-	Margin			Dynamic
-	LatexType		Command
+	CopyStyle		Item
 	LatexName		vspace*
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		Space:
-	LabelFont
-	  Series		Bold
-	  Color			Blue
-	EndFont
+	LabelString		"Space:"
 End
 
 Style Language
-	Margin			Dynamic
-	LatexType		Command
+	CopyStyle		Item
 	LatexName		cvlanguage
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		Language:
-	LabelFont
-	  Series		Bold
-	  Color			Blue
-	EndFont
+	LabelString		"Language:"
 End
 
 Style Computer
-	Margin			Dynamic
-	LatexType		Command
+	CopyStyle		Item
 	LatexName		cvcomputer
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		Computer:
-	LabelFont
-	  Series		Bold
-	  Color			Blue
-	EndFont
+	LabelString		"Computer:"
 End
 
 Style EmptySection
@@ -175,19 +149,9 @@ Style EmptySection
 End
 
 Style CloseSection
-	Margin			Dynamic
-	LatexType		Command
+	CopyStyle		EmptySection
 	LatexName		closesection{}
-	KeepEmpty		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
 	LabelString		"Close Section"
-	LabelFont
-	  Series		Bold
-	  Color			Green
-	EndFont
 End
 
 Style Bibliography
@@ -213,3 +177,21 @@ Style Bibliography
 	EndFont
 End
 
+Style --Separator--
+	KeepEmpty             1
+	Margin                Dynamic
+	LatexType             Paragraph
+	LatexName             dummy
+	ParIndent             MM
+	Align                 Block
+	LabelType             Static
+	LabelString           "--- Separate Environment ---"
+	LabelFont
+	  Family              Roman
+	  Series              Medium
+	  Size                Normal
+	  Color               Blue
+	EndFont
+	HTMLLabel             NONE
+End
+