The branch, 2.0.x, has been updated.

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

commit 58f6767e2c3fa92f4ddc45d1075837f2ef25681c
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon Nov 26 06:05:47 2012 +0100

    modernCV: complete revision of layout and example

diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index 3eff785..2a47b0b 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -4,46 +4,13 @@
 \begin_header
 \textclass moderncv
 \begin_preamble
+%\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)
-
-% required
-\firstname{Paul}
-% required
-\familyname{Testman}
-
-% optional, remove the line if not wanted
-\title{Curriculum Vitae}
-
-% optional
-% \address{street and number}{postcode city}
-% '\\' adds a line break
-\address{Teststreet 17}{03333 Nicecity\protect\\[0.1em] 
Switzerland\protect\\[0.2em]}
-
-% optional
-\phone{+43(0)999 9999}
-% optional
-\mobile{+43(0)999 888}
-% optional
-\fax{+43(0)999 7777}
-% optional
-\email{test...@testman.xx}
-% optional
-\extrainfo{www.lyx.org}
-
-% optional
-% \photo[height]{name}
-% 'height' is the height the picture is resized to
-% 'name' is the name of the picture file
-\photo[64pt]{CV-image}
-
-% optional
-\quote{"You only live twice." (an optional quote)}
+%\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...
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children false
@@ -107,12 +74,23 @@
 status open
 
 \begin_layout Plain Layout
-
+The moderncv class offers lots of customization possibilities; some are
+ explained in the preamble of this document; for more information look at
+ the documentation of the LaTeX-package 
 \series bold
-Note:
+moderncv
 \series default
- The personal data like your name, image, address, etc.
- are set in the document preamble.
+:
+\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
@@ -120,18 +98,34 @@ Note:
 
 \end_layout
 
-\begin_layout Standard
+\end_inset
+
+
+\end_layout
+
+\begin_layout CVStyle
+casual
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
-The moderncv class offers lots of customization possibilities; some are
- explained in the preamble of this document; for more information look at
- the documentation of the LaTeX-package 
-\series bold
-moderncv
-\series default
-.
+required, possible styles are 'casual' (default), 'classic', 'oldstyle'
+ and 'banking'
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout CVColor
+blue
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+required, possible colors are 'blue' (default), 'orange', 'green', 'red',
+ 'purple', 'grey' and 'black'
 \end_layout
 
 \end_inset
@@ -139,25 +133,123 @@ moderncv
 
 \end_layout
 
+\begin_layout FirstName
+Paul
+\end_layout
+
+\begin_layout FamilyName
+Testman
+\end_layout
+
+\begin_layout Title
+Curriculum Vitae
+\end_layout
+
 \begin_layout Standard
-\begin_inset ERT
-status collapsed
+\begin_inset Note Note
+status open
 
 \begin_layout Plain Layout
+The following personal entries are optional.
+\end_layout
 
+\end_inset
 
-\backslash
-maketitle
+
+\end_layout
+
+\begin_layout Address
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+Teststreet 17
 \end_layout
 
 \end_inset
 
+03333 Nicecity -- Switzerland
+\end_layout
+
+\begin_layout Mobile
++43(0)999 888
+\end_layout
+
+\begin_layout Phone
++43(0)999 9999
+\end_layout
+
+\begin_layout Fax
++43(0)999 7777
+\end_layout
+
+\begin_layout Email
+test...@testman.xx
+\end_layout
+
+\begin_layout Homepage
+www.johndoe.com
+\end_layout
+
+\begin_layout ExtraInfo
+www.lyx.org
+\end_layout
+
+\begin_layout Photo
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+64pt
+\end_layout
 
+\end_inset
+
+
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+0.4pt
+\end_layout
+
+\end_inset
+
+CV-image
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+The name of the image file.
+ The first argument is the height the photo is resized to, the second one
+ the thickness of the surrounding frame
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Quote
+"You only live twice." (an optional quote)
+\end_layout
+
+\begin_layout MakeCVtitle
 \begin_inset Note Note
 status collapsed
 
 \begin_layout Plain Layout
