X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Feuropecv.layout;h=842053f09b6baaad73cab977e39f3cfb3641cee4;hb=28f76b84c96323e4dad43140121aae01820b4c38;hp=8809fe9e4f00216f6c6e9a437ba895a03ab50508;hpb=3b716ae11e5f55cf0544521ebd345a341707744e;p=lyx.git

diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
index 8809fe9e4f..842053f09b 100644
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@@ -1,154 +1,416 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[europecv,fancyhdr.sty,longtable.sty,ucs.sty]{curriculum vitae (Europe)}
+#  \DeclareLaTeXClass[europecv,fancyhdr.sty,longtable.sty,ucs.sty]{Europe CV}
+#  \DeclareCategory{Curricula Vitae}
 # europe CV textclass definition file.
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
+Format 104
+
 # General textclass parameters
-Format 28
-	Columns			1
-	Sides			1
-	SecNumDepth		-1
-	TocDepth		-1
+Columns		1
+Sides		1
+SecNumDepth	-1
+TocDepth	-1
 
 
 # Standard style definition
 Style Standard
-	Margin			Static
-	LatexType		Paragraph
-	LatexName		dummy
-	ParIndent		MM
-	ParSkip			0.4
-	Align			Block
-	LabelType		No_Label
+	Category	MainText
+	Margin		Static
+	LatexType	Paragraph
+	LatexName	dummy
+	ParIndent	MM
+	ParSkip		0.4
+	Align		Block
+	LabelType	No_Label
+	DocBookTag  para
 End
 
 Input stdcounters.inc
 Input stdinsets.inc
 
+Style Name
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	ecvname
+	Category	FrontMatter
+	InPreamble	1
+	ParSkip		0.4
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Name:"
+	LabelFont
+	  Series	Bold
+	  Color		textlabel1
+	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperTagType block
+	DocBookInInfo         always
+End
+
+Style FooterName
+	CopyStyle	Name
+	LatexName	ecvfootername
+	LabelString	"Footer name:"
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperAttr    role='footer'
+	DocBookWrapperTagType block
+	DocBookInInfo         always
+End
+
+Style Nationality
+	CopyStyle	Name
+	LatexName	ecvnationality
+	LabelString	"Nationality:"
+	DocBookTag            date
+	DocBookAttr           role='nationality'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
+    DocBookNoFontInside   true
+End
+
+Style Birthday
+	CopyStyle	Name
+	LatexName	ecvdateofbirth
+	LabelString	"Date of birth:"
+	DocBookTag            date
+	DocBookAttr           role='birthday'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
+    DocBookNoFontInside   true
+End
+
+Style Address
+	CopyStyle	Name
+	LatexName	ecvaddress
+	LabelString	"Address:"
+	DocBookTag            NONE
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
+End
+
+Style Email
+	CopyStyle	Name
+	LatexName	ecvemail
+	LabelString	"E-mail:"
+	DocBookTag            email
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
+End
+
+Style Telephone
+	CopyStyle	Name
+	LatexName	ecvtelephone
+	LabelString	"Telephone:"
+	Argument 1
+	  LabelString	"Mobile"
+	  Tooltip	"Mobile phone number"
+	  DocBookTag    phrase
+	  DocBookAttr   role='mobile'
+	EndArgument
+	DocBookTag            phone
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
+End
+
+Style Gender
+	CopyStyle	Name
+	LatexName	ecvgender
+	LabelString	"Gender:"
+	DocBookTag            date
+	DocBookAttr           role='gender'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
+    DocBookNoFontInside   true
+End
+
+Style Fax
+	CopyStyle	Name
+	LatexName	ecvfax
+	LabelString	"Fax:"
+	DocBookTag            fax
+	DocBookTagType        paragraph
+	DocBookWrapperTag     address
+	DocBookWrapperTagType block
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
+End
+
+Style BeforePicture
+	CopyStyle	Name
+	LatexName	ecvbeforepicture
+	LabelString	"Space before picture:"
+	DocBookTag          IGNORE
+	DocBookWrapperTag   NONE
+End
+
+Style Picture
+	CopyStyle	Name
+	LatexName	ecvpicture
+	PassThru	true
+	LabelString	"Picture:"
+	Argument 1
+	  LabelString	"Size"
+	  Tooltip	"Size the photo is resized to"
+	  PassThru	1
+	EndArgument
+	DocBookTag            date
+	DocBookAttr           role='picture'
+	DocBookInInfo         always
+	DocBookWrapperTag     NONE
+    DocBookNoFontInside   true
+End
+
+Style AfterPicture
+	CopyStyle	Name
+	LatexName	ecvafterpicture
+	LabelString	"Space after picture:"
+	DocBookTag          IGNORE
+	DocBookWrapperTag   NONE
+End
+
+Style Page
+	CopyStyle	Name
+	LatexName	ecvpage
+	LabelString	"Page:"
+	DocBookTag  NONE
+	DocBookWrapperTag NONE
+End
+
 Style Section
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		ecvsection
-	NeedProtect		1
-	NextNoIndent		1
-	OptionalArgs		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	ecvsection
+	NeedProtect	1
+	NextNoIndent	1
+	Argument 1
+	  LabelString	"Short Title|S"
+	  Tooltip	"The title as it appears in the header"
+	  InsertCotext  1
+	  IsTocCaption  1
+	EndArgument
+	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
+	TocLevel	1
+    HTMLTag     h2
+	DocBookTag  title
+	DocBookTagType paragraph
 End
 
 Style Item
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		ecvitem
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Item:"
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	ecvitem
+	Category	MainText
+	Argument 1
+	  LabelString	"Vertical Space"
+	  Tooltip	"Additional vertical space"
+	  PassThru	1
+	EndArgument
+	Argument 2
+	  Mandatory	1
+	  AutoInsert	1
+	  LabelString	"Summary"
+	  Tooltip	"Summary of the item, can also be the time"
+	  DocBookTag    emphasis
+	  # TODO: For DocBook, this should rather be title, but it would be output in the paragraph, and not before the paragraph.
+	EndArgument
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Item:"
 	LabelFont
