From d208ee0327fbc243f2b28db670e0e1f3e0805bf5 Mon Sep 17 00:00:00 2001
From: Xavier Danaux <xdanaux@gmail.com>
Date: Wed, 13 Mar 2013 03:31:01 -0400
Subject: [PATCH] Enabled multiple phone numbers per type through the use of
 collections

---
 examples/template-es.pdf            | Bin 171988 -> 171988 bytes
 examples/template-zh.pdf            | Bin 241627 -> 241627 bytes
 examples/template.pdf               | Bin 235045 -> 235045 bytes
 examples/template_banking_red.pdf   | Bin 169202 -> 169202 bytes
 examples/template_casual_orange.pdf | Bin 235052 -> 235052 bytes
 examples/template_classic_green.pdf | Bin 279245 -> 279245 bytes
 examples/template_multibib.pdf      | Bin 235582 -> 235582 bytes
 examples/template_oldstyle_grey.pdf | Bin 70640 -> 70640 bytes
 moderncv.cls                        |   6 +++---
 moderncvcompatibility.sty           |   3 +++
 moderncvstylebanking.sty            |  11 +++++------
 moderncvstylecasual.sty             |  10 ++++------
 moderncvstyleclassic.sty            |  22 +++++++++++-----------
 moderncvstyleoldstyle.sty           |  16 +++++++---------
 14 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index 387c6110a6f44c95f55328729e134146b127e058..5b9bcd26bcb7aa3930e8616961d513fb33e3e84a 100644
