Label string tweaks (capitalization etc.)

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

diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index df9bb94bb4533ed96cb8c9a7dfeb1ee051801127..212151e6caaae99cd6418633f3a5a1cee73bb30c 100644 (file)
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,16 +1,20 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass{curriculum vitae (modern)}
+#  \DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{Modern CV}
+#  \DeclareCategory{Curricula Vitae}
 # modern CV textclass definition file.
 # Author : Uwe Stöhr (uwestoehr@web.de)
 
 
 # General textclass parameters
-Format 4
+Format 40
        Columns                 1
        Sides                   1
        SecNumDepth             -1
        TocDepth                -1
 
+Provides hyperref  1
+Provides url       1
+
 
 # Standard style definition
 Style Standard
@@ -25,6 +29,7 @@ Style Standard
 End
 
 Input stdcounters.inc
+Input stdinsets.inc
 
 Style Section
        Margin                  Dynamic
@@ -37,20 +42,36 @@ Style Section
        BottomSep               0.7
        ParSep                  0.7
        Align                   Block
-       AlignPossible           Block, Left
        LabelSep                xxx
        LabelType               No_Label
        Font
          Family                Sans
          Series                Bold
        EndFont
+               TocLevel 1
+End
+
+Style Subsection
+       CopyStyle               Section
+       LatexName               subsection
+       TopSep                  0.9
+       BottomSep               0
+       ParSep                  0.5
+       Font
+         Family                Sans
+         Series                Medium
+       EndFont
+       TocLevel 2
 End
 
 Style Entry
        Margin                  Dynamic
        LatexType               Command
        LatexName               cventry
-       OptionalArgs            1
+       Argument 1
+               LabelString   "Entry Option"
+               Tooltip       "Optional argument to the cventry command"
+       EndArgument
        ParSkip                 0.4
        Align                   Block
        LabelSep                xx
@@ -66,7 +87,10 @@ Style Item
        Margin                  Dynamic
        LatexType               Command
        LatexName               cvitem
-       OptionalArgs            1
+       Argument 1
+               LabelString   "Item Option"
+               Tooltip       "Optional argument to the cvitem command"
+       EndArgument
        ParSkip                 0.4
        Align                   Block
        LabelSep                xx
@@ -79,83 +103,33 @@ Style Item
 End
 
 Style ListItem
-       Margin                  Dynamic
-       LatexType               Command
+       CopyStyle               Item
        LatexName               cvlistitem
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
        LabelString             "List Item:"
-       LabelFont
-         Series                Bold
-         Color                 Blue
-       EndFont
 End
 
 Style DoubleItem
-       Margin                  Dynamic
-       LatexType               Command
+       CopyStyle               Item
        LatexName               cvlistdoubleitem
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
        LabelString             "Double Item:"
-       LabelFont
-         Series                Bold
-         Color                 Blue
-       EndFont
 End
 
 Style Space
-       Margin                  Dynamic
-       LatexType               Command
+       CopyStyle               Item
        LatexName               vspace*
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
        LabelString             "Space:"
-       LabelFont
-         Series                Bold
-         Color                 Blue
-       EndFont
 End
 
 Style Language
-       Margin                  Dynamic
-       LatexType               Command
+       CopyStyle               Item
        LatexName               cvlanguage
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
        LabelString             "Language:"
-       LabelFont
-         Series                Bold
-         Color                 Blue
-       EndFont
 End
 
 Style Computer
-       Margin                  Dynamic
-       LatexType               Command
+       CopyStyle               Item
        LatexName               cvcomputer
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
        LabelString             "Computer:"
-       LabelFont
-         Series                Bold
-         Color                 Blue
-       EndFont
 End
 
 Style EmptySection
@@ -175,19 +149,9 @@ Style EmptySection
 End
 
 Style CloseSection
-       Margin                  Dynamic
-       LatexType               Command
+       CopyStyle               EmptySection
        LatexName               closesection{}
-       KeepEmpty               1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
        LabelString             "Close Section"
-       LabelFont
-         Series                Bold
-         Color                 Green
-       EndFont
 End
 
 Style Bibliography
@@ -213,3 +177,21 @@ 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
+