Corrected a bug in \maketitle of the "banking" style

This commit is contained in:
Xavier Danaux
2012-10-09 03:07:25 -04:00
parent b497d7dbfe
commit 1c59c8feb6

View File

@ -58,22 +58,30 @@
\newsavebox{\maketitletempbox}% \newsavebox{\maketitletempbox}%
\newlength{\maketitlewidth}% \newlength{\maketitlewidth}%
\newlength{\maketitleboxwidth}% \newlength{\maketitleboxwidth}%
\newif\if@firstmaketitleelement\@firstmaketitleelementtrue%
% adds an element to the maketitle, separated by maketitlesymbol % adds an element to the maketitle, separated by maketitlesymbol
% usage: \addtomaketitle[maketitlesymbol]{element} % usage: \addtomaketitle[maketitlesymbol]{element}
\newcommand*{\addtomaketitle}[2][\maketitlesymbol]{% \newcommand*{\addtomaketitle}[2][\maketitlesymbol]{%
\savebox{\maketitletempbox}{\usebox{\maketitlebox}#1#2}% \if@firstmaketitleelement%
\savebox{\maketitletempbox}{\usebox{\maketitlebox}#2}%
\else%
\savebox{\maketitletempbox}{\usebox{\maketitlebox}#1#2}\fi%
\settowidth{\maketitleboxwidth}{\usebox{\maketitletempbox}}% \settowidth{\maketitleboxwidth}{\usebox{\maketitletempbox}}%
\ifnum\maketitleboxwidth<\maketitlewidth% \ifnum\maketitleboxwidth<\maketitlewidth%
\savebox{\maketitlebox}{\usebox{\maketitletempbox}} \savebox{\maketitlebox}{\usebox{\maketitletempbox}}%
\@firstmaketitleelementfalse%
\else% \else%
\flushmaketitle{}\\% \flushmaketitle{}\\%
\savebox{\maketitlebox}{#2}% \savebox{\maketitlebox}{#2}%
\savebox{\maketitletempbox}{#2}\fi} \savebox{\maketitletempbox}{#2}%
\settowidth{\maketitleboxwidth}{\usebox{\maketitlebox}}%
\@firstmaketitleelementfalse\fi}
% internal command to flush the maketitle % internal command to flush the maketitle
\newcommand*{\flushmaketitle}{% \newcommand*{\flushmaketitle}{%
\strut\usebox{\maketitlebox}% \strut\usebox{\maketitlebox}%
\savebox{\maketitlebox}{}% \savebox{\maketitlebox}{}%
\savebox{\maketitletempbox}{}} \savebox{\maketitletempbox}{}%
\setlength{\maketitleboxwidth}{0pt}}
\renewcommand*{\maketitle}{% \renewcommand*{\maketitle}{%
\setlength{\maketitlewidth}{0.8\textwidth}% \setlength{\maketitlewidth}{0.8\textwidth}%
\hfil% \hfil%
@ -83,9 +91,9 @@
\namestyle{\@firstname~\@familyname}\\% \namestyle{\@firstname~\@familyname}\\%
% detailed information % detailed information
\addressfont\color{color2}% \addressfont\color{color2}%
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle[]{\addresssymbol\@addressstreet}% \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle{\addresssymbol\@addressstreet}%
\ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}% if \addresstreet is defined, \addresscity will always be defined but could be empty \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle\@firstmaketitleelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
\ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle[]{\mobilesymbol\@mobile}}% \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle{\mobilesymbol\@mobile}}%
\ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}% \ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}%
\ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}% \ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}%
\ifthenelse{\isundefined{\@email}}{}{\addtomaketitle{\emailsymbol\emaillink{\@email}}}% \ifthenelse{\isundefined{\@email}}{}{\addtomaketitle{\emailsymbol\emaillink{\@email}}}%