modernCV: complete revision for modernCV 1.2.0

lib/layouts/moderncv.layout

@@ -1,19 +1,19 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{Modern CV}
 #  \DeclareCategory{Curricula Vitae}
-# modern CV textclass definition file.
+# modern CV textclass definition file for modernCV 1.2.0
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
 # General textclass parameters
 Format 41
-	Columns			1
+	Columns		1
-	Sides			1
+	Sides		1
-	SecNumDepth		-1
+	SecNumDepth	-1
-	TocDepth		-1
+	TocDepth	-1
 
-Provides hyperref  1
+Provides hyperref	1
-Provides url       1
+Provides url		1
 
 
 # Standard style definition
@@ -30,6 +30,7 @@ End
 
 Input stdcounters.inc
 Input stdinsets.inc
+Input stdlists.inc
 
 Style Section
 	Margin			Dynamic
@@ -48,7 +49,7 @@ Style Section
 	  Family		Sans
 	  Series		Bold
 	EndFont
-		TocLevel 1
+	TocLevel		1
 End
 
 Style Subsection
@@ -61,7 +62,7 @@ Style Subsection
 	  Family		Sans
 	  Series		Medium
 	EndFont
-	TocLevel 2
+	TocLevel		2
 End
 
 Style Entry
@@ -69,8 +70,32 @@ Style Entry
 	LatexType		Command
 	LatexName		cventry
 	Argument 1
-		LabelString   "Entry Option"
+	  Mandatory		1
-		Tooltip       "Optional argument to the cventry command"
+	  LabelString		"Time"
+	  Tooltip		"Time"
+	EndArgument
+	Argument 2
+	  Mandatory		1
+	  LabelString		"What?"
+	  Tooltip		"What?"
+	EndArgument
+	Argument 3
+	  Mandatory		1
+	  LabelString		"Affiliation"
+	  Tooltip		"Affiliation"
+	  #Font
+	  #  Shape		Italic
+	  #EndFont
+	EndArgument
+	Argument 4
+	  Mandatory		1
+	  LabelString		"City"
+	  Tooltip		"City"
+	EndArgument
+	Argument 5
+	  Mandatory		1
+	  LabelString		"Country"
+	  Tooltip		"Country"
 	EndArgument
 	ParSkip			0.4
 	Align			Block
@@ -88,8 +113,9 @@ Style Item
 	LatexType		Command
 	LatexName		cvitem
 	Argument 1
-		LabelString   "Item Option"
+	  Mandatory		1
-		Tooltip       "Optional argument to the cvitem command"
+	  LabelString		"Item summary"
+	  Tooltip		"item summary"
 	EndArgument
 	ParSkip			0.4
 	Align			Block
@@ -102,34 +128,71 @@ Style Item
 	EndFont
 End
 
+Style ItemWithComment
+	CopyStyle		Item
+	LatexName		cvitemwithcomment
+	LabelString		"Item with comment:"
+	KeepEmpty		1
+	ResetArgs		1
+	Argument 1
+	  Mandatory		1
+	  LabelString		"Item summary"
+	  Tooltip		"Item summary"
+	EndArgument
+	Argument 2
+	  Mandatory		1
+	  LabelString		"Item text"
+	  Tooltip		"Item text"
+	EndArgument
+End
+
 Style ListItem
 	CopyStyle		Item
 	LatexName		cvlistitem
 	LabelString		"List Item:"
+	ResetArgs		1
 End
 
 Style DoubleItem
-	CopyStyle		Item
+	CopyStyle		ListItem
-	LatexName		cvlistdoubleitem
+	LatexName		cvdoubleitem
 	LabelString		"Double Item:"
+	KeepEmpty		1
+	Argument 1
+	  Mandatory		1
+	  LabelString		"Left item summary"
+	  Tooltip		"Left item summary"
+	EndArgument
+	Argument 2
+	  Mandatory		1
+	  LabelString		"Left item text"
+	  Tooltip		"Left item text"
+	EndArgument
+	Argument 3
+	  Mandatory		1
+	  LabelString		"Right item summary"
+	  Tooltip		"Right item summary"
+	EndArgument
 End
 
