Added a 3rd argument to \address to specify a country

CHANGELOG

@@ -1,3 +1,8 @@
+version 1.3.0 (xx xxx 201x)
+ - added a 3rd, fully optional (can be omitted or left blank) argument to
+ \address to specify a country, as requested on launchpad (launchpad bug
+ #1063995).
+
 version 1.2.1 (04 Dec 2012)
  - fixed a regression bug introduced in version 1.2.0 in the header of the
  "banking" style when no title is used, as reported on tex.stackexchange

examples/template.tex

@@ -27,7 +27,7 @@
 \firstname{John}
 \familyname{Doe}
 \title{Resumé title}                               % optional, remove / comment the line if not wanted
-\address{street and number}{postcode city}    % optional, remove / comment the line if not wanted
+\address{street and number}{postcode city}{country}% optional, remove / comment the line if not wanted; the "postcode city" and and "country" arguments can be omitted or provided empty
 \mobile{+1~(234)~567~890}                          % optional, remove / comment the line if not wanted
 \phone{+2~(345)~678~901}                           % optional, remove / comment the line if not wanted
 \fax{+3~(456)~789~012}                             % optional, remove / comment the line if not wanted
@@ -103,14 +103,14 @@ Detailed achievements:%
 \section{Extra 1}
 \cvlistitem{Item 1}
 \cvlistitem{Item 2}
-\cvlistitem{Item 3}
+\cvlistitem{Item 3. This item is particularly long and therefore normally spans over several lines. Did you notice the indentation when the line wraps?}
 
 \renewcommand{\listitemsymbol}{-~}                 % change the symbol for lists
 
 \section{Extra 2}
 \cvlistdoubleitem{Item 1}{Item 4}
 \cvlistdoubleitem{Item 2}{Item 5\cite{book1}}
-\cvlistdoubleitem{Item 3}{}
+\cvlistdoubleitem{Item 3}{Item 6. Like item 3 in the single column list before, this item is particularly long to wrap over several lines.}
 
 % Publications from a BibTeX file without multibib
 %  for numerical labels: \renewcommand{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}

moderncv.cls

@@ -129,7 +129,7 @@
     breaklinks,
     baseurl       = http://,
     pdfborder     = 0 0 0,
-    pdfpagemode   = UseNone,% do not show thumbnails or bookmarks on opening
+    pdfpagemode   = UseNone,
     pdfstartpage  = 1,
     pdfcreator    = {\LaTeX{} with 'moderncv' package},
 %    pdfproducer   = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used
@@ -169,7 +169,7 @@
 \RequirePackage{calc}
 
 % advanced command arguments (LaTeX 3)
-\RequirePackage{xargs}
+\RequirePackage{xargs,xparse}
 % TODO (?): replace all \newcommand by \NewDocumentCommand
 
 % micro-typography (e.g., character protrusion, font expansion, hyphenatable letterspacing)
@@ -208,15 +208,37 @@
 %                overall design commands definitions
 %-------------------------------------------------------------------------------
 % elements
+% defines one's first name
+% usage: \firstname{<firstname>}
 \newcommand*{\firstname}[1]{\def\@firstname{#1}}
+% defines one's family name
+% usage: \familyname{<familyname>}
 \newcommand*{\familyname}[1]{\def\@familyname{#1}}
+% defines one's title (optional)
+% usage: \title{<title>}
 \renewcommand*{\title}[1]{\def\@title{#1}}
-\newcommand*{\address}[2]{\def\@addressstreet{#1}\def\@addresscity{#2}}
+% defines one's address (optional)
+% usage: \address{<street>}{<city>}{<country>}
+% where the <city> and <country> arguments can be omitted or provided empty
+\NewDocumentCommand{\address}{mG{}G{}}{\def\@addressstreet{#1}\def\@addresscity{#2}\def\@addresscountry{#3}}
+% defines one's mobile phone number (optional)
+% usage: \mobile{<number>}
 \newcommand*{\mobile}[1]{\def\@mobile{#1}}
+% defines one's fixed phone number (optional)
+% usage: \phone{<number>}
 \newcommand*{\phone}[1]{\def\@phone{#1}}
+% defines one's fax number (optional)
+% usage: \fax{<number>}
 \newcommand*{\fax}[1]{\def\@fax{#1}}
+% defines one's email address (optional)
+% usage: \email{<email>}
 \newcommand*{\email}[1]{\def\@email{#1}}
+% defines one's home page (optional)
+% usage: \homepage{<url>}
 \newcommand*{\homepage}[1]{\def\@homepage{#1}}
+% defines additional personal information (optional)
+% usage: \extrainfo{<text>}
+\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
 
 % colors
 \definecolor{color0}{rgb}{0,0,0}% main default color, normally left to black
@@ -276,7 +298,6 @@
 %                resume design commands definitions
 %-------------------------------------------------------------------------------
 % elements
-\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
 \newcommandx*{\photo}[3][1=64pt,2=0.4pt,usedefault]{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}% the 1st (optional) argument is the width of the photo, the 2nd (optional) argument is the thickness of the frame around it.
 \newcommand*{\quote}[1]{\def\@quote{#1}}
 

moderncvstylebanking.sty

@@ -93,7 +93,9 @@
     % detailed information
     \addressfont\color{color2}%
     \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle{\addresssymbol\@addressstreet}%
-      \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle\@firstmaketitleelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+      \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}}%

moderncvstylecasual.sty

@@ -109,7 +109,9 @@
         \centering%
         \color{color2}\addressfont%
         \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
-          \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+          \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}}%
@@ -157,7 +159,9 @@
         \vspace{-\baselineskip}% to cancel out the extra vertical space taken by the name (below) and ensure perfect alignment of letter and cv footers
         \strut{\bfseries\upshape\@firstname~\@familyname}\\% the \strut is required to ensure the line is exactly \baselineskip tall
         \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
-          \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+          \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}}%

moderncvstyleclassic.sty

@@ -109,7 +109,8 @@
     \addressfont\color{color2}%
     \begin{tabular}[b]{@{}r@{}}%
       \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
-        \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+        \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}%
@@ -261,7 +262,8 @@
     \addressfont\textcolor{color2}{%
       {\bfseries\upshape\@firstname~\@familyname}\@firstdetailselementfalse%
       \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
-        \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}%
+        \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}%

moderncvstyleoldstyle.sty

@@ -151,7 +151,8 @@
   \makecvinfo{%
     \addressfont\color{color2}%
     \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
-      \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+      \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}%
@@ -291,7 +292,8 @@
     \addressfont\textcolor{color2}{%
       {\bfseries\@firstname~\@familyname}\@firstdetailselementfalse%
       \ifthenelse{\isundefined{\@addressstreet}}{}{\makenewline\addresssymbol\@addressstreet%
-        \ifthenelse{\equal{\@addresscity}{}}{}{\makenewline\@addresscity}}%
+        \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}%