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

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index c13f0159ff..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 41
+Format 60
 	Columns		1
 	Sides		1
 	SecNumDepth	-1
@@ -18,336 +19,575 @@ Provides url		1
 
 # Standard style definition
 Style Standard
-	Margin			Static
-	LatexType		Paragraph
-	LatexName		dummy
-	ParIndent		MM
-	ParSkip			0.4
-	Align			Block
-	AlignPossible		Block, Left, Right, Center
-	LabelType		No_Label
+	Category	MainText
+	Margin		Static
+	LatexType	Paragraph
+	LatexName	dummy
+	ParIndent	MM
+	ParSkip		0.4
+	Align		Block
+	AlignPossible	Block, Left, Right, Center
+	LabelType	No_Label
 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
+	Argument 1
+	  LabelString	"Style Options"
+	  Tooltip		"Options for the CV style"
+	EndArgument
+End
+
+Style CVColor
+	CopyStyle	CVStyle
+	LatexName	moderncvcolor
+	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 Name
+	LatexType	command
+	LatexName	name
+	Category	FrontMatter
+	InPreamble	1
+	TopSep		0.7
+	Align		Center
+	Font
+	  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
+	CopyStyle	FirstName
+	LatexName	familyname
+	TopSep		0.3
+	LabelString	"Family Name:"
+	ObsoletedBy	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
+	LabelString	"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
+	EndArgument
+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
+	CopyStyle	CVStyle
+	LatexName	email
+	LabelString	"Email:"
+End
+
+Style Homepage
+	CopyStyle	CVStyle
+	LatexName	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
+
+Style Photo
+	CopyStyle	CVStyle
+	LatexName	photo
+	LabelString	"Photo:"
+	Argument 1
+	  LabelString	"Height"
+	  Tooltip	"Height the photo is resized to"
+	EndArgument
+	Argument 2
+	  LabelString	"Thickness"
+	  Tooltip	"Thickness of the surrounding frame"
+	EndArgument
+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
-	LatexType		Command
-	LatexName		section
-	NeedProtect		1
-	NextNoIndent		1
-	ParSkip			0.4
-	TopSep			1.3
-	BottomSep		0.7
-	ParSep			0.7
-	Align			Block
-	LabelSep		xxx
-	LabelType		No_Label
+	Category	Sectioning
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	section
+	NeedProtect	1
+	NextNoIndent	1
+	ParSkip		0.4
+	TopSep		1.3
+	BottomSep	0.7
+	ParSep		0.7
+	Align		Block
+	LabelSep	xxx
+	LabelType	No_Label
 	Font
-	  Family		Sans
-	  Series		Bold
+	  Family	Sans
+	  Series	Bold
+	EndFont
+	TocLevel	1
+End
+
+Style EmptySection
+	CopyStyle	Section
+	LatexType	Command
+	LatexName	emptysection{}
+	KeepEmpty	1
+	LabelType	Static
+	LabelString	"Empty Section"
+	LabelFont
+	  Color		Green
 	EndFont
-	TocLevel		1
 End
 
 Style Subsection
-	CopyStyle		Section
-	LatexName		subsection
-	TopSep			0.9
-	BottomSep		0
-	ParSep			0.5
+	CopyStyle	Section
+	LatexName	subsection
+	TopSep		0.9
+	BottomSep	0
+	ParSep		0.5
 	Font
-	  Family		Sans
-	  Series		Medium
+	  Family	Sans
+	  Series	Medium
+	EndFont
+	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		2
+	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
-	LatexName		cventry
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	cventry
 	Argument 1
-	  Mandatory		1
-	  LabelString		"Time"
-	  Tooltip		"Time"
+	  Mandatory	1
+	  LabelString	"Time"
+	  Tooltip	"Time"
 	EndArgument
 	Argument 2
-	  Mandatory		1
-	  LabelString		"What?"
-	  Tooltip		"What?"
+	  Mandatory	1
+	  LabelString	"What?"
+	  Tooltip	"What?"
+	  Font
+	    Series	Bold
+	  EndFont
 	EndArgument
 	Argument 3
-	  Mandatory		1
-	  LabelString		"Affiliation"
-	  Tooltip		"Affiliation"
-	  #Font
-	  #  Shape		Italic
-	  #EndFont
+	  Mandatory	1
+	  LabelString	"Affiliation"
+	  Tooltip	"Affiliation"
+	  Font
+	    Shape	Italic
+	  EndFont
 	EndArgument
 	Argument 4
-	  Mandatory		1
-	  LabelString		"City"
-	  Tooltip		"City"
+	  Mandatory	1
+	  LabelString	"City"
+	  Tooltip	"City"
 	EndArgument
 	Argument 5
