The branch, 2.0.x, has been updated.

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

commit fb180204badb785118e29d771178c63ab3185c77
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sat Jan 26 17:27:42 2013 +0100

    Revert "modernCV: complete revision of layout and example"
    
    This reverts commit 58f6767e2c3fa92f4ddc45d1075837f2ef25681c.
    
    - additionally add the new requirement "suffix.sty"

diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index 5eb03ef..5b053e9 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -4,13 +4,46 @@
 \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}
-%\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
+\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)}
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children false
@@ -74,28 +107,12 @@
 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
+Note:
 \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
-
-
+ The personal data like your name, image, address, etc.
+ are set in the document preamble.
 \end_layout
 
 \end_inset
@@ -103,153 +120,44 @@ 
http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
 
 \end_layout
 
-\begin_layout CVStyle
-casual
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-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
-
-
-\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 Note Note
 status open
 
 \begin_layout Plain Layout
-The following personal entries are optional.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Address
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Teststreet 17
+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
+.
 \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 Standard
+\begin_inset ERT
+status collapsed
 
 \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
+\backslash
+maketitle
 \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; optional
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-Keep entries with green labels empty!
+outputs the title part like the address
 \end_layout
 
 \end_inset
@@ -262,51 +170,57 @@ Education
 \end_layout
 
 \begin_layout Entry
-\begin_inset Argument
-status open
+2003--2006
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-2003--2006
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Master of Economics
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Master of Economics
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Institution
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Institution
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+City
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-City
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Country
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Country
+
+}{
 \end_layout
 
 \end_inset
@@ -315,51 +229,57 @@ Description
 \end_layout
 
 \begin_layout Entry
-\begin_inset Argument
-status open
+2001--2003
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-2001--2003
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Bachelor of Economics
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Bachelor of Economics
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Institution
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Institution
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+City
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-City
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Country
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Country
+
+}{
 \end_layout
 
 \end_inset
@@ -372,11 +292,13 @@ Master Thesis
 \end_layout
 
 \begin_layout Item
-\begin_inset Argument
-status open
+Title
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Title
+
+}{
 \end_layout
 
 \end_inset
@@ -387,7 +309,7 @@ Title of the thesis
 \end_layout
 
 \begin_layout Standard
-\begin_inset VSpace 0.5cm
+\begin_inset VSpace -0.5cm
 \end_inset
 
 
@@ -404,11 +326,13 @@ add negative or positive space as you like
 \end_layout
 
 \begin_layout Item
-\begin_inset Argument
-status open
+Supervisors
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Supervisors
+
+}{
 \end_layout
 
 \end_inset
@@ -417,11 +341,13 @@ Names of supervisors
 \end_layout
 
 \begin_layout Item
-\begin_inset Argument
-status open
+Description
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Description
+
+}{
 \end_layout
 
 \end_inset
@@ -436,55 +362,61 @@ Experience
 \end_layout
 
 \begin_layout Entry
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-2006--
+February 2006--
 \begin_inset Newline newline
 \end_inset
 
 current
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Maintainer of Open Source projects
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Maintainer of Open Source projects
+
+}{
 \end_layout
 
 \end_inset
 
 
-\begin_inset Argument
-status open
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
 
+}{
 \end_layout
 
 \end_inset
 
 
-\begin_inset Argument
-status open
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
 
+}{
 \end_layout
 
 \end_inset
 
 
-\begin_inset Argument
-status open
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
 
+}{
 \end_layout
 
 \end_inset
@@ -493,52 +425,58 @@ Maintainer of the xxx documentation
 \end_layout
 
 \begin_layout Entry
-\begin_inset Argument
-status open
+2005--2006
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-2005--2006
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Employer
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Employer
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
 Corp.
  name
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+City
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-City
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Country
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Country
+
+}{
 \end_layout
 
 \end_inset
@@ -550,22 +488,25 @@ Description
 Languages
 \end_layout
 
-\begin_layout ItemWithComment
-\begin_inset Argument
-status open
+\begin_layout Language
+French
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-French
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Native
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Native
+
+}{
 \end_layout
 
 \end_inset
@@ -573,66 +514,66 @@ Native
 
 \end_layout
 
-\begin_layout ItemWithComment
-\begin_inset Argument
-status open
+\begin_layout Language
+Dutch
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Dutch
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
 Near-native
-\end_layout
+\begin_inset ERT
+status collapsed
 
-\end_inset
+\begin_layout Plain Layout
 
-Primary education degree obtained in a Dutch college
+}{
 \end_layout
 
-\begin_layout Standard
-\begin_inset Newpage newpage
 \end_inset
 
-
+Primary education degree obtained in a Dutch college
 \end_layout
 
 \begin_layout Section
 Computer skills
 \end_layout
 
-\begin_layout DoubleItem
-\begin_inset Argument
-status open
+\begin_layout Computer
+OS
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-OS
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Linux, Unix, Windows
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Linux, Unix, Windows
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+administration
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Administration
+
+}{
 \end_layout
 
 \end_inset
@@ -640,36 +581,40 @@ Administration
 Apache, Mailman
 \end_layout
 
-\begin_layout DoubleItem
-\begin_inset Argument
-status open
+\begin_layout Computer
+Programming
+\begin_inset ERT
+status collapsed
 
 \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
 
-
-\begin_inset Argument
-status open
+scripting
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Scripting
+
+}{
 \end_layout
 
 \end_inset
@@ -677,32 +622,36 @@ Scripting
 PHP, Shell, Ruby
 \end_layout
 
-\begin_layout DoubleItem
-\begin_inset Argument
-status open
+\begin_layout Computer
+Scientific
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Scientific
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+Matlab, AutoCAD, Abaqus
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Matlab, AutoCAD, Abaqus
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+typography
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Typography
+
+}{
 \end_layout
 
 \end_inset
@@ -710,36 +659,40 @@ Typography
 LaTeX, ConTeXt, Scribus, QuarkXPress
 \end_layout
 
-\begin_layout DoubleItem
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
+\begin_layout Computer
 Web
 \begin_inset space ~
 \end_inset
 
 design
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+XHTML, CSS, AJAX
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-XHTML, CSS, AJAX
+
+}{
 \end_layout
 
 \end_inset
 
-
-\begin_inset Argument
-status open
+database
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Database
+
+}{
 \end_layout
 
 \end_inset
@@ -752,40 +705,41 @@ Interests
 \end_layout
 
 \begin_layout Item
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
 Adventure
-\begin_inset Newline newline
+\begin_inset space ~
 \end_inset
 
 sports
-\end_layout
+\begin_inset ERT
+status collapsed
 
-\end_inset
+\begin_layout Plain Layout
 
-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
-\begin_inset Argument
-status open
+Travelling
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Travelling
+
+}{
 \end_layout
 
 \end_inset
 
+
+\size small
 I love travelling around the world.
 \end_layout
 
@@ -829,95 +783,38 @@ end{itemize}
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout DoubleItem
+Double\SpecialChar \ldots{}
+
 \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
-
-
-\end_layout
-
-\begin_layout DoubleListItem
-\begin_inset Argument
-status open
-
-\begin_layout Plain Layout
-Item 1
+}{
 \end_layout
 
 \end_inset
 
-Item 3
+\SpecialChar \ldots{}
+ item.
 \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 DoubleItem
+Another double\SpecialChar \ldots{}
 
-\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
@@ -943,6 +840,16 @@ 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
@@ -973,11 +880,13 @@ Creates a section without a section heading.
 \end_layout
 
 \begin_layout Item
-\begin_inset Argument
-status open
+Now
+\begin_inset ERT
+status collapsed
 
 \begin_layout Plain Layout
-Now
+
+}{
 \end_layout
 
 \end_inset
@@ -997,72 +906,6 @@ 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
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
@@ -1095,13 +938,6 @@ 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
 
@@ -1117,132 +953,5 @@ 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 4101dc9..5858a1e 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)}
-# textclass definition file for modernCV 1.2.0
+#  
\DeclareLaTeXClass[moderncv,color.sty,fancyhdr.sty,hyperref.sty,ifpdf.sty,marvosym.sty,suffix.sty]{curriculum
 vitae (modern)}