-outputs the title part like the address
+outputs the title part; optional
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Keep entries with green labels empty!
 \end_layout
 
 \end_inset
@@ -170,57 +262,51 @@ Education
 \end_layout
 
 \begin_layout Entry
-2003--2006
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+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
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Institution
 \end_layout
 
 \end_inset
 
-City
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+City
 \end_layout
 
 \end_inset
 
-Country
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Country
 \end_layout
 
 \end_inset
@@ -229,57 +315,51 @@ Description
 \end_layout
 
 \begin_layout Entry
-2001--2003
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+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
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Institution
 \end_layout
 
 \end_inset
 
-City
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+City
 \end_layout
 
 \end_inset
 
-Country
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Country
 \end_layout
 
 \end_inset
@@ -292,13 +372,11 @@ Master Thesis
 \end_layout
 
 \begin_layout Item
-Title
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+Title
 \end_layout
 
 \end_inset
@@ -309,7 +387,7 @@ Title of the thesis
 \end_layout
 
 \begin_layout Standard
-\begin_inset VSpace -0.5cm
+\begin_inset VSpace 0.5cm
 \end_inset
 
 
@@ -326,13 +404,11 @@ add negative or positive space as you like
 \end_layout
 
 \begin_layout Item
-Supervisors
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+Supervisors
 \end_layout
 
 \end_inset
@@ -341,13 +417,11 @@ Names of supervisors
 \end_layout
 
 \begin_layout Item
-Description
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+Description
 \end_layout
 
 \end_inset
@@ -362,61 +436,55 @@ Experience
 \end_layout
 
 \begin_layout Entry
