The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 2587cea73341288bf71a89cf9b965a7d99fb4bd8
Author: Uwe Stöhr <[email protected]>
Date:   Sat Nov 24 17:01:06 2012 +0100

    modernCV: complete revision for modernCV 1.2.0

diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index 3eff785..b945153 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -1,16 +1,20 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 446
 \begin_document
 \begin_header
 \textclass moderncv
 \begin_preamble
+% required
+\moderncvstyle{casual} % possible styles are 'casual' (default), 'classic', 
'oldstyle' and 'banking'
+\moderncvcolor{blue} % possible colors are 'blue' (default), 'orange', 
'green', 'red', 'purple', 'grey' and 'black'
+
+%\renewcommand{\familydefault}{\sfdefault}    % to set the default font; use 
'\sfdefault' for the default sans serif font, '\rmdefault' for the default 
roman one, or any tex font name
+%\nopagenumbers{}                             % uncomment to suppress 
automatic page numbering for CVs longer than one page
+
 % adjust the page margins
 \usepackage[scale=0.75]{geometry}
-
-% required
-\moderncvtheme[blue]{classic}
-% possible themes are "classic" and "casual"
-% optional argument are 'blue' (default), 'orange', 'red', 'green', 'grey' and 
'roman' (for roman fonts, instead of sans serif fonts)
+%\setlength{\hintscolumnwidth}{3cm}           % if you want to change the 
width of the column with the dates
+%\setlength{\makecvtitlenamewidth}{10cm}      % for the 'classic' style, if 
you want to force the width allocated to your name and avoid line breaks. be 
careful though, the length is normally calculated to avoid any overlap with 
your personal info; use this at your own typographical risks...
 
 % required
 \firstname{Paul}
@@ -22,25 +26,27 @@
 
 % optional
 % \address{street and number}{postcode city}
-% '\\' adds a line break
-\address{Teststreet 17}{03333 Nicecity\protect\\[0.1em] 
Switzerland\protect\\[0.2em]}
+\address{Teststreet 17}{03333 Nicecity -- Switzerland}
 
 % optional
-\phone{+43(0)999 9999}
-% optional
 \mobile{+43(0)999 888}
 % optional
+\phone{+43(0)999 9999}
+% optional
 \fax{+43(0)999 7777}
 % optional
 \email{[email protected]}
 % optional
+\homepage{www.johndoe.com}
+% optional
 \extrainfo{www.lyx.org}
 
 % optional
-% \photo[height]{name}
+% \photo[height][thickness]{name}
 % 'height' is the height the picture is resized to
+% 'thickness' is the thickness of the surrounding frame
 % 'name' is the name of the picture file
-\photo[64pt]{CV-image}
+\photo[64pt][0.4pt]{CV-image}
 
 % optional
 \quote{"You only live twice." (an optional quote)}
@@ -54,13 +60,13 @@
 \font_roman default
 \font_sans default
 \font_typewriter default
+\font_math auto
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
-
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -71,15 +77,21 @@
 \use_hyperref false
 \papersize a4paper
 \use_geometry false
-\use_amsmath 1
-\use_esint 1
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package undertilde 0
 \cite_engine basic
+\cite_engine_type numerical
+\biblio_style plain
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\justification true
 \use_refstyle 0
 \index Index
 \shortcut idx
@@ -131,7 +143,17 @@ The moderncv class offers lots of customization 
possibilities; some are
 \series bold
 moderncv
 \series default
-.
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
 \end_layout
 
 \end_inset
@@ -139,25 +161,27 @@ moderncv
 
 \end_layout
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
+\end_inset
 
-\begin_layout Plain Layout
 
+\end_layout
+
+\begin_layout MakeCVtitle
+\begin_inset Note Note
+status collapsed
 
-\backslash
-maketitle
+\begin_layout Plain Layout
+outputs the title part; optional
 \end_layout
 
 \end_inset
 
 
 \begin_inset Note Note
-status collapsed
+status open
 
 \begin_layout Plain Layout
-outputs the title part like the address
+Keep entries with green labels empty!
 \end_layout
 
 \end_inset
