From 4bce3b94bd04b49c445367eb9d2428d691d41adb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Feb 2013 23:12:46 +0000 Subject: moderncv (10feb13) git-svn-id: svn://tug.org/texlive/trunk@29074 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty') diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty index ed7b2be1231..1da3078867b 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleclassic.sty'. -%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2013 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleclassic}[2012/12/04 v1.2.1 modern curriculum vitae and letter style scheme: classic] +\ProvidesPackage{moderncvstyleclassic}[2013/02/09 v1.3.0 modern curriculum vitae and letter style scheme: classic] %------------------------------------------------------------------------------- @@ -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}% -- cgit v1.2.3