-February 2006--
+\begin_inset Argument
+status open
+
+\begin_layout Plain Layout
+2006--
 \begin_inset Newline newline
 \end_inset
 
 current
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-}{
 \end_layout
 
 \end_inset
 
-Maintainer of Open Source projects
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Maintainer of Open Source projects
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
 
-}{
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
 
-}{
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
 
-}{
 \end_layout
 
 \end_inset
@@ -425,58 +493,52 @@ Maintainer of the xxx documentation
 \end_layout
 
 \begin_layout Entry
-2005--2006
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+2005--2006
 \end_layout
 
 \end_inset
 
-Employer
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Employer
 \end_layout
 
 \end_inset
 
-Corp.
- name
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Corp.
+ name
 \end_layout
 
 \end_inset
 
-City
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+City
 \end_layout
 
 \end_inset
 
-Country
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Country
 \end_layout
 
 \end_inset
@@ -488,25 +550,22 @@ Description
 Languages
 \end_layout
 
-\begin_layout Language
-French
-\begin_inset ERT
-status collapsed
+\begin_layout ItemWithComment
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+French
 \end_layout
 
 \end_inset
 
-Native
-\begin_inset ERT
-status collapsed
 
-\begin_layout Plain Layout
+\begin_inset Argument
+status open
 
-}{
+\begin_layout Plain Layout
+Native
 \end_layout
 
 \end_inset
@@ -514,25 +573,22 @@ status collapsed
 
 \end_layout
 
-\begin_layout Language
-Dutch
-\begin_inset ERT
-status collapsed
+\begin_layout ItemWithComment
+\begin_inset Argument
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Near-native
 \end_layout
 
 \end_inset
@@ -540,40 +596,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
+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
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Administration
 \end_layout
 
 \end_inset
@@ -581,40 +640,36 @@ status collapsed
 Apache, Mailman
 \end_layout
 
-\begin_layout Computer
-Programming
-\begin_inset ERT
-status collapsed
+\begin_layout DoubleItem
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+Programming
 \end_layout
 
 \end_inset
 
 
+\begin_inset Argument
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Scripting
 \end_layout
 
 \end_inset
@@ -622,36 +677,32 @@ status collapsed
 PHP, Shell, Ruby
 \end_layout
 
-\begin_layout Computer
-Scientific
-\begin_inset ERT
-status collapsed
+\begin_layout DoubleItem
+\begin_inset Argument
+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
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Typography
 \end_layout
 
 \end_inset
@@ -659,40 +710,36 @@ status collapsed
 LaTeX, ConTeXt, Scribus, QuarkXPress
 \end_layout
 
-\begin_layout Computer
+\begin_layout DoubleItem
+\begin_inset Argument
+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
+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
+status open
 
-}{
+\begin_layout Plain Layout
+Database
 \end_layout
 
 \end_inset
@@ -705,41 +752,40 @@ Interests
 \end_layout
 
 \begin_layout Item
+\begin_inset Argument
+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
+status open
 
 \begin_layout Plain Layout
-
-}{
+Travelling
 \end_layout
 
 \end_inset
 
-
-\size small
 I love travelling around the world.
 \end_layout
 
@@ -783,38 +829,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
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+optional, changes the symbol for lists
 \end_layout
 
 \end_inset
 
-\SpecialChar \ldots{}
- item.
+
 \end_layout
 
-\begin_layout DoubleItem
-Another double\SpecialChar \ldots{}
+\begin_layout DoubleListItem
+\begin_inset Argument
+status open
 
+\begin_layout Plain Layout
+Item 1
+\end_layout
+
+\end_inset
+
+Item 3
+\end_layout
+
+\begin_layout DoubleListItem
+\begin_inset Argument
+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
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+optional, resets the symbol for lists to the default one
 \end_layout
 
 \end_inset
 
-\SpecialChar \ldots{}
- item.
+
 \end_layout
 
 \begin_layout Subsection
@@ -840,16 +943,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 +973,11 @@ Creates a section without a section heading.
 \end_layout
 
 \begin_layout Item
-Now
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-}{
+Now
 \end_layout
 
 \end_inset
@@ -906,6 +997,72 @@ You can use bibitems:
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+To redefine the heading string (
+\begin_inset Quotes eld
+\end_inset
+
+Publications
+\begin_inset Quotes erd
+\end_inset
+
+), 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 +1097,13 @@ LaTeX: A Document Preparation System.
 \end_layout
 
 \begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 or BibTeX references:
 \end_layout
 
@@ -955,5 +1119,132 @@ options "plain"
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset Newpage clearpage
+\end_inset
+
+
+\end_layout
+
+\begin_layout Recipient
+\begin_inset Argument
+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
+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 a062281..4101dc9 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,6 +1,6 @@
 #% Do not delete the line below; configure depends on this
 #  
\DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty]{curriculum
 vitae (modern)}
-# modern CV textclass definition file.
+# textclass definition file for modernCV 1.2.0
 # Author : Uwe Stöhr (uwesto...@web.de)
 
 
@@ -17,174 +17,397 @@ 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
+       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
 Input stdinsets.inc