+# modern CV textclass definition file.
 # Author : Uwe Stöhr (uwesto...@web.de)
 
 
@@ -29,135 +29,6 @@ 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
@@ -196,7 +67,7 @@ Style Entry
        Margin          Dynamic
        LatexType       Command
        LatexName       cventry
-       RequiredArgs    5
+       OptionalArgs            1
        ParSkip         0.4
        Align           Block
        LabelSep        xx
@@ -209,59 +80,49 @@ Style Entry
 End
 
 Style Item
-       CopyStyle       Entry
+       Margin          Dynamic
+       LatexType       Command
        LatexName       cvitem
-       RequiredArgs    1
+       OptionalArgs    1
+       ParSkip         0.4
+       Align           Block
+       LabelSep        xx
+       LabelType       Static
        LabelString     "Item:"
-End
-
-Style ListItem
-       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
+Style ListItem
        CopyStyle       Item
-       LatexName       cvdoubleitem
-       RequiredArgs    3
-       LabelString     "Double Item:"
+       LatexName       cvlistitem
+       LabelString     "List Item:"
 End
 
-Style DoubleListItem
+Style DoubleItem
        CopyStyle       Item
        LatexName       cvlistdoubleitem
-       Category        List
-       LabelString     "Double List Item:"
+       LabelString     "Double Item:"
 End
 
 Style Space
-       ObsoletedBy     VSpace
+       CopyStyle       Item
+       LatexName       vspace*
+       LabelString     "Space:"
 End
 
 Style Language
-       ObsoletedBy     ItemWithComment
+       CopyStyle       Item
+       LatexName       cvlanguage
+       LabelString     "Language:"
 End
 
 Style Computer
-       ObsoletedBy     DoubleItem
+       CopyStyle       Item
+       LatexName       cvcomputer
+       LabelString     "Computer:"
 End
 
 Style EmptySection
@@ -286,27 +147,6 @@ 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
@@ -348,66 +188,3 @@ Style --Separator--
        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
-         Shape         Up
-         Series        Bold
-         Color         Blue
-       EndFont
-       
-End
-
diff --git a/status.20x b/status.20x
index a76676f..46df274 100644
--- a/status.20x
+++ b/status.20x
@@ -45,11 +45,6 @@ What's new
 - Show a symbol on collapsed branches indicating whether they are
   active.
 
-- completely revised layout and example files for modernCV
-  (Note: Due to massive changes in the modernCV document class
-         you need to adapt your existing files according to the new
-         example file to keep them compilable.)
-
 
 * DOCUMENTATION AND LOCALIZATION
 

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

Summary of changes:
 lib/examples/modernCV.lyx   |  885 +++++++++++++++----------------------------
 lib/layouts/moderncv.layout |  271 ++------------
 status.20x                  |    5 -
 3 files changed, 321 insertions(+), 840 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to