-	  Mandatory		1
-	  LabelString		"Country"
-	  Tooltip		"Country"
+	  Mandatory	1
+	  LabelString	"Country"
+	  Tooltip	"Country"
 	EndArgument
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Entry:"
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Entry:"
 	LabelFont
-	  Series		Bold
-	  Color			Blue
+	  Series	Bold
+	  Color		Blue
 	EndFont
 End
 
 Style Item
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		cvitem
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	cvitem
 	Argument 1
-	  Mandatory		1
-	  LabelString		"Summary"
-	  Tooltip		"Summary"
+	  Mandatory	1
+	  AutoInsert	1
+	  LabelString	"Summary"
+	  Tooltip	"Summary"
 	EndArgument
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Item:"
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Item:"
 	LabelFont
-	  Series		Bold
-	  Color			Blue
+	  Series	Bold
+	  Color		Blue
 	EndFont
 End
 
 Style ItemWithComment
-	CopyStyle		Item
-	LatexName		cvitemwithcomment
-	LabelString		"Item with comment:"
-	KeepEmpty		1
-	ResetArgs		1
+	CopyStyle	Item
+	LatexName	cvitemwithcomment
+	LabelString	"Item with Comment:"
+	KeepEmpty	1
+	ResetArgs	1
 	Argument 1
-	  Mandatory		1
-	  LabelString		"Summary"
-	  Tooltip		"Summary"
+	  Mandatory	1
+	  LabelString	"Summary"
+	  Tooltip	"Summary"
 	EndArgument
 	Argument 2
-	  Mandatory		1
-	  LabelString		"Text"
-	  Tooltip		"Text"
+	  Mandatory	1
+	  LabelString	"Text"
+	  Tooltip	"Text"
+	  Font
+	    Series	Bold
+	    Shape	Up
+	  EndFont
 	EndArgument
+	Font
+	  Shape		Italic
+	EndFont
+	LabelFont
+	  Series	Bold
+	  Color		Blue
+	  Shape		Up
+	EndFont
 End
 
 Style ListItem
-	CopyStyle		Item
-	LatexName		cvlistitem
-	LabelString		"List Item:"
-	ResetArgs		1
+	CopyStyle	Item
+	LatexName	cvlistitem
+	LabelString	"List Item:"
+	ResetArgs	1
 End
 
 Style DoubleItem
-	CopyStyle		ListItem
-	LatexName		cvdoubleitem
-	LabelString		"Double Item:"
-	KeepEmpty		1
+	CopyStyle	ListItem
+	LatexName	cvdoubleitem
+	LabelString	"Double Item:"
+	KeepEmpty	1
 	Argument 1
-	  Mandatory		1
-	  LabelString		"Left summary"
-	  Tooltip		"Left summary"
+	  Mandatory	1
+	  LabelString	"Left Summary"
+	  Tooltip	"Left summary"
 	EndArgument
 	Argument 2
-	  Mandatory		1
-	  LabelString		"Left text"
-	  Tooltip		"Left text"
+	  Mandatory	1
+	  LabelString	"Left Text"
+	  Tooltip	"Left text"
 	EndArgument
 	Argument 3
-	  Mandatory		1
-	  LabelString		"Right summary"
-	  Tooltip		"Right summary"
+	  Mandatory	1
+	  LabelString	"Right Summary"
+	  Tooltip	"Right summary"
 	EndArgument
 End
 
 Style DoubleListItem
-	CopyStyle		ListItem
-	LatexName		cvlistdoubleitem
-	LabelString		"Double List Item:"
-	ResetArgs		1
+	CopyStyle	ListItem
+	LatexName	cvlistdoubleitem
+	LabelString	"Double List Item:"
+	ResetArgs	1
 	Argument 1
-	  Mandatory		1
-	  LabelString		"First Item"
-	  Tooltip		"First Item"
+	  Mandatory	1
+	  AutoInsert	1
+	  LabelString	"First Item"
+	  Tooltip	"First item"
 	EndArgument
 End
 
 Style Language
-	ObsoletedBy		ItemWithComment
+	ObsoletedBy	ItemWithComment
 End
 
 Style Computer
-	ObsoletedBy		DoubleItem
+	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"
+Style MakeCVtitle
+	CopyStyle	EmptySection
+	LatexName	makecvtitle{}
+	LabelString	"Make CV Title"
+	Category	FrontMatter
 	LabelFont
-	  Series		Bold
-	  Color			Green
+	  Size		Small
 	EndFont
 End
 
