X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fmoderncv.layout;h=7512e3fa02aac7e36dc49dcf2d14f657151d570a;hb=0d434033ec03b3875cfbc05f3b87936af777bef5;hp=88d81b74961c3e8b9cf1657d03918e340f9d4a85;hpb=b0aa0db10aae4a51d48f060e642f05542e89f370;p=lyx.git

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 88d81b7496..7512e3fa02 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,12 +1,12 @@
 #% 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,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty,suffix.sty]{Modern CV}
 #  \DeclareCategory{Curricula Vitae}
-# textclass definition file for modernCV 1.2.0
+# textclass definition file for modernCV 1.3.0
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
 # General textclass parameters
-Format 42
+Format 45
 	Columns		1
 	Sides		1
 	SecNumDepth	-1
@@ -18,14 +18,15 @@ 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
@@ -41,7 +42,7 @@ Style CVStyle
 	ParSkip		0.4
 	LabelSep	xx
 	LabelType	Static
-	LabelString	"CV style:"
+	LabelString	"CV Style:"
 	LabelFont
 	  Series	Bold
 	  Color		Blue
@@ -51,7 +52,13 @@ End
 Style CVColor
 	CopyStyle	CVStyle
 	LatexName	moderncvcolor
-	LabelString	"CV color scheme:"
+	LabelString	"CV Color Scheme:"
+End
+
+Style PDF_Page_Mode
+	CopyStyle	CVStyle
+	LatexName	renewcommand{\pdfpagemode}
+	LabelString	"PDF Page Mode:"
 End
 
 Style FirstName
@@ -102,8 +109,16 @@ Style Address
 	BottomSep	0.3
 	TopSep		0
 	Argument 1
-	  Mandatory	1
-	  LabelString	"Street"
+	  LeftDelim	{
+	  RightDelim	}
+	  LabelString	"Line 1"
+	  Tooltip	"Optional address line"
+	EndArgument
+	Argument 2
+	  LeftDelim	{
+	  RightDelim	}
+	  LabelString	"Line 2"
+	  Tooltip	"Optional address line"
 	EndArgument
 End
 
@@ -171,6 +186,7 @@ Style Quote
 End
 
 Style Section
+	Category	Sectioning
 	Margin		Dynamic
 	LatexType	Command
 	LatexName	section
@@ -190,6 +206,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
@@ -203,6 +231,52 @@ 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
+End
+
 Style Entry
 	Margin		Dynamic
 	LatexType	Command
@@ -255,6 +329,7 @@ Style Item
 	LatexName	cvitem
 	Argument 1
 	  Mandatory	1
+	  AutoInsert	1
 	  LabelString	"Summary"
 	  Tooltip	"Summary"
 	EndArgument
@@ -272,7 +347,7 @@ End
 Style ItemWithComment
 	CopyStyle	Item
 	LatexName	cvitemwithcomment
-	LabelString	"Item with comment:"
+	LabelString	"Item with Comment:"
 	KeepEmpty	1
 	ResetArgs	1
 	Argument 1
@@ -313,17 +388,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
@@ -335,8 +410,9 @@ Style DoubleListItem
 	ResetArgs	1
 	Argument 1
 	  Mandatory	1
+	  AutoInsert	1
 	  LabelString	"First Item"
-	  Tooltip	"First Item"
+	  Tooltip	"First item"
 	EndArgument
 End
 
@@ -348,50 +424,32 @@ 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
 	Margin		First_Dynamic
 	LatexType	Bib_Environment
 	LatexName	thebibliography
@@ -439,7 +497,8 @@ Style Recipient
 	Category	Letter
 	Argument 1
 	  Mandatory	1
-	  LabelString	"Company name"
+	  AutoInsert	1
+	  LabelString	"Company Name"
 	  Tooltip	"Company name"
 	  #Font
 	  #  Series	Bold
@@ -488,7 +547,7 @@ Style Enclosing
 	CopyStyle	Opening
 	LatexName	enclosure
 	Argument 1
-	  LabelString	"Alternative name"
+	  LabelString	"Alternative Name"
 	  Tooltip	"Alternative instead of 'Enclosure'"
 	EndArgument
 	LabelSep	xx