@@ -170,57 +194,51 @@ Education
 \end_layout
 
 \begin_layout Entry
-2003--2006
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+2003--2006
 \end_layout
 
 \end_inset
 
-Master of Economics
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+Master of Economics
 \end_layout
 
 \end_inset
 
-Institution
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-}{
+\begin_layout Plain Layout
+Institution
 \end_layout
 
 \end_inset
 
-City
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 4
+status open
 
-}{
+\begin_layout Plain Layout
+City
 \end_layout
 
 \end_inset
 
-Country
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 5
+status open
 
-}{
+\begin_layout Plain Layout
+Country
 \end_layout
 
 \end_inset
@@ -229,57 +247,51 @@ Description
 \end_layout
 
 \begin_layout Entry
-2001--2003
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+2001--2003
 \end_layout
 
 \end_inset
 
-Bachelor of Economics
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+Bachelor of Economics
 \end_layout
 
 \end_inset
 
-Institution
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-}{
+\begin_layout Plain Layout
+Institution
 \end_layout
 
 \end_inset
 
-City
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 4
+status open
 
-}{
+\begin_layout Plain Layout
+City
 \end_layout
 
 \end_inset
 
-Country
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 5
+status open
 
-}{
+\begin_layout Plain Layout
+Country
 \end_layout
 
 \end_inset
@@ -292,13 +304,11 @@ Master Thesis
 \end_layout
 
 \begin_layout Item
-Title
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Title
 \end_layout
 
 \end_inset
@@ -309,7 +319,7 @@ Title of the thesis
 \end_layout
 
 \begin_layout Standard
-\begin_inset VSpace -0.5cm
+\begin_inset VSpace 0.5cm
 \end_inset
 
 
@@ -326,13 +336,11 @@ add negative or positive space as you like
 \end_layout
 
 \begin_layout Item
-Supervisors
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Supervisors
 \end_layout
 
 \end_inset
@@ -341,13 +349,11 @@ Names of supervisors
 \end_layout
 
 \begin_layout Item
-Description
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Description
 \end_layout
 
 \end_inset
@@ -362,121 +368,79 @@ Experience
 \end_layout
 
 \begin_layout Entry
-February 2006--
-\begin_inset Newline newline
-\end_inset
-
-current
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
-\end_layout
-
+2006--
+\begin_inset Newline newline
 \end_inset
 
-Maintainer of Open Source projects
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
+current
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 2
+status open
 
 \begin_layout Plain Layout
-
-}{
+Maintainer of Open Source projects
 \end_layout
 
 \end_inset
 
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
+Maintainer of the xxx documentation
 \end_layout
 
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+\begin_layout Entry
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+2005--2006
 \end_layout
 
 \end_inset
 
-Maintainer of the xxx documentation
-\end_layout
 
-\begin_layout Entry
-2005--2006
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 2
+status open
 
 \begin_layout Plain Layout
-
-}{
+Employer
 \end_layout
 
 \end_inset
 
-Employer
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
-\end_layout
 
-\end_inset
+\begin_inset Argument 3
+status open
 
+\begin_layout Plain Layout
 Corp.
  name
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
 \end_layout
 
 \end_inset
 
-City
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 4
+status open
 
-}{
+\begin_layout Plain Layout
+City
 \end_layout
 
 \end_inset
 
-Country
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 5
+status open
 
-}{
+\begin_layout Plain Layout
+Country
 \end_layout
 
 \end_inset
@@ -488,25 +452,22 @@ Description
 Languages
 \end_layout
 
-\begin_layout Language
-French
-\begin_inset ERT
-status collapsed
+\begin_layout ItemWithComment
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+French
 \end_layout
 
 \end_inset
 
-Native
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+Native
 \end_layout
 
 \end_inset
@@ -514,25 +475,22 @@ status collapsed
 
 \end_layout
 
-\begin_layout Language
-Dutch
-\begin_inset ERT
-status collapsed
+\begin_layout ItemWithComment
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Dutch
 \end_layout
 
 \end_inset
 
-Near-native
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+Near-native
 \end_layout
 
 \end_inset
@@ -540,40 +498,43 @@ status collapsed
 Primary education degree obtained in a Dutch college
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
 \begin_layout Section
 Computer skills
 \end_layout
 
-\begin_layout Computer
-OS
-\begin_inset ERT
-status collapsed
+\begin_layout DoubleItem
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+OS
 \end_layout
 
 \end_inset
 
-Linux, Unix, Windows
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+Linux, Unix, Windows
 \end_layout
 
 \end_inset
 
-administration
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-}{
+\begin_layout Plain Layout
+Administration
 \end_layout
 
 \end_inset
@@ -581,40 +542,36 @@ status collapsed
 Apache, Mailman
 \end_layout
 
-\begin_layout Computer
-Programming
-\begin_inset ERT
-status collapsed
+\begin_layout DoubleItem
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Programming
 \end_layout
 
 \end_inset
 
 
+\begin_inset Argument 2
+status open
+
+\begin_layout Plain Layout
+
 \shape smallcaps
 Java
 \shape default
 , C/C++
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
 \end_layout
 
 \end_inset
 
-scripting
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-}{
+\begin_layout Plain Layout
+Scripting
 \end_layout
 
 \end_inset
@@ -622,36 +579,32 @@ status collapsed
 PHP, Shell, Ruby
 \end_layout
 
-\begin_layout Computer
-Scientific
-\begin_inset ERT
-status collapsed
+\begin_layout DoubleItem
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Scientific
 \end_layout
 
 \end_inset
 
-Matlab, AutoCAD, Abaqus
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+Matlab, AutoCAD, Abaqus
 \end_layout
 
 \end_inset
 
-typography
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-}{
+\begin_layout Plain Layout
+Typography
 \end_layout
 
 \end_inset
@@ -659,40 +612,36 @@ status collapsed
 LaTeX, ConTeXt, Scribus, QuarkXPress
 \end_layout
 
-\begin_layout Computer
+\begin_layout DoubleItem
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
 Web
 \begin_inset space ~
 \end_inset
 
 design
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
 \end_layout
 
 \end_inset
 
-XHTML, CSS, AJAX
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 2
+status open
 
-}{
+\begin_layout Plain Layout
+XHTML, CSS, AJAX
 \end_layout
 
 \end_inset
 
-database
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument 3
+status open
 
-}{
+\begin_layout Plain Layout
+Database
 \end_layout
 
 \end_inset
@@ -705,41 +654,40 @@ Interests
 \end_layout
 
 \begin_layout Item
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
 Adventure
-\begin_inset space ~
+\begin_inset Newline newline
 \end_inset
 
 sports
-\begin_inset ERT
-status collapsed
+\end_layout
 
-\begin_layout Plain Layout
+\end_inset
 
-}{
+I like practicing adventure sports like skiing, rock climbing and scuba
+ diving, and have been a boy scout for five years.
 \end_layout
 
+\begin_layout Standard
+\begin_inset VSpace 0.3cm
 \end_inset
 
 
-\size small
-I like practicing adventure sports like skiing, rock climbing and scuba
- diving, and have been a boy scout for five years.
 \end_layout
 
 \begin_layout Item
-Travelling
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Travelling
 \end_layout
 
 \end_inset
 
-
-\size small
 I love travelling around the world.
 \end_layout
 
@@ -783,38 +731,95 @@ end{itemize}
 
 \end_layout
 
-\begin_layout DoubleItem
-Double\SpecialChar \ldots{}
-
+\begin_layout Standard
 \begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
 
-}{
+
+\backslash
+renewcommand{
+\backslash
+listitemsymbol}{-~} 
 \end_layout
 
 \end_inset
 
-\SpecialChar \ldots{}
- item.
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+optional, changes the symbol for lists
 \end_layout
 
-\begin_layout DoubleItem
-Another double\SpecialChar \ldots{}
+\end_inset
+
+
+\end_layout
+
+\begin_layout DoubleListItem
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Item 1
+\end_layout
+
+\end_inset
+
+Item 3
+\end_layout
+
+\begin_layout DoubleListItem
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Item 2
+\end_layout
+
+\end_inset
+
+Item 4, see 
+\begin_inset CommandInset citation
+LatexCommand cite
+key "Jobs95"
+
+\end_inset
+
 
+\end_layout
+
+\begin_layout Standard
 \begin_inset ERT
 status collapsed
 
 \begin_layout Plain Layout
 
-}{
+
+\backslash
+renewcommand{
+\backslash
+listitemsymbol}{
+\backslash
+labelitemi~} 
 \end_layout
 
 \end_inset
 
-\SpecialChar \ldots{}
- item.
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+optional, resets the symbol for lists to the default one
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Subsection
@@ -840,16 +845,6 @@ This ends the section formatting.
 \end_inset
 
 
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-Keep entries with green labels empty!
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -880,13 +875,11 @@ Creates a section without a section heading.
 \end_layout
 
 \begin_layout Item
-Now
-\begin_inset ERT
-status collapsed
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
-
-}{
+Now
 \end_layout
 
 \end_inset
@@ -906,6 +899,64 @@ You can use bibitems:
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+to redefine the heading string ("Publications"), uncomment this:
+\end_layout
+
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+%
+\backslash
+renewcommand{
+\backslash
+refname}{Articles}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+bibliographyitemlabel}{[
+\backslash
+arabic{enumiv}]}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+optional, numbers the bibliography items
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
 \begin_layout Bibliography
 \labelwidthstring References
 \begin_inset CommandInset bibitem