-Style Space
+Style DoubleListItem
-	CopyStyle		Item
+	CopyStyle		ListItem
-	LatexName		vspace*
+	LatexName		cvlistdoubleitem
-	LabelString		"Space:"
+	LabelString		"Double List Item:"
+	ResetArgs		1
+	Argument 1
+	  Mandatory		1
+	  LabelString		"First Item"
+	  Tooltip		"First Item"
+	EndArgument
 End
 
 Style Language
-	CopyStyle		Item
+	ObsoletedBy		ItemWithComment
-	LatexName		cvlanguage
-	LabelString		"Language:"
 End
 
 Style Computer
-	CopyStyle		Item
+	ObsoletedBy		DoubleItem
-	LatexName		cvcomputer
-	LabelString		"Computer:"
 End
 
 Style EmptySection
@@ -154,6 +217,27 @@ Style CloseSection
 	LabelString		"Close Section"
 End
 
+Style MakeCVtitle
+	CopyStyle		EmptySection
+	LatexName		makecvtitle{}
+	LabelString		"Make CV title"
+	Category		Title
+End
+
+Style MakeLetterTitle
+	CopyStyle		EmptySection
+	LatexName		makelettertitle{}
+	LabelString		"Make letter title"
+	Category		Letter
+End
+
+Style MakeLetterClosing
+	CopyStyle		EmptySection
+	LatexName		makeletterclosing{}
+	LabelString		"Close Letter"
+	Category		Letter
+End
+
 Style Bibliography
 	Margin			First_Dynamic
 	LatexType		Bib_Environment
@@ -178,20 +262,93 @@ Style Bibliography
 End
 
 Style --Separator--
-	KeepEmpty             1
+	KeepEmpty		1
-	Margin                Dynamic
+	Margin			Dynamic
-	LatexType             Paragraph
+	LatexType		Paragraph
-	LatexName             dummy
+	LatexName		dummy
-	ParIndent             MM
+	ParIndent		MM
-	Align                 Block
+	Align			Block
-	LabelType             Static
+	LabelType		Static
-	LabelString           "--- Separate Environment ---"
+	LabelString		"--- Separate Environment ---"
 	LabelFont
-	  Family              Roman
+	  Family		Roman
-	  Series              Medium
+	  Series		Medium
-	  Size                Normal
+	  Size			Normal
-	  Color               Blue
+	  Color			Blue
 	EndFont
-	HTMLLabel             NONE
+	HTMLLabel		NONE
+End
+
+Style Recipient
+	Margin			Dynamic
+	LatexType		Command
+	LatexName		recipient
+	Category		Letter
+	Argument 1
+	  Mandatory		1
+	  LabelString		"Company name"
+	  Tooltip		"Company name"
+	  #Font
+	  #  Series		Bold
+	  #EndFont
+	EndArgument
+	NextNoIndent		1
+	ParSkip			0.4
+	TopSep			1.3
+	BottomSep		0
+	ParSep			0.7
+	Align			Left
+	LabelSep		xxx
+	LabelType		No_Label
+	Font
+	  Shape			Italic
+	EndFont
+End
+
+Style Date
+	CopyStyle		Recipient
+	LatexName		date
+	ResetArgs		1
+	TopSep			0
+	BottomSep		0
+	Align			Right
+	Font
+	  Series		Medium
+	EndFont
+End
+
+Style Opening
+	CopyStyle		Date
+	LatexName		opening
+	TopSep			0
+	BottomSep		0.5
+	Align			Left
+End
+
+Style Closing
+	CopyStyle		Opening
+	LatexName		closing
+End
+
+Style Enclosing
+	Margin			Dynamic
+	CopyStyle		Opening
+	LatexName		enclosure
+	Argument 1
+	  LabelString		"Alternative enclosing name"
+	  Tooltip		"Alternative enclosing name"
+	EndArgument
+	LabelSep		xx
+	LabelType		Static
+	LabelString		"Enclosing:"
+	Font
+	  Shape			Italic
+	EndFont
+	LabelFont
+	  Shape			Up
+	  Series		Bold
+	  Color			Blue
+	EndFont
+	
 End