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

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 57aa0bdf15..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]{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.2.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 43
+Format 60
 	Columns		1
 	Sides		1
 	SecNumDepth	-1
@@ -42,22 +43,44 @@ Style CVStyle
 	ParSkip		0.4
 	LabelSep	xx
 	LabelType	Static
-	LabelString	"CV style:"
+	LabelString	"CV Style:"
 	LabelFont
 	  Series	Bold
 	  Color		Blue
 	EndFont
+	Argument 1
+	  LabelString	"Style Options"
+	  Tooltip		"Options for the CV style"
+	EndArgument
 End
 
 Style CVColor
 	CopyStyle	CVStyle
 	LatexName	moderncvcolor
-	LabelString	"CV color scheme:"
+	LabelString	"CV Color Scheme:"
 End
 
-Style FirstName
+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 Name
 	LatexType	command
-	LatexName	firstname
+	LatexName	name
 	Category	FrontMatter
 	InPreamble	1
 	TopSep		0.7
@@ -66,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
@@ -73,6 +108,7 @@ Style FamilyName
 	LatexName	familyname
 	TopSep		0.3
 	LabelString	"Family Name:"
+	ObsoletedBy	Name
 End
 
 Style Title
@@ -103,27 +139,39 @@ Style Address
 	BottomSep	0.3
 	TopSep		0
 	Argument 1
+	  LabelString	"Line 1"
+	  Tooltip	"Optional address line"
+	  Mandatory	1
+	EndArgument
+	Argument 2
+	  LabelString	"Line 2"
+	  Tooltip	"Optional address line"
 	  Mandatory	1
-	  LabelString	"Street"
 	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
@@ -138,6 +186,16 @@ 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
@@ -172,7 +230,7 @@ Style Quote
 End
 
 Style Section
-	Category        Sectioning
+	Category	Sectioning
 	Margin		Dynamic
 	LatexType	Command
 	LatexName	section
@@ -192,6 +250,18 @@ Style Section
 	TocLevel	1
 End
 
+Style EmptySection
+	CopyStyle	Section
+	LatexType	Command
+	LatexName	emptysection{}
+	KeepEmpty	1
+	LabelType	Static
+	LabelString	"Empty Section"
+	LabelFont
+	  Color		Green
+	EndFont
+End
+
 Style Subsection
 	CopyStyle	Section
 	LatexName	subsection
@@ -205,6 +275,53 @@ Style Subsection
 	TocLevel	2
 End
 
+Style CloseSection
+	ObsoletedBy	Standard
+End
+
+Style Columns
+	Margin		Static
+	LatexType	Environment
+	LatexName	cvcolumns
+	NextNoIndent	1
+	LeftMargin	M
+	RightMargin	M
+	ParSkip		0.4
+	BottomSep	0.5
+	ParSep		0.7
+	Align		Block
+	LabelType	Centered
+	LabelString	"Columns:"
+	LabelBottomSep	0.5
+	LabelFont
+	  Series	Bold
+	  Color		Blue
+	EndFont
+	TocLevel	1
+End
+
+InsetLayout Flex:Column
+	LyxType		custom
+	LatexType	Command
+	LaTeXName	cvcolumn
+	Argument 1
+	  LabelString	"Width"
+	  Tooltip	"Optional width"
+	EndArgument
+	Argument 2
+	  Mandatory	1
+	  AutoInsert	1
+	  LabelString	"Header"
+	  Tooltip	"Header content"
+	EndArgument
+	LabelString	"Column"
+	LabelFont
+	  Series	Bold
+	  Color		Blue
+	EndFont
+	ResetsFont true
+End
+
 Style Entry
 	Margin		Dynamic
 	LatexType	Command
@@ -257,6 +374,7 @@ Style Item
 	LatexName	cvitem
 	Argument 1
 	  Mandatory	1
+	  AutoInsert	1
 	  LabelString	"Summary"
 	  Tooltip	"Summary"
 	EndArgument
@@ -274,7 +392,7 @@ End
 Style ItemWithComment
 	CopyStyle	Item
 	LatexName	cvitemwithcomment
-	LabelString	"Item with comment:"
+	LabelString	"Item with Comment:"
 	KeepEmpty	1
 	ResetArgs	1
 	Argument 1
@@ -315,17 +433,17 @@ Style DoubleItem
 	KeepEmpty	1
 	Argument 1
 	  Mandatory	1
-	  LabelString	"Left summary"
+	  LabelString	"Left Summary"
 	  Tooltip	"Left summary"
 	EndArgument
 	Argument 2
 	  Mandatory	1
-	  LabelString	"Left text"
+	  LabelString	"Left Text"
 	  Tooltip	"Left text"
 	EndArgument
 	Argument 3
 	  Mandatory	1
-	  LabelString	"Right summary"
+	  LabelString	"Right Summary"
 	  Tooltip	"Right summary"
 	EndArgument
 End
@@ -337,8 +455,9 @@ Style DoubleListItem
 	ResetArgs	1
 	Argument 1
 	  Mandatory	1
+	  AutoInsert	1
 	  LabelString	"First Item"
-	  Tooltip	"First Item"
+	  Tooltip	"First item"
 	EndArgument
 End
 
@@ -350,55 +469,37 @@ Style Computer
 	ObsoletedBy	DoubleItem
 End
 
-Style EmptySection
-	Margin		Dynamic
-	LatexType	Command
-	LatexName	emptysection{}
-	KeepEmpty	1
-	ParSkip		0.4
-	Align		Block
-	LabelSep	xx
-	LabelType	Static
-	LabelString	"Empty Section"
-	LabelFont
-	  Series	Bold
-	  Color		Green
-	EndFont
-End
-
-Style CloseSection
-	CopyStyle	EmptySection
-	LatexName	closesection{}
-	LabelString	"Close Section"
-End
-
 Style MakeCVtitle
 	CopyStyle	EmptySection
 	LatexName	makecvtitle{}
-	LabelString	"Make CV title"
-	Category	Title
+	LabelString	"Make CV Title"
+	Category	FrontMatter
+	LabelFont
+	  Size		Small
+	EndFont
 End
 
 Style MakeLetterTitle
-	CopyStyle	EmptySection
+	CopyStyle	MakeCVtitle
 	LatexName	makelettertitle{}
-	LabelString	"Make letter title"
+	LabelString	"Make Letter Title"
 	Category	Letter
 End
 
 Style MakeLetterClosing
-	CopyStyle	EmptySection
+	CopyStyle	MakeCVtitle
 	LatexName	makeletterclosing{}
 	LabelString	"Close Letter"
 	Category	Letter
 End
 
 Style Bibliography
-	Category        BackMatter
+	Category	BackMatter
 	Margin		First_Dynamic
 	LatexType	Bib_Environment
 	LatexName	thebibliography
 	NextNoIndent	1
+	ToggleIndent	Never
 	LeftMargin	MM
 	ParSkip		0.4
 	ItemSep		0
@@ -417,24 +518,6 @@ 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
-
 Style Recipient
 	Margin		Dynamic
 	LatexType	Command
@@ -442,7 +525,8 @@ Style Recipient
 	Category	Letter
 	Argument 1
 	  Mandatory	1
-	  LabelString	"Company name"
+	  AutoInsert	1
+	  LabelString	"Company Name"
 	  Tooltip	"Company name"
 	  #Font
 	  #  Series	Bold
@@ -491,7 +575,7 @@ Style Enclosing
 	CopyStyle	Opening
 	LatexName	enclosure
 	Argument 1
-	  LabelString	"Alternative name"
+	  LabelString	"Alternative Name"
 	  Tooltip	"Alternative instead of 'Enclosure'"
 	EndArgument
 	LabelSep	xx