X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmoderncv.layout;h=3d7e9a218f2d43bf73d3a2b35fb442744f4c793d;hb=1a89f89337413adb6188e6265c6e1c49e0969f65;hp=241e399899e7083d91136ff998ecf80642cc24e5;hpb=486c7cc0696416e7e09242269c64442afd5fda02;p=lyx.git

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 241e399899..3d7e9a218f 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,12 +1,13 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty,suffix.sty]{Modern CV}
+#  \DeclareLaTeXClass[moderncv,ebgaramond.sty,fancyhdr.sty,fontawesome.sty,ifpdf.sty,marvosym.sty]{Modern CV}
 #  \DeclareCategory{Curricula Vitae}
-# textclass definition file for modernCV 1.3.0
+# textclass definition file for modernCV 2.0.x
+# (also works with modernCV 1.5.x)
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
 # General textclass parameters
-Format 54
+Format 60
 	Columns		1
 	Sides		1
 	SecNumDepth	-1
@@ -47,6 +48,10 @@ Style CVStyle
 	  Series	Bold
 	  Color		Blue
 	EndFont
+	Argument 1
+	  LabelString	"Style Options"
+	  Tooltip		"Options for the CV style"
+	EndArgument
 End
 
 Style CVColor
@@ -55,15 +60,27 @@ Style CVColor
 	LabelString	"CV Color Scheme:"
 End
 
+Style CVIcons
+	CopyStyle	CVStyle
+	LatexName	moderncvicons
+	LabelString	"CV Icon Set:"
+End
+
+Style CVColumnWidth
+	CopyStyle	CVStyle
+	LatexName	setlength{\hintscolumnwidth}
+	LabelString	"Column Width:"
+End
+
 Style PDF_Page_Mode
 	CopyStyle	CVStyle
 	LatexName	renewcommand{\pdfpagemode}
 	LabelString	"PDF Page Mode:"
 End
 
-Style FirstName
+Style Name
 	LatexType	command
-	LatexName	firstname
+	LatexName	name
 	Category	FrontMatter
 	InPreamble	1
 	TopSep		0.7
@@ -72,6 +89,18 @@ Style FirstName
 	  Family	Sans
 	  Size		Largest
 	EndFont
+	Argument 1
+	  LabelString	"First Name"
+	  Tooltip	"First name"
+	  Mandatory	1
+	EndArgument
+End
+
+Style FirstName
+	CopyStyle	Name
+	LatexName	firstname
+	ResetArgs	0
+	ObsoletedBy	Name
 End
 
 Style FamilyName
@@ -79,6 +108,7 @@ Style FamilyName
 	LatexName	familyname
 	TopSep		0.3
 	LabelString	"Family Name:"
+	ObsoletedBy	Name
 End
 
 Style Title
@@ -109,35 +139,39 @@ Style Address
 	BottomSep	0.3
 	TopSep		0
 	Argument 1
-	  LeftDelim	{
-	  RightDelim	}
 	  LabelString	"Line 1"
 	  Tooltip	"Optional address line"
+	  Mandatory	1
 	EndArgument
 	Argument 2
-	  LeftDelim	{
-	  RightDelim	}
 	  LabelString	"Line 2"
 	  Tooltip	"Optional address line"
+	  Mandatory	1
 	EndArgument
 End
 
-Style Mobile
-	CopyStyle	CVStyle
-	LatexName	mobile
-	LabelString	"Mobile:"
-End
-
 Style Phone
 	CopyStyle	CVStyle
 	LatexName	phone
 	LabelString	"Phone:"
+	Argument 1
+	  LabelString	"Phone Type"
+	  Tooltip	"can be fixed, mobile or fax"
+	EndArgument
+End
+
+Style Mobile
+	CopyStyle	CVStyle
+	LatexName	mobile
+	LabelString	"Mobile:"
+	ObsoletedBy	Phone
 End
 
 Style Fax
 	CopyStyle	CVStyle
 	LatexName	fax
 	LabelString	"Fax:"
+	ObsoletedBy	Phone
 End
 
 Style Email