Author: uwestoehr
Date: Sat Jan 21 13:05:07 2012
New Revision: 40640
URL: http://www.lyx.org/trac/changeset/40640
Log:
- moderncv.layout: add missing separator style
- modernCV.lyx: set page size to A4, correct subsection entry, use a separator
modify preamble to be compliant with modernCV 0.16 (fixes #7991)
- biblioExample.bib: correct a much too long entry
Modified:
lyx-devel/trunk/lib/examples/biblioExample.bib
lyx-devel/trunk/lib/examples/modernCV.lyx
lyx-devel/trunk/lib/layouts/moderncv.layout
Modified: lyx-devel/trunk/lib/examples/biblioExample.bib
==============================================================================
--- lyx-devel/trunk/lib/examples/biblioExample.bib Sat Jan 21 08:02:09
2012 (r40639)
+++ lyx-devel/trunk/lib/examples/biblioExample.bib Sat Jan 21 13:05:07
2012 (r40640)
@@ -1,4 +1,4 @@
-% This file was created with JabRef 2.5.
+% This file was created with JabRef 2.7.
% Encoding: Cp1252
@ARTICLE{Mena2000,
@@ -87,29 +87,10 @@
@MANUAL{Pople2003,
title = {{G}aussian 03},
- author = {M.~J. Frisch and G.~W. Trucks and H.~B. Schlegel and G.~E. Scuseria
- and M.~A. Robb and J.~R. Cheeseman and Montgomery and Jr. and J.
- A. and T. Vreven and K.~N. Kudin and J.~C. Burant and J.~M. Millam
- and S.~S. Iyengar and J. Tomasi and V. Barone and B. Mennucci and
- M. Cossi and G. Scalmani and N. Rega and G.~A. Petersson and H.
Nakatsuji
- and M. Hada and M. Ehara and K. Toyota and R. Fukuda and J. Hasegawa
- and M. Ishida and T. Nakajima and Y. Honda and O. Kitao and H. Nakai
- and M. Klene and X. Li and J.~E. Knox and H.~P. Hratchian and J.~B.
- Cross and V. Bakken and C. Adamo and J. Jaramillo and R. Gomperts
- and R.~E. Stratmann and O. Yazyev and A.~J. Austin and R. Cammi and
- C. Pomelli and J.~W. Ochterski and P.~Y. Ayala and K. Morokuma and
- G.~A. Voth and P. Salvador and J.~J. Dannenberg and V.~G. Zakrzewski
- and S. Dapprich and A.~D. Daniels and M.~C. Strain and O. Farkas
- and D.~K. Malick and A.~D. Rabuck and K. Raghavachari and J.~B. Foresman
- and J.~V. Ortiz and Q. Cui and A.~G. Baboul and S. Clifford and J.
- Cioslowski and B.~B. Stefanov and G. Liu and A. Liashenko and P.
- Piskorz and I. Komaromi and R.~L. Martin and D.~J. Fox and T. Keith
- and M.~A. Al-Laham and C.~Y. Peng and A. Nanayakkara and M. Challacombe
- and P.~M.~W. Gill and B. Johnson and W. Chen and M.~W. Wong and C.
- Gonzalez and J.~A. Pople},
+ author = {M.~J. Frisch and P. Pople},
organization = {Gaussian, Inc.},
address = {Wallingford, CT},
- year = {2004},
+ year = {2003},
howpublished = {Gaussian, Inc., Wallingford, CT, USA},
institution = {Gaussian, Inc.},
publisher = {Gaussian, Inc.}
@@ -172,12 +153,13 @@
}
@BOOK{Tufte2006,
- author = {Edward R. Tufte},
- title = {Beautiful Evidence},
- year = {2006},
- publisher = {Graphics Press, {LLC}},
- month = {May},
- edition = {First},
- place = {Cheshire, Connecticut},
- isbn = {0-9613921-7-7}
-}
\ No newline at end of file
+ title = {Beautiful Evidence},
+ publisher = {Graphics Press, {LLC}},
+ year = {2006},
+ author = {Edward R. Tufte},
+ edition = {First},
+ month = {May},
+ isbn = {0-9613921-7-7},
+ place = {Cheshire, Connecticut}
+}
+
Modified: lyx-devel/trunk/lib/examples/modernCV.lyx
==============================================================================
--- lyx-devel/trunk/lib/examples/modernCV.lyx Sat Jan 21 08:02:09 2012
(r40639)
+++ lyx-devel/trunk/lib/examples/modernCV.lyx Sat Jan 21 13:05:07 2012
(r40640)
@@ -4,6 +4,9 @@
\begin_header
\textclass moderncv
\begin_preamble
+% adjust the page margins
+\usepackage[scale=0.75]{geometry}
+
\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)
@@ -65,7 +68,7 @@
\paperfontsize 12
\spacing single
\use_hyperref false
-\papersize default
+\papersize a4paper
\use_geometry false
\use_amsmath 1
\use_esint 1
@@ -81,8 +84,8 @@
\shortcut idx
\color #008000
\end_index
-\secnumdepth 3
-\tocdepth 3
+\secnumdepth 0
+\tocdepth -1
\paragraph_separation skip
\defskip medskip
\quotes_language english
@@ -817,8 +820,8 @@
subsection
\end_layout
-\begin_layout Standard
-subsection text
+\begin_layout ListItem
+subsection item
\end_layout
\begin_layout Section
@@ -898,6 +901,10 @@
You can use bibitems:
\end_layout
+\begin_layout --Separator--
+
+\end_layout
+
\begin_layout Bibliography
\labelwidthstring References
\begin_inset CommandInset bibitem
Modified: lyx-devel/trunk/lib/layouts/moderncv.layout
==============================================================================
--- lyx-devel/trunk/lib/layouts/moderncv.layout Sat Jan 21 08:02:09 2012
(r40639)
+++ lyx-devel/trunk/lib/layouts/moderncv.layout Sat Jan 21 13:05:07 2012
(r40640)
@@ -5,7 +5,7 @@
# General textclass parameters
-Format 36
+Format 35
Columns 1
Sides 1
SecNumDepth -1
@@ -170,3 +170,21 @@
EndFont
End
+Style --Separator--
+ KeepEmpty 1
+ Margin Dynamic
+ LatexType Paragraph
+ LatexName dummy
+ ParIndent MM
+ Align Block
+ LabelType Static
+ LabelString "--- Separate Environment ---"
+ LabelFont
+ Family Roman
+ Series Medium
+ Size Normal
+ Color Blue
+ EndFont
+ HTMLLabel NONE
+End
+
