diff --git a/examples/template-es.pdf b/examples/template-es.pdf index 387c611..5b9bcd2 100644 Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf index 0406a9a..4f67f25 100644 Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ diff --git a/examples/template.pdf b/examples/template.pdf index 90db04a..fb85acc 100644 Binary files a/examples/template.pdf and b/examples/template.pdf differ diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf index 25c9bb4..1b54f25 100644 Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf index a163430..8967f3e 100644 Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf index ae5a4ea..e510f51 100644 Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf index 2bb1e27..ee6b9a1 100644 Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf index ea16047..abdbd30 100644 Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ diff --git a/moderncv.cls b/moderncv.cls index 706b77e..ce899cd 100644 --- a/moderncv.cls +++ b/moderncv.cls @@ -269,9 +269,9 @@ % other symbols \newcommand*{\listitemsymbol}{\labelitemi~} \newcommand*{\addresssymbol}{} -\newcommand*{\mobilesymbol}{} -\newcommand*{\phonesymbol}{} -\newcommand*{\faxsymbol}{} +\newcommand*{\mobilephonesymbol}{} +\newcommand*{\fixedphonesymbol}{} +\newcommand*{\faxphonesymbol}{} \newcommand*{\emailsymbol}{} \newcommand*{\homepagesymbol}{} diff --git a/moderncvcompatibility.sty b/moderncvcompatibility.sty index 8772a0d..1fc53f2 100644 --- a/moderncvcompatibility.sty +++ b/moderncvcompatibility.sty @@ -93,6 +93,9 @@ \newcommand*{\@mobile}{\collectionfindbykey{phones}{mobile}} \newcommand*{\@phone}{\collectionfindbykey{phones}{fixed}} \newcommand*{\@fax}{\collectionfindbykey{phones}{fax}} +\newcommand*{\phonesymbol}{\fixedphonesymbol} +\newcommand*{\mobilesymbol}{\mobilephonesymbol} +\newcommand*{\faxsymbol}{\faxphonesymbol} \endinput diff --git a/moderncvstylebanking.sty b/moderncvstylebanking.sty index 9f26cb8..b22006d 100644 --- a/moderncvstylebanking.sty +++ b/moderncvstylebanking.sty @@ -43,9 +43,9 @@ %\fi % symbols -\renewcommand*{\mobilesymbol}{\marvosymbol{72}~} -\renewcommand*{\phonesymbol}{\marvosymbol{84}~} -\renewcommand*{\faxsymbol}{\marvosymbol{117}~} +\renewcommand*{\mobilephonesymbol}{\marvosymbol{72}~} +\renewcommand*{\fixedphonesymbol}{\marvosymbol{84}~} +\renewcommand*{\faxphonesymbol}{\marvosymbol{117}~} \renewcommand*{\emailsymbol}{\marvosymbol{66}~} \renewcommand*{\homepagesymbol}{{\Large\marvosymbol{205}}~} @@ -96,9 +96,8 @@ \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\addtomaketitle[~--~]{\@addresscountry}}% \flushmaketitle\@firstmaketitleelementtrue\\}% - \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle{\mobilesymbol\@mobile}}% - \ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}% - \ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}% + \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number + \addtomaketitle{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@email}}{}{\addtomaketitle{\emailsymbol\emaillink{\@email}}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtomaketitle{\homepagesymbol\httplink{\@homepage}}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\addtomaketitle{\@extrainfo}}% diff --git a/moderncvstylecasual.sty b/moderncvstylecasual.sty index c3639d2..5ab567c 100644 --- a/moderncvstylecasual.sty +++ b/moderncvstylecasual.sty @@ -112,9 +112,8 @@ \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofooter[~--~]{\@addresscountry}}% \flushfooter\@firstfooterelementtrue\\}% - \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}% - \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}% - \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}% + \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number + \addtofooter{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}% @@ -162,9 +161,8 @@ \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and addresscountry will always be defined but could be empty \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofooter[~--~]{\@addresscountry}}% \flushfooter\@firstfooterelementtrue\\}% - \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}% - \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}% - \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}% + \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number + \addtofooter{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}% diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty index 946fdd5..f628427 100644 --- a/moderncvstyleclassic.sty +++ b/moderncvstyleclassic.sty @@ -38,9 +38,9 @@ %\fi % symbols -\renewcommand*{\mobilesymbol}{\marvosymbol{72}~} -\renewcommand*{\phonesymbol}{\marvosymbol{84}~} -\renewcommand*{\faxsymbol}{\marvosymbol{117}~} +\renewcommand*{\mobilephonesymbol}{\marvosymbol{72}~} +\renewcommand*{\fixedphonesymbol}{\marvosymbol{84}~} +\renewcommand*{\faxphonesymbol}{\marvosymbol{117}~} \renewcommand*{\emailsymbol}{\marvosymbol{66}~} \renewcommand*{\homepagesymbol}{{\Large\marvosymbol{205}}~} @@ -103,7 +103,10 @@ \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}}% \newbox{\makecvtitledetailsbox}% \savebox{\makecvtitledetailsbox}{% \addressfont\color{color2}% @@ -111,9 +114,7 @@ \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% needed 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}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}% @@ -142,7 +143,7 @@ \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]% @@ -264,9 +265,8 @@ \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}}% diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty index ff818f6..f5ac067 100644 --- a/moderncvstyleoldstyle.sty +++ b/moderncvstyleoldstyle.sty @@ -45,9 +45,9 @@ % symbols \renewcommand*{\listitemsymbol}{\labelitemi~} \renewcommand*{\addresssymbol}{} -\renewcommand*{\mobilesymbol}{\textbf{M}~} -\renewcommand*{\phonesymbol}{\textbf{T}~} -\renewcommand*{\faxsymbol}{\textbf{F}~} +\renewcommand*{\mobilephonesymbol}{\textbf{M}~} +\renewcommand*{\fixedphonesymbol}{\textbf{T}~} +\renewcommand*{\faxphonesymbol}{\textbf{F}~} \renewcommand*{\emailsymbol}{\textbf{E}~} \renewcommand*{\homepagesymbol}{} @@ -153,9 +153,8 @@ \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}}} @@ -294,9 +293,8 @@ \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}}}%