X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmoderncv.layout;h=e3e1fa36e02344451e8e94a1bdf5daf02aaa7618;hb=d0379db1aab1aeeefeea8cf31db7ab7d88396fed;hp=7512e3fa02aac7e36dc49dcf2d14f657151d570a;hpb=eb53c60a8f2e3b9bf6fb783a893cc7814f94139f;p=lyx.git

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 7512e3fa02..e3e1fa36e0 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 45
+Format 80
 	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
@@ -152,24 +186,46 @@ Style Homepage
 	LabelString	"Homepage:"
 End
 
+Style Social
+	CopyStyle	CVStyle
+	LatexName	social
+	LabelString	"Social:"
+	Argument 1
+	  LabelString	"Name"
+	  Tooltip	"Name of the social network"
+	EndArgument
+End
+
 Style ExtraInfo
 	CopyStyle	CVStyle
 	LatexName	extrainfo
 	LabelString	"Extra Info:"
 End
 
+# Path to a digital image:
 Style Photo
 	CopyStyle	CVStyle
+	Font
+	  Family	typewriter
+	EndFont
+	LabelFont
+	  Family	Roman
+	  Series	Bold
+	  Color		Blue
+	EndFont
 	LatexName	photo
 	LabelString	"Photo:"
 	Argument 1
 	  LabelString	"Height"
 	  Tooltip	"Height the photo is resized to"
+	  PassThru	1
 	EndArgument
 	Argument 2
 	  LabelString	"Thickness"
 	  Tooltip	"Thickness of the surrounding frame"
+	  PassThru	1
 	EndArgument
+	PassThru	1
 End
 
 Style Quote
@@ -263,6 +319,7 @@ InsetLayout Flex:Column
 	Argument 1
 	  LabelString	"Width"
 	  Tooltip	"Optional width"
+	  PassThru	1
 	EndArgument
 	Argument 2
 	  Mandatory	1
@@ -275,6 +332,7 @@ InsetLayout Flex:Column
 	  Series	Bold
 	  Color		Blue
 	EndFont
+	ResetsFont true
 End
 
 Style Entry
@@ -283,8 +341,8 @@ Style Entry
 	LatexName	cventry
 	Argument 1
 	  Mandatory	1
-	  LabelString	"Time"
-	  Tooltip	"Time"
+	  LabelString	"Time[[period]]"
+	  Tooltip	"Time[[period]]"
 	EndArgument
 	Argument 2
 	  Mandatory	1
@@ -454,6 +512,7 @@ Style Bibliography
 	LatexType	Bib_Environment
 	LatexName	thebibliography
 	NextNoIndent	1
+	ToggleIndent	Never
 	LeftMargin	MM
 	ParSkip		0.4
 	ItemSep		0
@@ -470,24 +529,18 @@ Style Bibliography
 	  Size		Larger
 	  Family	Sans
 	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
+	TocLevel        1
+	IsTocCaption    0
+	Argument listpreamble:1
+	  LabelString    "Bib preamble"
+	  MenuString     "Bibliography Preamble"
+	  Tooltip        "LaTeX code to be inserted before the first bibliography item"
+	  PassThru       1
+	  Font
+	    Family typewriter
+	    Color latex
+	  EndFont
+	EndArgument
 End
 
 Style Recipient