europecv: - fix bibliography and wrong address layout

          - change layout file because europecv doesn't support bibitems

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17724 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
index 18d3c5169d3139f00bde13422fd07d75ae7487b5..c2dbedd58d7d2d666783d5378657adb5b5cc1f70 100644 (file)
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@@ -188,28 +188,6 @@ Style LangFooter
        EndFont
 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
-       LabelType               Bibliography
-       LabelString             "References"
-       LabelBottomSep          1.2
-       LabelFont
-         Series                Bold
-         Size                  Larger
-         Family                Sans
-       EndFont
-End
-
 Style End
        Margin                  Dynamic
        LatexType               Command

diff --git a/lib/templates/europeCV.lyx b/lib/templates/europeCV.lyx
index df9fbfba06d6f554d8d4cc22bb9efb557235bf21..615e76c8c25fedb3c18a6aa79a3d91bbcde27f3f 100644 (file)
--- a/lib/templates/europeCV.lyx
+++ b/lib/templates/europeCV.lyx
@@ -9,11 +9,9 @@
 % Define personal data\r
 \ecvname{Testmann, Paul}\r
 \ecvfootername{Paul Testmann}\r
-\ecvnationality{Switzerland}\r
+\ecvnationality{Swiss}\r
 \ecvdateofbirth{June 23, 1962}\r
-\ecvaddress{Teststreet\\\r
-03333 Nicecity\\\r
-Switzerland}\r
+\ecvaddress{Teststreet\newline 03333 Nicecity\newline Switzerland}\r
 \ecvemail{testman@testman.xx}\r
 % the optional phnoe number is for the mobile\r
 \ecvtelephone[+43(0)777 7777]{+43(0)999 9999}\r
@@ -98,7 +96,7 @@ status open
 \series bold\r
 Note:\r
 \series default\r
- The personal settings like your name, address, etc.\r
+ The personal data like your name, address, etc.\r
  are set in the document preamble.\r
 \end_layout\r
 \r
@@ -113,7 +111,7 @@ status open
 \r
 \begin_layout Standard\r
 The europecv-class offers lots of customization possibilities; to find out\r
- more, look at its documentatation.\r
+ more, look at its documentation.\r
 \end_layout\r
 \r
 \end_inset\r
@@ -122,6 +120,15 @@ The europecv-class offers lots of customization possibilities; to find out
 \end_layout\r
 \r
 \begin_layout PersonalInfo\r
+\begin_inset Note Note\r
+status collapsed\r
+\r
+\begin_layout Standard\r
+Inserts the personal data.\r
+\end_layout\r
+\r
+\end_inset\r
+\r
 \r
 \end_layout\r
 \r
@@ -266,8 +273,9 @@ French
 status open\r
 \r
 \begin_layout Standard\r
-The optional parameter is the vertical height behind the item.\r
- It is available for every kind of items.\r
+The optional parameter is the vertical height behind the item; negative\r
+ values are allowed.\r
+ It is available for every kind of entries.\r
 \end_layout\r
 \r
 \end_inset\r
@@ -282,7 +290,7 @@ The optional parameter is the vertical height behind the item.
 \r
 )\r
 \begin_inset Note Note\r
-status open\r
+status collapsed\r
 \r
 \begin_layout Standard\r
 Inserts the language level explanation and sets the symbol for the reference\r
@@ -561,7 +569,7 @@ ecvAOne
 \r
 )\r
 \begin_inset Note Note\r
-status open\r
+status collapsed\r
 \r
 \begin_layout Standard\r
 The footer and header should be the same character.\r
@@ -717,46 +725,59 @@ status collapsed
 I love travelling around the world.\r
 \end_layout\r
 \r
-\begin_layout Standard\r
-You can use bibitems:\r
+\begin_layout Section\r
+Publications\r
 \end_layout\r
 \r
-\begin_layout Bibliography\r
-\begin_inset LatexCommand bibitem\r
-key "latexcompanion"\r
-\r
-\end_inset\r
+\begin_layout Item\r
+References\r
+\begin_inset ERT\r
+status collapsed\r
 \r
-Frank Mittelbach and Michel Goossens: \r
-\emph on\r
-The LaTeX Companion Second Edition.\r
+\begin_layout Standard\r
 \r
-\emph default\r
- Addison-Wesley, 2004\r
+}{\r
 \end_layout\r
 \r
-\begin_layout Bibliography\r
-\begin_inset LatexCommand bibitem\r
-key "latexguide"\r
-\r
 \end_inset\r
 \r
-Helmut Kopka and Patrick W.\r
+[1] Helmut Kopka and Patrick W.\r
  Daly: \r
 \emph on\r
 A Guide to LaTeX Fourth Edition.\r
 \r
 \emph default\r
  Addison-Wesley, 2003\r
+\begin_inset ERT\r
+status collapsed\r
+\r
+\begin_layout Standard\r
+\r
+\r
+\backslash\r
+newline%\r
 \end_layout\r
 \r
-\begin_layout Bibliography\r
-\begin_inset LatexCommand bibitem\r
-key "latexbook"\r
+\end_inset\r
+\r
+\r
+\newline\r
+\r
+\begin_inset ERT\r
+status collapsed\r
+\r
+\begin_layout Standard\r
+\r
+\r
+\backslash\r
+newline%\r
+\end_layout\r
 \r
 \end_inset\r
 \r
-Leslie Lamport: \r
+\r
+\newline\r
+[2] Leslie Lamport: \r
 \emph on\r
 LaTeX: A Document Preparation System.\r
 \r
@@ -764,8 +785,21 @@ LaTeX: A Document Preparation System.
  Addison-Wesley, second edition, 1994\r
 \end_layout\r
 \r
+\begin_layout Section\r
+Publications\r
+\end_layout\r
+\r
 \begin_layout Standard\r
-or BibTeX references:\r
+\begin_inset Note Note\r
+status open\r
+\r
+\begin_layout Standard\r
+You can also use BibTeX references:\r
+\end_layout\r
+\r
+\end_inset\r
+\r
+\r
 \end_layout\r
 \r
 \begin_layout Item\r
@@ -774,6 +808,21 @@ status collapsed
 \r
 \begin_layout Standard\r
 \r
+}{\r
+\end_layout\r
+\r
+\end_inset\r
+\r
+\r
+\begin_inset VSpace -1cm*\r
+\end_inset\r
+\r
+\r
+\begin_inset ERT\r
+status collapsed\r
+\r
+\begin_layout Standard\r
+\r
 \r
 \backslash\r
 nocite{*}\r
@@ -783,7 +832,7 @@ nocite{*}
 \r
 \r
 \begin_inset Note Note\r
-status open\r
+status collapsed\r
 \r
 \begin_layout Standard\r
 \r