Revert "modernCV: complete revision of layout and example"

This reverts commit 58f6767e2c3fa92f4ddc45d1075837f2ef25681c.

- additionally add the new requirement "suffix.sty"

lib/layouts/moderncv.layout

@@ -1,6 +1,6 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{curriculum vitae (modern)}
+#  \DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty,suffix.sty]{curriculum vitae (modern)}
-# textclass definition file for modernCV 1.2.0
+# modern CV textclass definition file.
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
@@ -29,135 +29,6 @@ End
 
 Input stdcounters.inc
 Input stdinsets.inc
-Input stdlists.inc
-
-Style CVStyle
-	Margin		Dynamic
-	LatexType	Command
-	LatexName	moderncvstyle
-	Category	FrontMatter
-	InPreamble	1
-	ParSkip		0.4
-	LabelSep	xx
-	LabelType	Static
-	LabelString	"CV style:"
-	LabelFont
-	  Series	Bold
-	  Color		Blue
-	EndFont
-End
-
-Style CVColor
-	CopyStyle	CVStyle
-	LatexName	moderncvcolor
-	LabelString	"CV color scheme:"
-End
-
-Style FirstName
-	LatexType	command
-	LatexName	firstname
-	Category	FrontMatter
-	InPreamble	1
-	TopSep		0.7
-	Align		Center
-	Font
-	  Family	Sans
-	  Size		Largest
-	EndFont
-End
-
-Style FamilyName
-	CopyStyle	FirstName
-	LatexName	familyname
-	TopSep		0.3
-	LabelString	"Family Name:"
-End
-
-Style Title
-	Margin		Static
-	LatexType	Command
-	Category	FrontMatter
-	InPreamble	1
-	LatexName	title
-	ParSkip		0.4
-	ItemSep		0
-	TopSep		0.7
-	BottomSep	0.7
-	ParSep		1
-	Align		Center
-	LabelType	No_Label
-	Font
-	  Size		Larger
-	  Shape		Italic
-	  EndFont
-	HTMLTag		h1
-	HTMLTitle	true
-End
-
-Style Address
-	CopyStyle	CVStyle
-	LatexName	address
-	RequiredArgs	1
-	LabelString	"Address:"
-	BottomSep	0.3
-	TopSep		0
-End
-
-Style Mobile
-	CopyStyle	CVStyle
-	LatexName	mobile
-	LabelString	"Mobile:"
-End
-
-Style Phone
-	CopyStyle	CVStyle
-	LatexName	phone
-	LabelString	"Phone:"
-End
-
-Style Fax
-	CopyStyle	CVStyle
-	LatexName	fax
-	LabelString	"Fax:"
-End
-
-Style Email
-	CopyStyle	CVStyle
-	LatexName	email
-	LabelString	"Email:"
-End
-
-Style Homepage
-	CopyStyle	CVStyle
-	LatexName	homepage
-	LabelString	"Homepage:"
-End
-
-Style ExtraInfo
-	CopyStyle	CVStyle
-	LatexName	extrainfo
-	LabelString	"Extra Info:"
-End
-
-Style Photo
-	CopyStyle	CVStyle
-	LatexName	photo
-	LabelString	"Photo:"
-	OptionalArgs	2
-End
-
-Style Quote
-	CopyStyle	CVStyle
-	LatexName	quote
-	LabelType	No_Label
-	Align		Center
-	BottomSep	0.7
-	TopSep		0.5
-	Font
-	  Shape		Italic
-	  Size		Large
-	EndFont
-End
 
 Style Section
 	Margin		Dynamic
@@ -196,7 +67,7 @@ Style Entry
 	Margin		Dynamic
 	LatexType	Command
 	LatexName	cventry
-	RequiredArgs	5
+	OptionalArgs		1
 	ParSkip		0.4
 	Align		Block
 	LabelSep	xx
@@ -209,59 +80,49 @@ Style Entry
 End
 
 Style Item
-	CopyStyle	Entry
+	Margin		Dynamic
+	LatexType	Command
 	LatexName	cvitem
-	RequiredArgs	1
+	OptionalArgs	1
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
 	LabelString	"Item:"
+	LabelFont
+	  Series	Bold
+	  Color		Blue
+	EndFont
 End
 
 Style ListItem
 	CopyStyle	Item
 	LatexName	cvlistitem
-	Category	List
-	RequiredArgs	0
 	LabelString	"List Item:"
 End
 
-Style ItemWithComment
-	CopyStyle	Item
-	LatexName	cvitemwithcomment
-	RequiredArgs	2
-	LabelString	"Item with comment:"
-	Font
-	  Shape		Italic
-	EndFont
-	LabelFont
-	  Series	Bold
-	  Color		Blue
-	  Shape		Up
-	EndFont
-End
-
 Style DoubleItem
 	CopyStyle	Item
-	LatexName	cvdoubleitem
+	LatexName	cvlistdoubleitem
-	RequiredArgs	3
 	LabelString	"Double Item:"
 End
 
-Style DoubleListItem
-	CopyStyle	Item
-	LatexName	cvlistdoubleitem
-	Category	List
-	LabelString	"Double List Item:"
-End
-
 Style Space
-	ObsoletedBy	VSpace
+	CopyStyle	Item
+	LatexName	vspace*
+	LabelString	"Space:"
 End
 
 Style Language
-	ObsoletedBy	ItemWithComment
+	CopyStyle	Item
+	LatexName	cvlanguage
+	LabelString	"Language:"
 End
 
 Style Computer
-	ObsoletedBy	DoubleItem
+	CopyStyle	Item
+	LatexName	cvcomputer
+	LabelString	"Computer:"
 End
 
 Style EmptySection
@@ -286,27 +147,6 @@ 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
@@ -348,66 +188,3 @@ Style --Separator--
 	HTMLLabel	NONE
 End
 
-Style Recipient
-	Margin		Dynamic
-	LatexType	Command
-	LatexName	recipient
-	Category	Letter
-	RequiredArgs	1
-	NextNoIndent	1
-	ParSkip		0.4
-	TopSep		1.3
-	BottomSep	0
-	ParSep		0.7
-	Align		Left
-	LabelSep	xxx
-	LabelType	No_Label
-	Font
-	  Series	Bold
-	EndFont
-End
-
-Style Date
-	CopyStyle	Recipient
-	LatexName	date
-	RequiredArgs	0
-	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
-	OptionalArgs	1
-	LabelSep	xx
-	LabelType	Static
-	LabelString	"Enclosing:"
-	Font
-	  Shape		Italic
-	EndFont
-	LabelFont
-	  Shape		Up
-	  Series	Bold
-	  Color		Blue
-	EndFont
-	
-End
-

status.20x

@@ -45,11 +45,6 @@ What's new
 - Show a symbol on collapsed branches indicating whether they are
   active.
 
-- completely revised layout and example files for modernCV
-  (Note: Due to massive changes in the modernCV document class
-         you need to adapt your existing files according to the new
-         example file to keep them compilable.)
-
 
 * DOCUMENTATION AND LOCALIZATION