@@ -940,6 +991,9 @@ LaTeX: A Document Preparation System.
 \end_layout
 
 \begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
 or BibTeX references:
 \end_layout
 
@@ -955,5 +1009,132 @@ options "plain"
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage clearpage
+\end_inset
+
+
+\end_layout
+
+\begin_layout Recipient
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Company Recruitment team
+\end_layout
+
+\end_inset
+
+Company, Inc.
+\begin_inset Newline newline
+\end_inset
+
+123 somestreet
+\begin_inset Newline newline
+\end_inset
+
+some city
+\end_layout
+
+\begin_layout Date
+January 01, 1984
+\end_layout
+
+\begin_layout Opening
+Dear Sir or Madam,
+\end_layout
+
+\begin_layout Closing
+Yours faithfully,
+\end_layout
+
+\begin_layout Enclosing
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+Attached
+\end_layout
+
+\end_inset
+
+curriculum vitae
+\end_layout
+
+\begin_layout MakeLetterTitle
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+generates the letter title; must be behind the letter closing and the enclosing
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ Duis ullamcorper neque sit amet lectus facilisis sed luctus nisl iaculis.
+ Vivamus at neque arcu, sed tempor quam.
+ Curabitur pharetra tincidunt tincidunt.
+ Morbi volutpat feugiat mauris, quis tempor neque vehicula volutpat.
+ Duis tristique justo vel massa fermentum accumsan.
+ Mauris ante elit, feugiat vestibulum tempor eget, eleifend ac ipsum.
+ Donec scelerisque lobortis ipsum eu vestibulum.
+ Pellentesque vel massa at felis accumsan rhoncus.
+\end_layout
+
+\begin_layout Standard
+Suspendisse commodo, massa eu congue tincidunt, elit mauris pellentesque
+ orci, cursus tempor odio nisl euismod augue.
+ Aliquam adipiscing nibh ut odio sodales et pulvinar tortor laoreet.
+ Mauris a accumsan ligula.
+ Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
+ inceptos himenaeos.
+ Suspendisse vulputate sem vehicula ipsum varius nec tempus dui dapibus.
+ Phasellus et est urna, ut auctor erat.
+ Sed tincidunt odio id odio aliquam mattis.
+ Donec sapien nulla, feugiat eget adipiscing sit amet, lacinia ut dolor.
+ Phasellus tincidunt, leo a fringilla consectetur, felis diam aliquam urna,
+ vitae aliquet lectus orci nec velit.
+ Vivamus dapibus varius blandit.
+\end_layout
+
+\begin_layout Standard
+Duis sit amet magna ante, at sodales diam.
+ Aenean consectetur porta risus et sagittis.
+ Ut interdum, enim varius pellentesque tincidunt, magna libero sodales tortor,
+ ut fermentum nunc metus a ante.
+ Vivamus odio leo, tincidunt eu luctus ut, sollicitudin sit amet metus.
+ Nunc sed orci lectus.
+ Ut sodales magna sed velit volutpat sit amet pulvinar diam venenatis.
+\end_layout
+
+\begin_layout Standard
+Albert Einstein discovered that 
+\begin_inset Formula $E=mc^{2}$
+\end_inset
+
+ in 1905.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Formula 
+\[
+e=\lim_{n\to\infty}\left(1+\frac{1}{n}\right)^{n}
+\]
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout MakeLetterClosing
+
+\end_layout
+
 \end_body
 \end_document
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index c29f70c..629955c 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,19 +1,19 @@
 #% Do not delete the line below; configure depends on this
 #  
\DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{Modern
 CV}
 #  \DeclareCategory{Curricula Vitae}
-# modern CV textclass definition file.
+# modern CV textclass definition file for modernCV 1.2.0
 # Author : Uwe Stöhr ([email protected])
 
 
 # General textclass parameters
 Format 41
-       Columns                 1
-       Sides                   1
-       SecNumDepth             -1
-       TocDepth                -1
+       Columns         1
+       Sides           1
+       SecNumDepth     -1
+       TocDepth        -1
 
-Provides hyperref  1
-Provides url       1
+Provides hyperref      1
+Provides url           1
 
 
 # Standard style definition
@@ -30,6 +30,7 @@ End
 
 Input stdcounters.inc
 Input stdinsets.inc
+Input stdlists.inc
 
 Style Section
        Margin                  Dynamic
@@ -48,7 +49,7 @@ Style Section
          Family                Sans
          Series                Bold
        EndFont
-               TocLevel 1
+       TocLevel                1
 End
 
 Style Subsection
@@ -61,7 +62,7 @@ Style Subsection
          Family                Sans
          Series                Medium
        EndFont
-       TocLevel 2
+       TocLevel                2
 End
 
 Style Entry
@@ -69,8 +70,32 @@ Style Entry
        LatexType               Command
        LatexName               cventry
        Argument 1