-	  Series		Bold
-	  Color			Blue
+	  Series	Bold
+	  Color		textlabel1
 	EndFont
+	DocBookTag      sidebar
+	DocBookTagType  block
+	DocBookItemTag  para
 End
 
 Style BulletedItem
-	CopyStyle		Item
-	LatexName		ecvitem*
-	LabelString		"Bulleted Item:"
+	CopyStyle	Item
+	LatexName	ecvitem*
+	LabelString	"Bulleted Item:"
+	DocBookAttr role='bulleted'
 End
 
 Style Begin
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		begin{europecv}
-	KeepEmpty		1
-	BottomSep		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Begin of CV"
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	begin{europecv}
+	Category	FrontMatter
+	KeepEmpty	1
+	TopSep		1
+	BottomSep	1
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Begin of CV"
 	LabelFont
-	  Series		Bold
-	  Color			Green
+	  Series	Bold
+	  Color		textlabel2
 	EndFont
 End
 
 Style PersonalInfo
-	CopyStyle		Begin
-	LatexName		ecvpersonalinfo{}
-	BottomSep		0
-	LabelString		"Personal Info"
+	CopyStyle	Begin
+	LatexName	ecvpersonalinfo{}
+	TopSep		0
+	BottomSep	0
+	LabelString	"Personal Info"
 End
 
 Style MotherTongue
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		ecvmothertongue
-	OptionalArgs		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Mother Tongue:"
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	ecvmothertongue
+	Category	MainText
+	Argument 1
+	  LabelString	"Vertical Space"
+	  Tooltip	"Additional vertical space"
+	  PassThru	1
+	EndArgument
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"Mother Tongue:"
+	Font
+	  Series	Bold
+	EndFont
 	LabelFont
