diff --git a/moderncv.cls b/moderncv.cls index ddab9ae..9896fc9 100644 --- a/moderncv.cls +++ b/moderncv.cls @@ -238,22 +238,12 @@ % where should be either "https" (default) or "http" \NewDocumentCommand{\homepage}{O{https}m}{\def\@homepageprotocol{#1}\def\@homepage{#2}} -% adds a fixed/mobile/fax number to one's personal information (optional) -% usage: \phone[]{} -% where should be either "fixed" (default), "mobile" or "fax -\collectionnew{phones} -\NewDocumentCommand{\phone}{O{fixed}m}{% - \ifthenelse{\equal{#1}{fax}}% - {\collectionadd[#1]{phones}{#2}} - {\collectionadd[#1]{phones}{\protect\tellink{#2}}} - } - - % http://latex.org/forum/viewtopic.php?t=12239 \def\SplitMyMacro#1/#2{#2} % Define links for different social networks \newcommand{\emaillink}[2]{\protect\href{mailto:#2}{#1}} +\newcommand{\mobilephonelink}[2]{\protect\tellink[#1]{#2}} \newcommand{\linkedinlink}[2]{\protect\httpslink[#1]{www.linkedin.com/in/#2}} \newcommand{\xinglink}[2]{\protect\httpslink[#1]{www.xing.com/profile/#2}} \newcommand{\twitterlink}[2]{\protect\httpslink[#1]{twitter.com/#2}} @@ -345,9 +335,9 @@ \newcommand*{\listitemsymbol} {\labelitemi~} \newcommand*{\addresssymbol} {} \newcommand*{\bornsymbol} {} -\newcommand*{\mobilephonesymbol} {} -\newcommand*{\fixedphonesymbol} {} -\newcommand*{\faxphonesymbol} {} +\newcommand*{\mobilephonesocialsymbol} {} +\newcommand*{\fixedphonesocialsymbol} {} +\newcommand*{\faxphonesocialsymbol} {} \newcommand*{\emailsocialsymbol} {} \newcommand*{\homepagesymbol} {} \newcommand*{\linkedinsocialsymbol} {} diff --git a/moderncvfooti.sty b/moderncvfooti.sty index 3458f00..d9c10b5 100644 --- a/moderncvfooti.sty +++ b/moderncvfooti.sty @@ -86,8 +86,6 @@ \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofoot[~--~]{\@addresscountry}}% \flushfoot\@firstfootelementtrue\\}% \ifthenelse{\isundefined{\@born}}{}{\addtofoot{\bornsymbol\@born}\flushfoot\@firstfootelementtrue\\}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \addtofoot{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtofoot{\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link @@ -118,8 +116,6 @@ \ifthenelse{\equal{\@addresscountry}{}}{}{\addtofoot[~--~]{\@addresscountry}}% \flushfoot\@firstfootelementtrue\\}% \ifthenelse{\isundefined{\@born}}{}{\addtofoot{\bornsymbol\@born}\flushfoot\@firstfootelementtrue\\}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \addtofoot{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtofoot{\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadi.sty b/moderncvheadi.sty index b09e31e..f70bbcf 100644 --- a/moderncvheadi.sty +++ b/moderncvheadi.sty @@ -72,9 +72,6 @@ % optional detailed information (pre-rendering) \@initializebox{\makecvheaddetailsbox}% \if@details% - \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\collectionloopitem}}% @@ -86,7 +83,6 @@ \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{\@born}}{}{\makenewline\bornsymbol\@born}% - \phonesdetails% needs to be pre-rendered as loops and tabulars seem to conflict \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \socialsdetails% needs to be pre-rendered as loops and tabulars seem to conflict @@ -174,8 +170,6 @@ \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}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadii.sty b/moderncvheadii.sty index b38d58b..22a9c79 100644 --- a/moderncvheadii.sty +++ b/moderncvheadii.sty @@ -141,8 +141,6 @@ \ifthenelse{\equal{\@addresscountry}{}}{}{\addtomakeheaddetails[~--~]{\@addresscountry}}% \flushmakeheaddetails\@firstmakeheaddetailselementtrue\\\null}% \ifthenelse{\isundefined{\@born}}{}{\addtomakeheaddetails{\bornsymbol\@born}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \addtomakeheaddetails{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadiii.sty b/moderncvheadiii.sty index aa4d155..c36e158 100644 --- a/moderncvheadiii.sty +++ b/moderncvheadiii.sty @@ -94,8 +94,6 @@ \ifthenelse{\equal{\@addresscountry}{}}{}{\addtomakeheaddetails[~--~]{\@addresscountry}}% \flushmakeheaddetails\@firstmakeheaddetailselementtrue\\}% \ifthenelse{\isundefined{\@born}}{}{\addtomakeheaddetails{\bornsymbol\@born}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \addtomakeheaddetails{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link @@ -153,8 +151,6 @@ \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}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadiv.sty b/moderncvheadiv.sty index 8d47b5f..ece2ec7 100644 --- a/moderncvheadiv.sty +++ b/moderncvheadiv.sty @@ -110,8 +110,6 @@ \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{\@born}}{}{\makenewline\hbox to 1.0em{\bornsymbol}~\@born}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \makenewline\hbox to 1.0em{\csname\collectionloopkey phonesymbol\endcsname}~\collectionloopitem}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\hbox to 1.0em{\homepagesymbol}~% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link @@ -158,8 +156,6 @@ \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}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \makenewline\hbox to 1.0em{\csname\collectionloopkey phonesymbol\endcsname}~\collectionloopitem}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\hbox to 1.0em{\homepagesymbol}~% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadv.sty b/moderncvheadv.sty index 5a2c390..55d18b1 100644 --- a/moderncvheadv.sty +++ b/moderncvheadv.sty @@ -82,8 +82,6 @@ \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{\@born}}{}{\makenewline\bornsymbol~\@born}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \makenewline\csname\collectionloopkey phonesymbol\endcsname~\collectionloopitem}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol~% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link @@ -154,8 +152,6 @@ \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}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \makenewline\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}% \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadvi.sty b/moderncvheadvi.sty index 3833012..f8c0fb7 100644 --- a/moderncvheadvi.sty +++ b/moderncvheadvi.sty @@ -115,8 +115,6 @@ \ifthenelse{\equal{\@addresscountry}{}}{}{\addtomakeheaddetails[~--~]{\@addresscountry}}% \flushmakeheaddetails\@firstmakeheaddetailselementtrue\\\null}% \ifthenelse{\isundefined{\@born}}{}{\addtomakeheaddetails{\bornsymbol\@born}}% - \collectionloop{phones}{% the key holds the phone type (=symbol command prefix), the item holds the number - \addtomakeheaddetails{\csname\collectionloopkey phonesymbol\endcsname\collectionloopitem}}% \ifthenelse{\isundefined{\@homepage}}{}{\addtomakeheaddetails{\homepagesymbol% \ifthenelse{\equal{\@homepageprotocol}{http}}{\httplink{\@homepage}}{\httpslink{\@homepage}}}}% \collectionloop{socials}{% the key holds the social type (=symbol command prefix), the item holds the link diff --git a/moderncvheadvii.sty b/moderncvheadvii.sty index f8e4d51..7ae84e6 100644 --- a/moderncvheadvii.sty +++ b/moderncvheadvii.sty @@ -79,9 +79,6 @@ % optional detailed information (pre-rendering) \@initializebox{\makecvheaddetailsbox}% \if@details% - \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\collectionloopitem}}% @@ -93,7 +90,6 @@ \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{\@born}}{}{\makenewline\bornsymbol\@born}% - \phonesdetails% needs to be pre-rendered as loops and tabulars seem to conflict \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}% @@ -186,9 +182,6 @@ \@initializebox{\makeletterdetailsbox}% \if@details% - \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}}% \savebox{\makeletterdetailsbox}{% \addressfont\color{headtext}% \if@left\begin{tabular}[b]{@{}r@{}}\fi% @@ -196,7 +189,6 @@ \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}}% - \phonesdetails% needs to be pre-rendered as loops and tabulars seem to conflict \ifthenelse{\isundefined{\@homepage}}{}{\makenewline\homepagesymbol\httplink{\@homepage}}% \ifthenelse{\isundefined{\@extrainfo}}{}{\makenewline\@extrainfo}% \end{tabular}% diff --git a/moderncviconsacademic.sty b/moderncviconsacademic.sty index f00941c..86a1484 100644 --- a/moderncviconsacademic.sty +++ b/moderncviconsacademic.sty @@ -38,9 +38,9 @@ %\newcommand*{\listitemsymbol} {\labelitemi~} %\newcommand*{\addresssymbol} {} %\newcommand*{\bornsymbol} {} -%\newcommand*{\mobilephonesymbol} {} -%\newcommand*{\fixedphonesymbol} {} -%\newcommand*{\faxphonesymbol} {} +%\newcommand*{\mobilephonesocialsymbol} {} +%\newcommand*{\fixedphonesocialsymbol} {} +%\newcommand*{\faxphonesocialsymbol} {} %\newcommand*{\emailsocialsymbol} {} %\newcommand*{\homepagesymbol} {} %\newcommand*{\linkedinsocialsymbol} {} diff --git a/moderncviconsawesome.sty b/moderncviconsawesome.sty index caaf3ef..a2fd58c 100644 --- a/moderncviconsawesome.sty +++ b/moderncviconsawesome.sty @@ -66,9 +66,9 @@ %\renewcommand*{\addresssymbol} {} -\renewcommand*{\mobilephonesymbol} {{\color{mobilephone}\small\faMobile*}~} % alternative: \faMobile (solid style) -\renewcommand*{\fixedphonesymbol} {{\color{fixedphone}\small\faPhone*}~} % alternative: \faPhone (reversed) -\renewcommand*{\faxphonesymbol} {{\color{faxphone}\small\faFax}~} % alternative: \faPrint +\renewcommand*{\mobilephonesocialsymbol} {{\color{mobilephone}\small\faMobile*}~} % alternative: \faMobile (solid style) +\renewcommand*{\fixedphonesocialsymbol} {{\color{fixedphone}\small\faPhone*}~} % alternative: \faPhone (reversed) +\renewcommand*{\faxphonesocialsymbol} {{\color{faxphone}\small\faFax}~} % alternative: \faPrint \renewcommand*{\emailsocialsymbol} {{\color{email}\small\faEnvelope[regular]}~} % alternative: \faInbox, \faEnvelope (solid style) \renewcommand*{\homepagesymbol} {{\color{homepage}\small\faGlobeAmericas}~} % alternative: \faHome, \faGlobe, \faGlobeEurope, \faGlobeAfrica, \faGlobeAsia \renewcommand*{\linkedinsocialsymbol} {{\color{linkedin}\small\faLinkedinIn}~} % alternative: \faLinkedin diff --git a/moderncviconsletters.sty b/moderncviconsletters.sty index 1bed64d..87e6678 100644 --- a/moderncviconsletters.sty +++ b/moderncviconsletters.sty @@ -23,9 +23,9 @@ %\renewcommand*{\labelitemiv} {\labelitemiii} % no change from default in moderncv.cls \renewcommand*{\addresssymbol} {} -\renewcommand*{\mobilephonesymbol} {\textbf{M}~} -\renewcommand*{\fixedphonesymbol} {\textbf{T}~} -\renewcommand*{\faxphonesymbol} {\textbf{F}~} +\renewcommand*{\mobilephonesocialsymbol} {\textbf{M}~} +\renewcommand*{\fixedphonesocialsymbol} {\textbf{T}~} +\renewcommand*{\faxphonesocialsymbol} {\textbf{F}~} \renewcommand*{\emailsocialsymbol} {\textbf{E}~} \renewcommand*{\homepagesymbol} {\textbf{W}~} \renewcommand*{\linkedinsocialsymbol} {\textbf{in}~} diff --git a/moderncviconsmarvosym.sty b/moderncviconsmarvosym.sty index c560660..bdaa241 100644 --- a/moderncviconsmarvosym.sty +++ b/moderncviconsmarvosym.sty @@ -19,9 +19,9 @@ \renewcommand*{\labelitemi} {\strut\textcolor{color1}{\marvosymbol{123}}} % equivalent to \Neutral from marvosym package; alternative: \fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102} -\renewcommand*{\mobilephonesymbol} {\marvosymbol{72}~} -\renewcommand*{\fixedphonesymbol} {\marvosymbol{84}~} -\renewcommand*{\faxphonesymbol} {\marvosymbol{117}~} +\renewcommand*{\mobilephonesocialsymbol}{\marvosymbol{72}~} +\renewcommand*{\fixedphonesocialsymbol}{\marvosymbol{84}~} +\renewcommand*{\faxphonesocialsymbol}{\marvosymbol{117}~} \renewcommand*{\emailsocialsymbol} {\marvosymbol{66}~} \renewcommand*{\homepagesymbol} {{\Large\marvosymbol{205}}~}