summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-06 23:36:45 +0000
committerKarl Berry <karl@freefriends.org>2012-02-06 23:36:45 +0000
commita75f7e798d1c5d31c4bcb89338923f0120ccc6df (patch)
tree08781946fa861b70b58e3e8d7d8d7d510a24af98 /Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
parent28d6df0334340cc773572c1c4897bdc640d5423a (diff)
moderncv 0.19 (6feb12)
git-svn-id: svn://tug.org/texlive/trunk@25319 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty')
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty18
1 files changed, 12 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
index 5dd5ae6b063..e4d6a617545 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylecasual}[2012/02/05 v0.18 modern curriculum vitae style scheme: casual]
+\ProvidesPackage{moderncvstylecasual}[2012/02/06 v0.19 modern curriculum vitae style scheme: casual]
%-------------------------------------------------------------------------------
@@ -41,17 +41,23 @@
\newsavebox{\footertempbox}%
\newlength{\footerwidth}%
\newlength{\footerboxwidth}%
+\newif\if@firstfooterelement\@firstfooterelementtrue%
% adds an element to the footer, separated by footersymbol
% usage: \addtofooter[footersymbol]{element}
\newcommand*{\addtofooter}[2][\footersymbol]{%
- \savebox{\footertempbox}{\usebox{\footerbox}#1#2}%
+ \if@firstfooterelement%
+ \savebox{\footertempbox}{\usebox{\footerbox}#2}%
+ \else%
+ \savebox{\footertempbox}{\usebox{\footerbox}#1#2}\fi%
\settowidth{\footerboxwidth}{\usebox{\footertempbox}}%
\ifnum\footerboxwidth<\footerwidth%
- \savebox{\footerbox}{\usebox{\footertempbox}}
+ \savebox{\footerbox}{\usebox{\footertempbox}}%
+ \@firstfooterelementfalse%
\else%
\flushfooter{}\\%
\savebox{\footerbox}{#2}%
- \savebox{\footertempbox}{#2}\fi}
+ \savebox{\footertempbox}{#2}%
+ \@firstfooterelementfalse\fi}
% internal command to flush the footer
\newcommand*{\flushfooter}{%
\strut\usebox{\footerbox}%
@@ -65,8 +71,8 @@
\centering%
\color{color2}\addressfont%
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
- \ifthenelse{\isundefined{\@addresscity}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter}%
- \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter[]{\mobilesymbol\@mobile}}%
+ \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+ \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}%
\ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}%
\ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}%
\ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}%