GIT binary patch
delta 140
zcmcbzpX<tgu7(!IEleNg=o=dv8yFi|8XD^wn5Y{VsB3cR`{t*(B$lKqXt-Dz8Gxjb
zluVbO%k;z9+}PaGz{%Xe+{n_x(b>t-)!D?{&DhY;+04zw)y&wyPQiwdlI>CRn5q~7
Dx<w?b

delta 140
zcmcbzpX<tgu7(!IEleNg=o=Xs8Cn_|o0#hwn5r8XsB3cR`{t*(B$lKqXt-Dz85kNH
zAS;<JKbPr;vzwWVrID+-v$2zli-oa^fuV(~p{b>_o3o3BlZ%C^vz>wsAtl?R<}p<<
F0sz`7B~<_b

diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index 0406a9a4ca3e0a1968dd06dd7c15c4cb497b00e6..4f67f25b6743b2fdbfe5c7e5ef42f8a8c2ea5b4f 100644
GIT binary patch
delta 143
zcmcb8pYQg4zJ?aY7N#xC;w$ux4UG+qjVujKbPY_@4Gh#Zx%7SWQ(O{DQWZ2@tc(mm
z(nw0SyRBee#q8|pWNPkaX>4lZVrpsVWa(<?V(4aUWNc(&=w@naVQOTjU_(gBcH=e7
GE0_V{l_Z4#

delta 143
zcmcb8pYQg4zJ?aY7N#xC;w$uxjEoE|4UJ7Kbq!3_4Gh#Zx%7SWQ(O{DQWZ2@tc(l{
zjSY~MY<FA1yo%Y`)zHG#)X>t{#l_Lgz}48qz}(o(%^8Rd%q?8Z49x8mYzQgYZoGzh
G1v3EZU?jHy

diff --git a/examples/template.pdf b/examples/template.pdf
index 90db04a91fa1c379f80e29f4cf2976b5de592648..fb85acccd12cce4ebedbc690073a1dd6da1e9666 100644
GIT binary patch
delta 143
zcmZ3whHvQ_zJ?aY7N#xCYrFN04UG+qjVuiebPY_@4Gh#Zx%7SWQ(O{DQWZ2@tc(mm
z(nw0S-|1$4!|rTpU}$D!<Y-}FWMOG(VqoUz>}cW!RB7RAY3yof>}scALrBSX?kUVt
FOaRU&BjNx6

delta 143
zcmZ3whHvQ_zJ?aY7N#xCYrFN0jEoE|4ULUWbq!3_4Gh#Zx%7SWQ(O{DQWZ2@tc(l{
zjSY~MY`@dZ{D$4x)zQht#M#`%)yc`o0*H+*T#O9OTn)|4olFf4ES&8WYzQgY&OL=$
GiU|M#CM3Q9

diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf
index 25c9bb485915bbc5593c740e45a7a0a94682c902..1b54f2586cbb742553643cd61deae1cebf310c8a 100644
GIT binary patch
delta 141
zcmeyglIzn-u7(!IElk{f`o@OF2F6B~hK9NZCh7(T>Y7~ozWFIGi6yBD8ZK5w1|Vr9
zCEKm~m{zbj8ycCr8d{i|n!C9eo4A-7nmZXdnVOjxxHvgkx>-6I+9}u&QnFojGSgW`
E07*L|lK=n!

delta 141
zcmeyglIzn-u7(!IElk{f`bI`ZhL(oLCZ@Uurs@U;>Y7~ozWFIGi6yBD8ZK5w28PB4
z$V#?b^)anradtE@bTl<Hb1|_nb2T<HFf}wXaxpV@bTTtAF>o`nG`3T)A*5ux>SU&~
Fi~vAQBO?F+

diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index a163430a6e2d1e9746bf1a5345861a22f5a0db5c..8967f3e06adaa8671e1b38e926b44afd63231c8c 100644
GIT binary patch
delta 126
zcmZ3phHuRpzJ?aY7N#xCTf2FT4UG+qjVuj}bPY_VAM9opM-kcnq?`E-yR)N(nURr^
qo0Ex)rLmK%o27+`iHnJWg|UT+tE;7xg{7T>4Iw4lg{Lq}G64YS8zCV8

delta 126
zcmZ3phHuRpzJ?aY7N#xCTf2FTjEoE|4ULV>bq!3XAM9opM-kcnq?`E-yR(zCp@q4r
qk)xZLlbflrk(;BNlasNLv9XJzrJ0kZqp_WW4Iw4lg{Lq}G64YigCT7I

diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf
index ae5a4ea20bdb959a4b9c20740681ff07bf929c69..e510f51677d1dfd9e6dff8efbb9e1058b5feb57a 100644
GIT binary patch
delta 145
zcmX@xDtNY4u%U&qg{g&k3ro9&zOkXPfw7ULfr+kxiMoM-x+a&tZ+?nPVo9okhKrSv
z0Z1B2$@Xm)Ea%vrElphAOe_suU0i`$oeiALU7Sn|&5cbAO&y(`T-*%o6l@47*?!!C
Hg^dXS-zp?{

delta 145
zcmX@xDtNY4u%U&qg{g&k3ro9&zLAlUp{1d*v4yUIsk(uIx+a&tZ+?nPVo9okhKrSv
zfuXShvXbrFELhI5I~$q0S(=$zxHuU&8k?CJ8M_);Ivbc989AF789KQcIoT=L5K^-J
JxC09t69CVUBm@8e

diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf
index 2bb1e275ee0569c2d711e77bf6ff79a01cc04ef7..ee6b9a1824cf12d88519ddc40d0d13f4635e386e 100644
GIT binary patch
delta 143
zcmdnDfp6aizJ?aY7N#xC0X_Q0hQ<cQMwW(Vx&|id1_tVyT>8HGDK3d6sR|k{Rz?OO
zX(T1v>wB1kIGvr%Esb4_4J=IDjGYWzoGe{j3|)+zog7U~%$%JpOpWXmYzQgYE;5Z-
GiwOXoJR_|D

delta 143
zcmdnDfp6aizJ?aY7N#xC0X_OgMn;B~hQ_9bx(24|1_tVyT>8HGDK3d6sR|k{Rz?Pf
z#s<hrw%7MC2XQ)ESeQE+nmC%d85o%xn3);4SX!C`g`6x5jV&E5Or7l%YzQgYE;5Z-
GiwOXPrXw8y

diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf
index ea16047f5599ef149f4b988c096eb643aac30211..abdbd306084f15fb42548fe1f636038ca9fca2af 100644
GIT binary patch
delta 121
zcmeycoaMuEmWC~i7kPP%4UG+qjVui;bPY_V-{oZ#M-kb^$M}lb+1bt9$i>aX(A3b}
kz|Gmf($T=k(9zu7(8<uq$k^G{#7@D6kdp1XLX3wQ0lldnH2?qr

delta 121
zcmeycoaMuEmWC~i7kPP%jEoE|4UJ8Vbq!3X-{oZ#M-kb^$M}lb+11(D%*oi*%+$rz
k+`z=p#o55v$im3b)zQ${(#*}m*iONQkdp1XLX3wQ0mDZgR{#J2

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}}}%