+Input stdlists.inc
+
+Style CVStyle
+       Margin          Dynamic
+       LatexType       Command
+       LatexName       moderncvstyle
+       Category        FrontMatter
+       InPreamble      1
+       ParSkip         0.4
+       LabelSep        xx
+       LabelType       Static
+       LabelString     "CV style:"
+       LabelFont
+         Series        Bold
+         Color         Blue
+       EndFont
+End
+
+Style CVColor
+       CopyStyle       CVStyle
+       LatexName       moderncvcolor
+       LabelString     "CV color scheme:"
+End
+
+Style FirstName
+       LatexType       command
+       LatexName       firstname
+       Category        FrontMatter
+       InPreamble      1
+       TopSep          0.7
+       Align           Center
+       Font
+         Family        Sans
+         Size          Largest
+       EndFont
+End
+
+Style FamilyName
+       CopyStyle       FirstName
+       LatexName       familyname
+       TopSep          0.3
+       LabelString     "Family Name:"
+End
+
+Style Title
+       Margin          Static
+       LatexType       Command
+       Category        FrontMatter
+       InPreamble      1
+       LatexName       title
+       ParSkip         0.4
+       ItemSep         0
+       TopSep          0.7
+       BottomSep       0.7
+       ParSep          1
+       Align           Center
+       LabelType       No_Label
+       Font
+         Size          Larger
+         Shape         Italic
+         EndFont
+       HTMLTag         h1
+       HTMLTitle       true
+End
+
+Style Address
+       CopyStyle       CVStyle
+       LatexName       address
+       RequiredArgs    1
+       LabelString     "Address:"
+       BottomSep       0.3
+       TopSep          0
+End
+
+Style Mobile
+       CopyStyle       CVStyle
+       LatexName       mobile
+       LabelString     "Mobile:"
+End
+
+Style Phone
+       CopyStyle       CVStyle
+       LatexName       phone
+       LabelString     "Phone:"
+End
+
+Style Fax
+       CopyStyle       CVStyle
+       LatexName       fax
+       LabelString     "Fax:"
+End
+
+Style Email
+       CopyStyle       CVStyle
+       LatexName       email
+       LabelString     "Email:"
+End
+
+Style Homepage
+       CopyStyle       CVStyle
+       LatexName       homepage
+       LabelString     "Homepage:"
+End
+
+Style ExtraInfo
+       CopyStyle       CVStyle
+       LatexName       extrainfo
+       LabelString     "Extra Info:"
+End
+
+Style Photo
+       CopyStyle       CVStyle
+       LatexName       photo
+       LabelString     "Photo:"
+       OptionalArgs    2
+End
+
+Style Quote
+       CopyStyle       CVStyle
+       LatexName       quote
+       LabelType       No_Label
+       Align           Center
+       BottomSep       0.7
+       TopSep          0.5
+       Font
+         Shape         Italic
+         Size          Large
+       EndFont
+End
 
 Style Section
-       Margin                  Dynamic
-       LatexType               Command
-       LatexName               section
-       NeedProtect             1
-       NextNoIndent            1
-       ParSkip                 0.4
-       TopSep                  1.3
-       BottomSep               0.7
-       ParSep                  0.7
-       Align                   Block
-       LabelSep                xxx
-       LabelType               No_Label
+       Margin          Dynamic
+       LatexType       Command
+       LatexName       section
+       NeedProtect     1
+       NextNoIndent    1
+       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
 End
 
 Style Subsection
-       CopyStyle               Section
-       LatexName               subsection
-       TopSep                  0.9
-       BottomSep               0
-       ParSep                  0.5
+       CopyStyle       Section
+       LatexName       subsection
+       TopSep          0.9
+       BottomSep       0
+       ParSep          0.5
        Font
-         Family                Sans
-         Series                Medium
+         Family        Sans
+         Series        Medium
        EndFont
-       TocLevel                2
+       TocLevel        2
 End
 
 Style Entry
-       Margin                  Dynamic
-       LatexType               Command
-       LatexName               cventry
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
-       LabelString             "Entry:"
+       Margin          Dynamic
+       LatexType       Command
+       LatexName       cventry
+       RequiredArgs    5
+       ParSkip         0.4
+       Align           Block
+       LabelSep        xx
+       LabelType       Static
+       LabelString     "Entry:"
        LabelFont
-         Series                Bold
-         Color                 Blue
+         Series        Bold
+         Color         Blue
        EndFont
 End
 
 Style Item
-       Margin                  Dynamic
-       LatexType               Command
-       LatexName               cvitem
-       OptionalArgs            1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
-       LabelString             "Item:"
-       LabelFont
-         Series                Bold
-         Color                 Blue
-       EndFont
+       CopyStyle       Entry
+       LatexName       cvitem
+       RequiredArgs    1
+       LabelString     "Item:"
 End
 
 Style ListItem