-               LabelString   "Entry Option"
-               Tooltip       "Optional argument to the cventry command"
+         Mandatory             1
+         LabelString           "Time"
+         Tooltip               "Time"
+       EndArgument
+       Argument 2
+         Mandatory             1
+         LabelString           "What?"
+         Tooltip               "What?"
+       EndArgument
+       Argument 3
+         Mandatory             1
+         LabelString           "Affiliation"
+         Tooltip               "Affiliation"
+         #Font
+         #  Shape              Italic
+         #EndFont
+       EndArgument
+       Argument 4
+         Mandatory             1
+         LabelString           "City"
+         Tooltip               "City"
+       EndArgument
+       Argument 5
+         Mandatory             1
+         LabelString           "Country"
+         Tooltip               "Country"
        EndArgument
        ParSkip                 0.4
        Align                   Block
@@ -88,8 +113,9 @@ Style Item
        LatexType               Command
        LatexName               cvitem
        Argument 1
-               LabelString   "Item Option"
-               Tooltip       "Optional argument to the cvitem command"
+         Mandatory             1
+         LabelString           "Item summary"
+         Tooltip               "item summary"
        EndArgument
        ParSkip                 0.4
        Align                   Block
@@ -102,34 +128,71 @@ Style Item
        EndFont
 End
 
+Style ItemWithComment
+       CopyStyle               Item
+       LatexName               cvitemwithcomment
+       LabelString             "Item with comment:"
+       KeepEmpty               1
+       ResetArgs               1
+       Argument 1
+         Mandatory             1
+         LabelString           "Item summary"
+         Tooltip               "Item summary"
+       EndArgument
+       Argument 2
+         Mandatory             1
+         LabelString           "Item text"
+         Tooltip               "Item text"
+       EndArgument
+End
+
 Style ListItem
        CopyStyle               Item
        LatexName               cvlistitem
        LabelString             "List Item:"
+       ResetArgs               1
 End
 
 Style DoubleItem
-       CopyStyle               Item
-       LatexName               cvlistdoubleitem
+       CopyStyle               ListItem
+       LatexName               cvdoubleitem
        LabelString             "Double Item:"
