summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-10-31 21:45:18 +0000
committerKarl Berry <karl@freefriends.org>2012-10-31 21:45:18 +0000
commit54ba93bf0a6f72847b3981af2e763a8ce60b9d07 (patch)
tree8cc66c2255a088f71e0168365879fe372a57e49a /Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
parent4051c7da97b4e20b82b75d470cedd3cbbffee96b (diff)
moderncv (31oct12)
git-svn-id: svn://tug.org/texlive/trunk@28139 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty')
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty51
1 files changed, 30 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
index 71dd7fab5c8..8494fe26f47 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylebanking}[2012/08/10 v1.1.3 modern curriculum vitae and letter style scheme: banking]
+\ProvidesPackage{moderncvstylebanking}[2012/10/31 v1.2.0 modern curriculum vitae and letter style scheme: banking]
%-------------------------------------------------------------------------------
@@ -58,34 +58,43 @@
\newsavebox{\maketitletempbox}%
\newlength{\maketitlewidth}%
\newlength{\maketitleboxwidth}%
+\newif\if@firstmaketitleelement\@firstmaketitleelementtrue%
% adds an element to the maketitle, separated by maketitlesymbol
% usage: \addtomaketitle[maketitlesymbol]{element}
\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}}%
\ifnum\maketitleboxwidth<\maketitlewidth%
- \savebox{\maketitlebox}{\usebox{\maketitletempbox}}
+ \savebox{\maketitlebox}{\usebox{\maketitletempbox}}%
+ \@firstmaketitleelementfalse%
\else%
\flushmaketitle{}\\%
\savebox{\maketitlebox}{#2}%
- \savebox{\maketitletempbox}{#2}\fi}
+ \savebox{\maketitletempbox}{#2}%
+ \settowidth{\maketitleboxwidth}{\usebox{\maketitlebox}}%
+ \@firstmaketitleelementfalse\fi}
% internal command to flush the maketitle
\newcommand*{\flushmaketitle}{%
\strut\usebox{\maketitlebox}%
\savebox{\maketitlebox}{}%
- \savebox{\maketitletempbox}{}}
+ \savebox{\maketitletempbox}{}%
+ \setlength{\maketitleboxwidth}{0pt}}
\renewcommand*{\maketitle}{%
\setlength{\maketitlewidth}{0.8\textwidth}%
\hfil%
\parbox{\maketitlewidth}{%
\centering%
- % name (title is not visible)
- \namestyle{\@firstname~\@familyname}\\%
+ % name and title
+ \namestyle{\@firstname~\@familyname}%
+ \ifthenelse{\isundefined{\@title}}{}{\titlestyle{~|~\@title}}\\%
% detailed information
\addressfont\color{color2}%
- \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{\isundefined{\@mobile}}{}{\addtomaketitle[]{\mobilesymbol\@mobile}}%
+ \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{\isundefined{\@mobile}}{}{\addtomaketitle{\mobilesymbol\@mobile}}%
\ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}%
\ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}%
\ifthenelse{\isundefined{\@email}}{}{\addtomaketitle{\emailsymbol\emaillink{\@email}}}%
@@ -99,21 +108,21 @@
%-------------------------------------------------------------------------------
% fonts
\renewcommand*{\namefont}{\Huge\bfseries\upshape}
-\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
-\renewcommand*{\addressfont}{\small\mdseries\upshape}
+\renewcommand*{\titlefont}{\Huge\mdseries\upshape}
+\renewcommand*{\addressfont}{\normalsize\mdseries\upshape}
\renewcommand*{\quotefont}{\large\slshape}
\renewcommand*{\sectionfont}{\Large\bfseries\upshape}
\renewcommand*{\subsectionfont}{\large\upshape\fontseries{sb}\selectfont}
\renewcommand*{\hintfont}{\bfseries}
% styles
-\newcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
-\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}}
-\newcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
-\newcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\newcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\newcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
% lengths
\newlength{\quotewidth}
@@ -183,7 +192,7 @@
\par\addvspace{#1}}
\renewcommand*{\cvlistitem}[2][.25em]{%
- \listitemsymbol#2%
+ \listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}%
\par\addvspace{#1}}
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
@@ -263,7 +272,7 @@
% date
\hfill % US style
% \\[1em] % UK style
- \hbox{\today}\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
+ \@date\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
% opening
\raggedright%
\@opening\\[1.5em]%