-Style CloseSection
-	CopyStyle		EmptySection
-	LatexName		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
+	CopyStyle	MakeCVtitle
+	LatexName	makelettertitle{}
+	LabelString	"Make Letter Title"
+	Category	Letter
 End
 
 Style MakeLetterClosing
-	CopyStyle		EmptySection
-	LatexName		makeletterclosing{}
-	LabelString		"Close Letter"
-	Category		Letter
+	CopyStyle	MakeCVtitle
+	LatexName	makeletterclosing{}
+	LabelString	"Close Letter"
+	Category	Letter
 End
 
 Style Bibliography
-	Margin			First_Dynamic
-	LatexType		Bib_Environment
-	LatexName		thebibliography
-	NextNoIndent		1
-	LeftMargin		MM
-	ParSkip			0.4
-	ItemSep			0
-	TopSep			0.7
-	BottomSep		0.7
-	ParSep			0.5
-	Align			Block
-	AlignPossible		Block, Left
-	LabelType		Bibliography
-	LabelString		"References"
-	LabelBottomSep		1.2
-	LabelFont
-	  Series		Bold
-	  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 ---"
+	Category	BackMatter
+	Margin		First_Dynamic
+	LatexType	Bib_Environment
+	LatexName	thebibliography
+	NextNoIndent	1
+	ToggleIndent	Never
+	LeftMargin	MM
+	ParSkip		0.4
+	ItemSep		0
+	TopSep		0.7
+	BottomSep	0.7
+	ParSep		0.5
+	Align		Block
+	AlignPossible	Block, Left
+	LabelType	Bibliography
+	LabelString	"References"
+	LabelBottomSep	1.2
 	LabelFont
-	  Family		Roman
-	  Series		Medium
-	  Size			Normal
-	  Color			Blue
+	  Series	Bold
+	  Size		Larger
+	  Family	Sans
 	EndFont
-	HTMLLabel		NONE
 End
 
 Style Recipient
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		recipient
-	Category		Letter
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	recipient
+	Category	Letter
 	Argument 1
-	  Mandatory		1
-	  LabelString		"Company name"
-	  Tooltip		"Company name"
+	  Mandatory	1
+	  AutoInsert	1
+	  LabelString	"Company Name"
+	  Tooltip	"Company name"
 	  #Font
-	  #  Series		Bold
+	  #  Series	Bold
 	  #EndFont
 	EndArgument
-	NextNoIndent		1
-	ParSkip			0.4
-	TopSep			1.3
-	BottomSep		0
-	ParSep			0.7
-	Align			Left
-	LabelSep		xxx
-	LabelType		No_Label
+	NextNoIndent	1
+	ParSkip		0.4
+	TopSep		1.3
+	BottomSep	0
+	ParSep		0.7
+	Align		Left
+	LabelSep	xxx
+	LabelType	No_Label
 	Font
-	  Shape			Italic
+	  Shape		Italic
 	EndFont
 End
 
 Style Date
-	CopyStyle		Recipient
-	LatexName		date
-	ResetArgs		1
-	TopSep			0
-	BottomSep		0
-	Align			Right
+	CopyStyle	Recipient
+	LatexName	date
+	ResetArgs	1
+	TopSep		0
+	BottomSep	0
+	Align		Right
 	Font
-	  Series		Medium
+	  Series	Medium
 	EndFont
 End
 
 Style Opening
-	CopyStyle		Date
-	LatexName		opening
-	TopSep			0
-	BottomSep		0.5
-	Align			Left
+	CopyStyle	Date
+	LatexName	opening
+	TopSep		0
+	BottomSep	0.5
+	Align		Left
 End
 
 Style Closing
-	CopyStyle		Opening
-	LatexName		closing
+	CopyStyle	Opening
+	LatexName	closing
 End
 
 Style Enclosing
-	Margin			Dynamic
-	CopyStyle		Opening
-	LatexName		enclosure
+	Margin		Dynamic
+	CopyStyle	Opening
+	LatexName	enclosure
 	Argument 1
-	  LabelString		"Alternative name"
-	  Tooltip		"Alternative instead of 'Enclosure'"
+	  LabelString	"Alternative Name"
+	  Tooltip	"Alternative instead of 'Enclosure'"
 	EndArgument
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Enclosing:"
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Enclosing:"
 	Font
-	  Shape			Italic
+	  Shape		Italic
 	EndFont
 	LabelFont
-	  Shape			Up
-	  Series		Bold
-	  Color			Blue
+	  Shape		Up
+	  Series	Bold
+	  Color		Blue
 	EndFont
 	
 End