-       CopyStyle               Item
-       LatexName               cvlistitem
-       LabelString             "List Item:"
+       CopyStyle       Item
+       LatexName       cvlistitem
+       Category        List
+       RequiredArgs    0
+       LabelString     "List Item:"
+End
+
+Style ItemWithComment
+       CopyStyle       Item
+       LatexName       cvitemwithcomment
+       RequiredArgs    2
+       LabelString     "Item with comment:"
+       Font
+         Shape         Italic
+       EndFont
+       LabelFont
+         Series        Bold
+         Color         Blue
+         Shape         Up
+       EndFont
 End
 
 Style DoubleItem
-       CopyStyle               Item
-       LatexName               cvlistdoubleitem
-       LabelString             "Double Item:"
+       CopyStyle       Item
+       LatexName       cvdoubleitem
+       RequiredArgs    3
+       LabelString     "Double Item:"
+End
+
+Style DoubleListItem
+       CopyStyle       Item
+       LatexName       cvlistdoubleitem
+       Category        List
+       LabelString     "Double List Item:"
 End
 
 Style Space
-       CopyStyle               Item
-       LatexName               vspace*
-       LabelString             "Space:"
+       ObsoletedBy     VSpace
 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
-       Margin                  Dynamic
-       LatexType               Command
-       LatexName               emptysection{}
-       KeepEmpty               1
-       ParSkip                 0.4
-       Align                   Block
-       LabelSep                xx
-       LabelType               Static
-       LabelString             "Empty Section"
+       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
+         Series        Bold
+         Color         Green
        EndFont
 End
 
 Style CloseSection
-       CopyStyle               EmptySection
-       LatexName               closesection{}
-       LabelString             "Close Section"
+       CopyStyle       EmptySection
+       LatexName       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
-       LatexName               thebibliography
-       NextNoIndent            1
-       LeftMargin              MM
-       ParSkip                 0.4
-       ItemSep                 0
-       TopSep                  0.7
-       BottomSep               0.7
-       ParSep                  0.5
-       Align                   Block
-       AlignPossible           Block, Left
-       LabelType               Bibliography
-       LabelString             "References"
-       LabelBottomSep          1.2
+       Margin          First_Dynamic
+       LatexType       Bib_Environment
+       LatexName       thebibliography
+       NextNoIndent    1
+       LeftMargin      MM
+       ParSkip         0.4
+       ItemSep         0
+       TopSep          0.7
+       BottomSep       0.7
+       ParSep          0.5
+       Align           Block
+       AlignPossible   Block, Left
+       LabelType       Bibliography
+       LabelString     "References"
+       LabelBottomSep  1.2
        LabelFont
-         Series                Bold
-         Size                  Larger
-         Family                Sans
+         Series        Bold
+         Size          Larger
+         Family        Sans
        EndFont
 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
+       EndFont
+       HTMLLabel       NONE
+End
+
+Style Recipient
+       Margin          Dynamic
+       LatexType       Command
+       LatexName       recipient
+       Category        Letter
+       RequiredArgs    1
+       NextNoIndent    1
+       ParSkip         0.4
+       TopSep          1.3
+       BottomSep       0
+       ParSep          0.7
+       Align           Left
+       LabelSep        xxx
+       LabelType       No_Label
+       Font
+         Series        Bold
+       EndFont
+End
+
+Style Date
+       CopyStyle       Recipient
+       LatexName       date
+       RequiredArgs    0
+       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
+       OptionalArgs    1
+       LabelSep        xx
+       LabelType       Static
+       LabelString     "Enclosing:"
+       Font
+         Shape         Italic
+       EndFont
        LabelFont
-         Family                Roman
-         Series                Medium
-         Size                  Normal
-         Color                 Blue
+         Shape         Up
+         Series        Bold
+         Color         Blue
        EndFont
-       HTMLLabel               NONE
+       
 End
 

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

Summary of changes:
 lib/examples/modernCV.lyx   |  885 ++++++++++++++++++++++++++++---------------
 lib/layouts/moderncv.layout |  455 +++++++++++++++++------
 2 files changed, 927 insertions(+), 413 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to