diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty index f32b4a09db3..324b11a187c 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleoldstyle}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2013/04/23 v1.5.0 modern curriculum vitae and letter style scheme: oldstyle] %------------------------------------------------------------------------------- @@ -21,11 +21,6 @@ %------------------------------------------------------------------------------- -% package options -%------------------------------------------------------------------------------- - - -%------------------------------------------------------------------------------- % overall style definition %------------------------------------------------------------------------------- % fonts @@ -43,13 +38,7 @@ %\fi % symbols -\renewcommand*{\listitemsymbol}{\labelitemi~} -\renewcommand*{\addresssymbol}{} -\renewcommand*{\mobilesymbol}{\textbf{M}~} -\renewcommand*{\phonesymbol}{\textbf{T}~} -\renewcommand*{\faxsymbol}{\textbf{F}~} -\renewcommand*{\emailsymbol}{\textbf{E}~} -\renewcommand*{\homepagesymbol}{} +\moderncvicons{letters} %------------------------------------------------------------------------------- @@ -138,7 +127,7 @@ \newlength{\makecvtitlepicturewidth}\settowidth{\makecvtitlepicturewidth}{\usebox{\makecvtitlepicturebox}}% \newlength{\makecvtitlenamewidth}\setlength{\makecvtitlenamewidth}{\textwidth-\makecvtitlepicturewidth}% \begin{minipage}[b]{\makecvtitlenamewidth}% - \namestyle{\@firstname\ \@familyname}% + \namestyle{\@firstname\ \@lastname}% \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% % optional photo @@ -153,25 +142,26 @@ \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}}% + \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link + \makenewline\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}% \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}} -\renewcommand*{\section}[1]{% +\RenewDocumentCommand{\section}{sm}{% \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{section}{#1}% - \strut\sectionstyle{#1}% + \addcontentsline{toc}{section}{#2}% + \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}% - \strut\subsectionstyle{#1}% + \addcontentsline{toc}{subsection}{#2}% + \strut\subsectionstyle{#2}% \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading \renewcommand*{\cvitem}[3][.25em]{% @@ -290,15 +280,16 @@ \hspace{0pt}% \marginpar{% \addressfont\textcolor{color2}{% - {\bfseries\@firstname~\@familyname}\@firstdetailselementfalse% + {\bfseries\@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}}% + \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link + \makenewline\csname\collectionloopkey socialsymbol\endcsname\collectionloopitem}% \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}}}% % ensure no extra spacing after \makelettertitle due to a possible blank line % \ignorespacesafterend% not working @@ -306,7 +297,7 @@ \renewcommand*{\makeletterclosing}{ \@closing\\[3em]% - {\bfseries\@firstname~\@familyname}% + {\bfseries\@firstname~\@lastname}% \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfill% |