diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-23 22:03:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-23 22:03:59 +0000 |
commit | dcbba316ad38f69871121fcbb50f004119258729 (patch) | |
tree | e44095eb83723e97ef0fb63270feb2699958a4f4 /Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty | |
parent | 7c7ae491345ff76b2899396d911ffbd59907b657 (diff) |
moderncv (23apr13)
git-svn-id: svn://tug.org/texlive/trunk@30069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty | 64 |
1 files changed, 29 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty index 1da3078867b..d584c5a243a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty @@ -10,23 +10,13 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleclassic}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: classic] +\ProvidesPackage{moderncvstyleclassic}[2013/04/23 v1.5.0 modern curriculum vitae and letter style scheme: classic] %------------------------------------------------------------------------------- % required packages %------------------------------------------------------------------------------- - - -%------------------------------------------------------------------------------- -% package options -%------------------------------------------------------------------------------- - - -%------------------------------------------------------------------------------- -% overall style definition -%------------------------------------------------------------------------------- -% fonts +% Latin Modern fonts %\ifxetexorluatex % \setmainfont{Latin Modern Roman} % \setsansfont{Latin Modern Sans} @@ -37,12 +27,12 @@ {} %\fi + +%------------------------------------------------------------------------------- +% overall style definition +%------------------------------------------------------------------------------- % symbols -\renewcommand*{\mobilesymbol}{\marvosymbol{72}~} -\renewcommand*{\phonesymbol}{\marvosymbol{84}~} -\renewcommand*{\faxsymbol}{\marvosymbol{117}~} -\renewcommand*{\emailsymbol}{\marvosymbol{66}~} -\renewcommand*{\homepagesymbol}{{\Large\marvosymbol{205}}~} +\moderncvicons{marvosym} %------------------------------------------------------------------------------- @@ -103,7 +93,13 @@ \renewcommand*{\makecvtitle}{% % recompute lengths (in case we are switching from letter to resume, or vice versa) \recomputecvlengths% - % optional detailed information box + % optional detailed information (pre-rendering) + \def\phonesdetails{}% + \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number + \protected@edef\phonesdetails{\phonesdetails\protect\makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% + \def\socialsdetails{}% + \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link + \protected@edef\socialsdetails{\socialsdetails\protect\makenewline\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}}% \newbox{\makecvtitledetailsbox}% \savebox{\makecvtitledetailsbox}{% \addressfont\color{color2}% @@ -111,11 +107,10 @@ \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% - \ifthenelse{\isundefined{\@mobile}}{}{\makenewline\mobilesymbol\@mobile}% - \ifthenelse{\isundefined{\@phone}}{}{\makenewline\phonesymbol\@phone}% - \ifthenelse{\isundefined{\@fax}}{}{\makenewline\faxsymbol\@fax}% + \phonesdetails% needs to be pre-rendered as loops and tabulars seem to conflict \ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httplink{\@homepage}}% + \socialsdetails% needs to be pre-rendered as loops and tabulars seem to conflict \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}% \end{tabular} }% @@ -138,11 +133,11 @@ {\setlength{\makecvtitlenamewidth}{\textwidth-\makecvtitledetailswidth-\makecvtitlepicturewidth}}% {}% \begin{minipage}[b]{\makecvtitlenamewidth}% - \namestyle{\@firstname\ \@familyname}% + \namestyle{\@firstname\ \@lastname}% \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% \hfill% - % detailed information + % optional detailed information (rendering) \llap{\usebox{\makecvtitledetailsbox}}% \llap is used to suppress the width of the box, allowing overlap if the value of makecvtitlenamewidth is forced % optional photo (rendering) \usebox{\makecvtitlepicturebox}\\[2.5em]% @@ -155,27 +150,27 @@ \newlength{\baseletterheight} \settoheight{\baseletterheight}{\sectionstyle{o}} \setlength{\baseletterheight}{\baseletterheight-0.95ex} -\renewcommand*{\section}[1]{% +\RenewDocumentCommand{\section}{sm}{% \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{section}{#1}% + \addcontentsline{toc}{section}{#2}% \parbox[t]{\hintscolumnwidth}{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}% \hspace{\separatorcolumnwidth}% - \parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#1}}% + \parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#2}}% \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading -\renewcommand*{\subsection}[1]{% +\RenewDocumentCommand{\subsection}{sm}{% \par\addvspace{1ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{subsection}{#1}% + \addcontentsline{toc}{subsection}{#2}% \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% - \raggedleft\hintstyle{} &{\strut\subsectionstyle{#1}}% + \raggedleft\hintstyle{} &{\strut\subsectionstyle{#2}}% \end{tabular}% \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading \renewcommand*{\cvitem}[3][.25em]{% \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% - \raggedleft\hintstyle{#2} &{#3}% + \raggedleft\hintstyle{#2} &{#3}% \end{tabular}% \par\addvspace{#1}} @@ -260,13 +255,12 @@ \begin{minipage}{.5\textwidth}% \raggedleft% \addressfont\textcolor{color2}{% - {\bfseries\upshape\@firstname~\@familyname}\@firstdetailselementfalse% + {\bfseries\upshape\@firstname~\@lastname}\@firstdetailselementfalse% \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet% \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\makenewline\@addresscountry}}% - \ifthenelse{\isundefined{\@mobile}}{}{\makenewline\mobilesymbol\@mobile}% - \ifthenelse{\isundefined{\@phone}}{}{\makenewline\phonesymbol\@phone}% - \ifthenelse{\isundefined{\@fax}}{}{\makenewline\faxsymbol\@fax}% + \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number + \makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}% \ifthenelse{\isundefined{\@email}}{}{\makenewline\emailsymbol\emaillink{\@email}}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httplink{\@homepage}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}% @@ -291,7 +285,7 @@ \renewcommand*{\makeletterclosing}{ \@closing\\[3em]% - {\bfseries \@firstname~\@familyname}% + {\bfseries \@firstname~\@lastname}% \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfill% |