Update layouts

[lyx.git] / lib / layouts / europecv.layout

diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
index 5c98d0e78e5fdbc2221d964d3cba7edab036bffb..d99a62246f8015c988a3d65d6c5b6d17a12f3760 100644 (file)
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@@ -5,23 +5,26 @@
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
+Format 103
+
 # General textclass parameters
-Format 43
-       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
@@ -39,38 +42,70 @@ Style Name
        LabelString     "Name:"
        LabelFont
          Series        Bold
-         Color         Blue
+         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
@@ -80,59 +115,93 @@ Style 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
+       Category        Sectioning
        Margin          Dynamic
        LatexType       Command
        LatexName       ecvsection
-       Category        MainText
        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
@@ -146,6 +215,9 @@ Style Section
          Series        Bold
        EndFont
        TocLevel        1
+    HTMLTag     h2
+       DocBookTag  title
+       DocBookTagType paragraph
 End
 
 Style Item
@@ -156,11 +228,15 @@ Style Item
        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
@@ -169,14 +245,18 @@ Style Item
        LabelString     "Item:"
        LabelFont
          Series        Bold
-         Color         Blue
+         Color         textlabel1
        EndFont
+       DocBookTag      sidebar
+       DocBookTagType  block
+       DocBookItemTag  para
 End
 
 Style BulletedItem
        CopyStyle       Item
        LatexName       ecvitem*
        LabelString     "Bulleted Item:"
+       DocBookAttr role='bulleted'
 End
 
 Style Begin
@@ -194,7 +274,7 @@ Style Begin
        LabelString     "Begin of CV"
        LabelFont
          Series        Bold
-         Color         Green
+         Color         textlabel2
        EndFont
 End
 
@@ -214,6 +294,7 @@ Style MotherTongue
        Argument 1
          LabelString   "Vertical Space"
          Tooltip       "Additional vertical space"
+         PassThru      1
        EndArgument
        ParSkip         0.4
        Align           Block
@@ -225,8 +306,10 @@ Style MotherTongue
        EndFont
        LabelFont
          Series        Bold
-         Color         Blue
+         Color         textlabel1
        EndFont
+       DocBookTag  para
+       DocBookAttr role='mother-tongue'
 End
 
 Style LangHeader
@@ -244,27 +327,39 @@ Style Language
          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
@@ -293,7 +388,7 @@ Style End
        LabelString     "End of CV"
        LabelFont
          Series        Bold
-         Color         Green
+         Color         textlabel2
        EndFont
 End
 
@@ -314,7 +409,7 @@ InsetLayout "Flex:VerticalSpace"
          Misc          No_Bar
        EndFont
        LabelFont
-         Color         green
+         Color         textlabel2
          Size          Small
        EndFont
 End