-	  Series		Bold
-	  Color			Blue
+	  Series	Bold
+	  Color		textlabel1
 	EndFont
+	DocBookTag  para
+	DocBookAttr role='mother-tongue'
 End
 
 Style LangHeader
-	CopyStyle		MotherTongue
-	LatexName		ecvlanguageheader
-	OptionalArgs		0
-	LabelString		"Language Header:"
+	CopyStyle	MotherTongue
+	LatexName	ecvlanguageheader
+	ResetArgs	1
+	LabelString	"Language Header:"
 End
 
 Style Language
-	CopyStyle		MotherTongue
-	LatexName		ecvlanguage
-	LabelString		"Language:"
+	CopyStyle	MotherTongue
+	LatexName	ecvlanguage
+	LabelString	"Language:"
+	Argument 2
+	  Mandatory	1
+	  LabelString	"Language"
+	  Tooltip	"Name of the language"
+	  DocBookTag    phrase
+	  DocBookAttr   role='language-name'
+	EndArgument
+	Argument 3
+	  Mandatory	1
+	  LabelString	"Listening"
+	  Tooltip	"Level how good you think you can listen"
+	  DocBookTag    phrase
+	  DocBookAttr   role='listening'
+	EndArgument
+	Argument 4
+	  Mandatory	1
+	  LabelString	"Reading"
+	  Tooltip	"Level how good you think you can read"
+	  DocBookTag    phrase
+	  DocBookAttr   role='reading'
+	EndArgument
+	Argument 5
+	  Mandatory	1
+	  LabelString	"Interaction"
+	  Tooltip	"Level how good you think you can conversate"
+	  DocBookTag    phrase
+	  DocBookAttr   role='speaking'
+	EndArgument
+	Argument 6
+	  Mandatory	1
+	  LabelString	"Production"
+	  Tooltip	"Level how good you think you can freely talk"
+	  DocBookTag    phrase
+	  DocBookAttr   role='writing'
+	EndArgument
+	DocBookTag  para
+	DocBookAttr role='language'
 End
 
 Style LastLanguage
-	CopyStyle		MotherTongue
-	LatexName		ecvlastlanguage
-	LabelString		"Last Language:"
+	CopyStyle	Language
+	LatexName	ecvlastlanguage
+	LabelString	"Last Language:"
 End
 
 Style LangFooter
-	CopyStyle		MotherTongue
-	LatexName		ecvlanguagefooter
-	OptionalArgs		0
-	LabelString		"Language Footer:"
+	CopyStyle	LangHeader
+	LatexName	ecvlanguagefooter
+	LabelString	"Language Footer:"
 End
 
 Style End
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		end{europecv}
-	KeepEmpty		1
-	TopSep			1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"End of CV"
+	Margin		Dynamic
+	LatexType	Command
+	LatexName	end{europecv}
+	Category	BackMatter
+	KeepEmpty	1
+	TopSep		1
+	ParSkip		0.4
+	Align		Block
+	LabelSep	xx
+	LabelType	Static
+	LabelString	"End of CV"
+	LabelFont
+	  Series	Bold
+	  Color		textlabel2
+	EndFont
+End
+
+InsetLayout "Flex:VerticalSpace"
+	LyxType		custom
+	LatexType	command
+	LatexName	ecvspace
+	Decoration	Conglomerate
+	LabelString	"Vertical space"
+	Font
+	  Color		foreground
+	  Size		Small
+	  Family	Roman
+	  Shape		Up
+	  Series	Medium
+	  Misc		No_Emph
+	  Misc		No_Noun
+	  Misc		No_Bar
+	EndFont
 	LabelFont
-	  Series		Bold
-	  Color			Green
+	  Color		textlabel2
+	  Size		Small
 	EndFont
 End