+       KeepEmpty               1
+       Argument 1
+         Mandatory             1
+         LabelString           "Left item summary"
+         Tooltip               "Left item summary"
+       EndArgument
+       Argument 2
+         Mandatory             1
+         LabelString           "Left item text"
+         Tooltip               "Left item text"
+       EndArgument
+       Argument 3
+         Mandatory             1
+         LabelString           "Right item summary"
+         Tooltip               "Right item summary"
+       EndArgument
 End
 
-Style Space
-       CopyStyle               Item
-       LatexName               vspace*
-       LabelString             "Space:"
+Style DoubleListItem
+       CopyStyle               ListItem
+       LatexName               cvlistdoubleitem
+       LabelString             "Double List Item:"
+       ResetArgs               1
+       Argument 1
+         Mandatory             1
+         LabelString           "First Item"
+         Tooltip               "First Item"
+       EndArgument
 End
 
 Style Language
-       CopyStyle               Item
-       LatexName               cvlanguage
-       LabelString             "Language:"
+       ObsoletedBy             ItemWithComment
 End
 
 Style Computer
-       CopyStyle               Item
-       LatexName               cvcomputer
-       LabelString             "Computer:"
+       ObsoletedBy             DoubleItem
 End
 
 Style EmptySection
@@ -154,6 +217,27 @@ Style 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
+End
+
+Style MakeLetterClosing
+       CopyStyle               EmptySection
+       LatexName               makeletterclosing{}
+       LabelString             "Close Letter"
+       Category                Letter
+End
+
 Style Bibliography
        Margin                  First_Dynamic
        LatexType               Bib_Environment
@@ -178,20 +262,93 @@ Style Bibliography
 End
 
 Style --Separator--
-       KeepEmpty             1
-       Margin                Dynamic
-       LatexType             Paragraph
-       LatexName             dummy
-       ParIndent             MM
-       Align                 Block
-       LabelType             Static
-       LabelString           "--- Separate Environment ---"
+       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
+         Family                Roman
+         Series                Medium
+         Size                  Normal
+         Color                 Blue
+       EndFont
+       HTMLLabel               NONE
+End
+
+Style Recipient
+       Margin                  Dynamic
+       LatexType               Command
+       LatexName               recipient
+       Category                Letter
+       Argument 1
+         Mandatory             1
+         LabelString           "Company name"
+         Tooltip               "Company name"
+         #Font
+         #  Series             Bold
+         #EndFont
+       EndArgument
+       NextNoIndent            1
+       ParSkip                 0.4
+       TopSep                  1.3
+       BottomSep               0
+       ParSep                  0.7
+       Align                   Left
+       LabelSep                xxx
+       LabelType               No_Label
+       Font
+         Shape                 Italic
+       EndFont
+End
+
+Style Date
+       CopyStyle               Recipient
+       LatexName               date
+       ResetArgs               1
+       TopSep                  0
+       BottomSep               0
+       Align                   Right
+       Font
+         Series                Medium
+       EndFont
+End
+
+Style Opening
+       CopyStyle               Date
+       LatexName               opening
+       TopSep                  0
+       BottomSep               0.5
+       Align                   Left
+End
+
+Style Closing
+       CopyStyle               Opening
+       LatexName               closing
+End
+
+Style Enclosing
+       Margin                  Dynamic
+       CopyStyle               Opening
+       LatexName               enclosure
+       Argument 1
+         LabelString           "Alternative enclosing name"
+         Tooltip               "Alternative enclosing name"
+       EndArgument
+       LabelSep                xx
+       LabelType               Static
+       LabelString             "Enclosing:"
+       Font
+         Shape                 Italic
+       EndFont
+       LabelFont
+         Shape                 Up
+         Series                Bold
+         Color                 Blue
        EndFont
-       HTMLLabel             NONE
+       
 End
 

-----------------------------------------------------------------------

Summary of changes:
 lib/examples/modernCV.lyx   |  763 ++++++++++++++++++++++++++----------------
 lib/layouts/moderncv.layout |  233 +++++++++++---
 2 files changed, 667 insertions(+), 329 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to