The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 1d777eeec110e03929bacc952ef410afaceffa71 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Sun Nov 25 00:44:57 2012 +0100 modernCV: support for preamble setup - now all personal info can be specified the LyX way, only the package loading and some special settings remain in the preamble - achemso.layout: a whitespace fix diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx index b945153..f0f6328 100644 --- a/lib/examples/modernCV.lyx +++ b/lib/examples/modernCV.lyx @@ -4,10 +4,6 @@ \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 @@ -15,41 +11,6 @@ \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 -\firstname{Paul} -% required -\familyname{Testman} - -% optional, remove the line if not wanted -\title{Curriculum Vitae} - -% optional -% \address{street and number}{postcode city} -\address{Teststreet 17}{03333 Nicecity -- Switzerland} - -% optional -\mobile{+43(0)999 888} -% optional -\phone{+43(0)999 9999} -% optional -\fax{+43(0)999 7777} -% optional -\email{test...@testman.xx} -% optional -\homepage{www.johndoe.com} -% optional -\extrainfo{www.lyx.org} - -% optional -% \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][0.4pt]{CV-image} - -% optional -\quote{"You only live twice." (an optional quote)} \end_preamble \use_default_options false \maintain_unincluded_children false @@ -119,12 +80,43 @@ 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 + + +\end_layout + +\end_inset + + +\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 @@ -132,33 +124,111 @@ Note: \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 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 -: -\begin_inset Newline newline +The following personal entries are optional. +\end_layout + \end_inset -\begin_inset Flex URL +\end_layout + +\begin_layout Address +\begin_inset Argument 1 status open \begin_layout Plain Layout +Teststreet 17 +\end_layout -http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex +\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 1 +status open + +\begin_layout Plain Layout +64pt +\end_layout + +\end_inset + + +\begin_inset Argument 2 +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 @@ -166,6 +236,10 @@ http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex \end_layout +\begin_layout Quote +"You only live twice." (an optional quote) +\end_layout + \begin_layout MakeCVtitle \begin_inset Note Note status collapsed @@ -811,7 +885,7 @@ labelitemi~} \begin_inset Note Note -status collapsed +status open \begin_layout Plain Layout optional, resets the symbol for lists to the default one @@ -904,7 +978,15 @@ You can use bibitems: status open \begin_layout Plain Layout -to redefine the heading string ("Publications"), uncomment this: +To redefine the heading string ( +\begin_inset Quotes eld +\end_inset + +Publications +\begin_inset Quotes erd +\end_inset + +), uncomment this: \end_layout \end_inset diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout index 065d87d..21ca9c7 100644 --- a/lib/layouts/achemso.layout +++ b/lib/layouts/achemso.layout @@ -76,7 +76,7 @@ Style Title LabelString "Short Title|S" Tooltip "Short title which will appear in the running header" EndArgument -End +End Style Author LatexType command diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout index c13f015..b23c081 100644 --- a/lib/layouts/moderncv.layout +++ b/lib/layouts/moderncv.layout @@ -32,322 +32,471 @@ 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 + LabelString "Address:" + BottomSep 0.3 + TopSep 0 + Argument 1 + Mandatory 1 + LabelString "Street" + EndArgument +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:" + Argument 1 + LabelString "Height" + Tooltip "Height the photo is resized to" + EndArgument + Argument 2 + LabelString "Thickness" + Tooltip "Thickness of the surrounding frame" + EndArgument +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 + Margin Dynamic + LatexType Command + LatexName cventry Argument 1 - Mandatory 1 - LabelString "Time" - Tooltip "Time" + Mandatory 1 + LabelString "Time" + Tooltip "Time" EndArgument Argument 2 - Mandatory 1 - LabelString "What?" - Tooltip "What?" + Mandatory 1 + LabelString "What?" + Tooltip "What?" EndArgument Argument 3 - Mandatory 1 - LabelString "Affiliation" - Tooltip "Affiliation" + Mandatory 1 + LabelString "Affiliation" + Tooltip "Affiliation" #Font - # Shape Italic + # Shape Italic #EndFont EndArgument Argument 4 - Mandatory 1 - LabelString "City" - Tooltip "City" + Mandatory 1 + LabelString "City" + Tooltip "City" EndArgument Argument 5 - Mandatory 1 - LabelString "Country" - Tooltip "Country" + Mandatory 1 + LabelString "Country" + Tooltip "Country" EndArgument - ParSkip 0.4 - Align Block - LabelSep xx - LabelType Static - LabelString "Entry:" + 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 + Margin Dynamic + LatexType Command + LatexName cvitem Argument 1 - Mandatory 1 - LabelString "Summary" - Tooltip "Summary" + Mandatory 1 + LabelString "Summary" + Tooltip "Summary" EndArgument - ParSkip 0.4 - Align Block - LabelSep xx - LabelType Static - LabelString "Item:" + ParSkip 0.4 + Align Block + LabelSep xx + LabelType Static + LabelString "Item:" LabelFont - Series Bold - Color Blue + Series Bold + Color Blue EndFont End Style ItemWithComment - CopyStyle Item - LatexName cvitemwithcomment - LabelString "Item with comment:" - KeepEmpty 1 - ResetArgs 1 + CopyStyle Item + LatexName cvitemwithcomment + LabelString "Item with comment:" + KeepEmpty 1 + ResetArgs 1 Argument 1 - Mandatory 1 - LabelString "Summary" - Tooltip "Summary" + Mandatory 1 + LabelString "Summary" + Tooltip "Summary" EndArgument Argument 2 - Mandatory 1 - LabelString "Text" - Tooltip "Text" + Mandatory 1 + LabelString "Text" + Tooltip "Text" + #Font + # Series Bold + #EndFont EndArgument + Font + Shape Italic + EndFont + LabelFont + Series Bold + Color Blue + Shape Up + EndFont End Style ListItem - CopyStyle Item - LatexName cvlistitem - LabelString "List Item:" - ResetArgs 1 + CopyStyle Item + LatexName cvlistitem + LabelString "List Item:" + ResetArgs 1 End Style DoubleItem - CopyStyle ListItem - LatexName cvdoubleitem - LabelString "Double Item:" - KeepEmpty 1 + CopyStyle ListItem + LatexName cvdoubleitem + LabelString "Double Item:" + KeepEmpty 1 Argument 1 - Mandatory 1 - LabelString "Left summary" - Tooltip "Left summary" + Mandatory 1 + LabelString "Left summary" + Tooltip "Left summary" EndArgument Argument 2 - Mandatory 1 - LabelString "Left text" - Tooltip "Left text" + Mandatory 1 + LabelString "Left text" + Tooltip "Left text" EndArgument Argument 3 - Mandatory 1 - LabelString "Right summary" - Tooltip "Right summary" + Mandatory 1 + LabelString "Right summary" + Tooltip "Right summary" EndArgument End Style DoubleListItem - CopyStyle ListItem - LatexName cvlistdoubleitem - LabelString "Double List Item:" - ResetArgs 1 + CopyStyle ListItem + LatexName cvlistdoubleitem + LabelString "Double List Item:" + ResetArgs 1 Argument 1 - Mandatory 1 - LabelString "First Item" - Tooltip "First Item" + Mandatory 1 + LabelString "First Item" + Tooltip "First Item" EndArgument End Style Language - ObsoletedBy ItemWithComment + ObsoletedBy ItemWithComment End Style Computer - ObsoletedBy DoubleItem + 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 + CopyStyle EmptySection + LatexName makecvtitle{} + LabelString "Make CV title" + Category Title End Style MakeLetterTitle - CopyStyle EmptySection - LatexName makelettertitle{} - LabelString "Make letter title" - Category Letter + CopyStyle EmptySection + LatexName makelettertitle{} + LabelString "Make letter title" + Category Letter End Style MakeLetterClosing - CopyStyle EmptySection - LatexName makeletterclosing{} - LabelString "Close Letter" - Category Letter + 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 + Family Roman + Series Medium + Size Normal + Color Blue EndFont - HTMLLabel NONE + HTMLLabel NONE End Style Recipient - Margin Dynamic - LatexType Command - LatexName recipient - Category Letter + Margin Dynamic + LatexType Command + LatexName recipient + Category Letter Argument 1 - Mandatory 1 - LabelString "Company name" - Tooltip "Company name" + Mandatory 1 + LabelString "Company name" + Tooltip "Company name" #Font - # Series Bold + # Series Bold #EndFont EndArgument - NextNoIndent 1 - ParSkip 0.4 - TopSep 1.3 - BottomSep 0 - ParSep 0.7 - Align Left - LabelSep xxx - LabelType No_Label + NextNoIndent 1 + ParSkip 0.4 + TopSep 1.3 + BottomSep 0 + ParSep 0.7 + Align Left + LabelSep xxx + LabelType No_Label Font - Shape Italic + Shape Italic EndFont End Style Date - CopyStyle Recipient - LatexName date - ResetArgs 1 - TopSep 0 - BottomSep 0 - Align Right + CopyStyle Recipient + LatexName date + ResetArgs 1 + TopSep 0 + BottomSep 0 + Align Right Font - Series Medium + Series Medium EndFont End Style Opening - CopyStyle Date - LatexName opening - TopSep 0 - BottomSep 0.5 - Align Left + CopyStyle Date + LatexName opening + TopSep 0 + BottomSep 0.5 + Align Left End Style Closing - CopyStyle Opening - LatexName closing + CopyStyle Opening + LatexName closing End Style Enclosing - Margin Dynamic - CopyStyle Opening - LatexName enclosure + Margin Dynamic + CopyStyle Opening + LatexName enclosure Argument 1 - LabelString "Alternative name" - Tooltip "Alternative instead of 'Enclosure'" + LabelString "Alternative name" + Tooltip "Alternative instead of 'Enclosure'" EndArgument - LabelSep xx - LabelType Static - LabelString "Enclosing:" + LabelSep xx + LabelType Static + LabelString "Enclosing:" Font - Shape Italic + Shape Italic EndFont LabelFont - Shape Up - Series Bold - Color Blue + Shape Up + Series Bold + Color Blue EndFont End ----------------------------------------------------------------------- Summary of changes: lib/examples/modernCV.lyx | 192 +++++++++++----- lib/layouts/achemso.layout | 2 +- lib/layouts/moderncv.layout | 547 +++++++++++++++++++++++++++---------------- 3 files changed, 486 insertions(+), 255 deletions(-) hooks/post-receive -- The LyX Source Repository