From c6dd4805eb3789701aed68b6ba8f2d05bf4e4a7d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 Jan 2012 00:06:31 +0000 Subject: moderncv 0.17 (25jan12) git-svn-id: svn://tug.org/texlive/trunk@25203 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 10 ++-- .../tex/latex/moderncv/moderncvcolorblack.sty | 2 +- .../tex/latex/moderncv/moderncvcolorblue.sty | 2 +- .../tex/latex/moderncv/moderncvcolorgreen.sty | 2 +- .../tex/latex/moderncv/moderncvcolorgrey.sty | 2 +- .../tex/latex/moderncv/moderncvcolororange.sty | 2 +- .../tex/latex/moderncv/moderncvcolorpurple.sty | 2 +- .../tex/latex/moderncv/moderncvcolorred.sty | 2 +- .../tex/latex/moderncv/moderncvcompatibility.sty | 2 +- .../tex/latex/moderncv/moderncvstylecasual.sty | 64 +++++++++++++++------- .../tex/latex/moderncv/moderncvstyleclassic.sty | 18 +++--- .../tex/latex/moderncv/moderncvstyleempty.sty | 2 +- .../tex/latex/moderncv/moderncvstyleoldstyle.sty | 25 +++++---- 13 files changed, 80 insertions(+), 55 deletions(-) (limited to 'Master/texmf-dist/tex/latex/moderncv') diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index cbdcfc04606..cf19a0457a9 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{moderncv}[2012/01/15 v0.16 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2012/01/25 v0.17 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -99,7 +99,7 @@ % hyper links \RequirePackage{url} \urlstyle{tt} -% load hyperred at the end of the preamble to pass options required by loaded packages (like CJK) +% load hyperref at the end of the preamble to pass options required by loaded packages (like CJK) \AtEndPreamble{ \@ifpackageloaded{CJK} {\RequirePackage[unicode]{hyperref}} @@ -313,9 +313,11 @@ \AtBeginDocument{% \if@displaypagenumbers% \@ifundefined{r@lastpage}{}{% - \ifthenelse{\pageref{lastpage} > 1}{% + \ifthenelse{\pageref{lastpage}>1}{% + \newlength{\pagenumberwidth}% + \settowidth{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}% \fancypagestyle{plain}{% - \fancyfoot[r]{\addressfont\color{color2}\footnotesize\thepage/\pageref{lastpage}}}% + \fancyfoot[r]{\parbox{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}}}% the parbox is required to ensure alignment with a possible center footer (e.g., as in the casual style) \pagestyle{plain}}{}}% \AtEndDocument{\label{lastpage}}\else\fi}} diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty index 2fd270605bb..3ea0481f9e2 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorblack}[2012/01/15 v0.16 modern curriculum vitae color scheme: black] +\ProvidesPackage{moderncvcolorblack}[2012/01/25 v0.17 modern curriculum vitae color scheme: black] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty index c7107f066ba..2f5e62a41ac 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorblue}[2012/01/15 v0.16 modern curriculum vitae color scheme: blue] +\ProvidesPackage{moderncvcolorblue}[2012/01/25 v0.17 modern curriculum vitae color scheme: blue] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty index a33c4a9d837..0dce84a1ded 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorgreen}[2012/01/15 v0.16 modern curriculum vitae color scheme: green] +\ProvidesPackage{moderncvcolorgreen}[2012/01/25 v0.17 modern curriculum vitae color scheme: green] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty index 8403d457ba5..a079fc66c02 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorgrey}[2012/01/15 v0.16 modern curriculum vitae color scheme: grey] +\ProvidesPackage{moderncvcolorgrey}[2012/01/25 v0.17 modern curriculum vitae color scheme: grey] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty index 181af4419ce..3fa87323507 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolororange}[2012/01/15 v0.16 modern curriculum vitae color scheme: orange] +\ProvidesPackage{moderncvcolororange}[2012/01/25 v0.17 modern curriculum vitae color scheme: orange] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty index 65fb8290eeb..cfbdc212e8c 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorpurple}[2012/01/15 v0.16 modern curriculum vitae color scheme: purple] +\ProvidesPackage{moderncvcolorpurple}[2012/01/25 v0.17 modern curriculum vitae color scheme: purple] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty index 2874efbc6c4..5edc0f9714a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorred}[2012/01/15 v0.16 modern curriculum vitae color scheme: red] +\ProvidesPackage{moderncvcolorred}[2012/01/25 v0.17 modern curriculum vitae color scheme: red] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index c05d480b6ce..62bba4bb64f 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcompatibility}[2012/01/15 v0.16 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2012/01/25 v0.17 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty index 09d33f199b6..aa4dc60a994 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/01/15 v0.16 modern curriculum vitae style scheme: casual] +\ProvidesPackage{moderncvstylecasual}[2012/01/25 v0.17 modern curriculum vitae style scheme: casual] %------------------------------------------------------------------------------- @@ -32,28 +32,47 @@ \renewcommand*{\addressfont}{\small\mdseries\slshape} % cv footer -\newif\if@firstfooterelement\@firstfooterelementtrue +% footer symbol used to separate footer elements \newcommand*{\footersymbol}{% - \if@firstfooterelement% + {~~~\textbullet~~~}}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :( +% internal command to add an element to the footer +% it collects the elements in a temporary box, and checks when to flush the box +\newsavebox{\footertempabox}% +\newsavebox{\footertempbbox}% +\newlength{\footerwidth}% +\newlength{\footerboxwidth}% +% adds an element to the footer, separated by footersymbol +% usage: \addtofooter[footersymbol]{element} +\newcommand*{\addtofooter}[2][\footersymbol]{% + \savebox{\footertempbbox}{\usebox{\footertempabox}#1#2}% + \settowidth{\footerboxwidth}{\usebox{\footertempbbox}}% + \ifnum\footerboxwidth<\footerwidth% + \savebox{\footertempabox}{\usebox{\footertempbbox}} \else% - { ~~\color{color2}\textbullet~~~}\fi\@firstfooterelementfalse}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :( + \flushfooter{}\\% + \savebox{\footertempabox}{#2}% + \savebox{\footertempbbox}{#2}\fi} +% internal command to flush the footer +\newcommand*{\flushfooter}{% + \strut\usebox{\footertempabox}% + \savebox{\footertempabox}{}% + \savebox{\footertempbbox}{}} \renewcommand*{\makefooter}{% + \setlength{\footerwidth}{0.8\textwidth}% \fancypagestyle{plain}{% \fancyfoot[c]{% - \parbox{0.8\textwidth}{% - \centering% - \addressfont\color{color2}% - \ifthenelse{\isundefined{\@addressstreet}}{}{% - \addresssymbol\@addressstreet% - \@firstfooterelementfalse% - \ifthenelse{\isundefined{\@addresscity}}{}{~--~\@addresscity}\\\@firstfooterelementtrue}% - \ifthenelse{\isundefined{\@mobile}}{}{\footersymbol\mobilesymbol\@mobile\@firstfooterelementfalse}% - \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\phonesymbol\@phone\@firstfooterelementfalse}% - \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\faxsymbol\@fax\@firstfooterelementfalse}% - \ifthenelse{\isundefined{\@email}}{}{\footersymbol\emailsymbol\emaillink{\@email}\@firstfooterelementfalse}% - \ifthenelse{\isundefined{\@homepage}}{}{\footersymbol\homepagesymbol\httplink{\@homepage}\@firstfooterelementfalse}% - \ifthenelse{\isundefined{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}% - }% + \parbox{\footerwidth}{% + \centering% + \color{color2}\addressfont% + \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}% + \ifthenelse{\isundefined{\@addresscity}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter}% + \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}}}% + \ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}% + \ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}% + \flushfooter}}}% \pagestyle{plain}} % maketitle @@ -70,12 +89,15 @@ {\color{color1}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}}% \usebox{\maketitlepicturebox}% \newlength{\maketitlepicturewidth}\settowidth{\maketitlepicturewidth}{\usebox{\maketitlepicturebox}}% - \parbox[b]{\textwidth-\maketitlepicturewidth}{\raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@familyname}}\\[-.35em]% alternate design: \MakeLowercase and no space - {\color{color2!50}\rule{\textwidth}{.25ex}\\[2.5em]}% + \parbox[b]{\textwidth-\maketitlepicturewidth}{% + \raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@familyname}}\\[-.35em]% alternate design: \MakeLowercase and no space + {\color{color2!50}\rule{\textwidth}{.25ex}}% +% optional title + \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\raggedleft\titlestyle{\@title}}\\[2.5em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% - {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}% + {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}% \par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty index 7317ef032d8..359f9904d8a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleclassic}[2012/01/15 v0.16 modern curriculum vitae style scheme: classic] +\ProvidesPackage{moderncvstyleclassic}[2012/01/25 v0.17 modern curriculum vitae style scheme: classic] %------------------------------------------------------------------------------- @@ -36,13 +36,13 @@ \renewcommand*{\hintfont}{} % styles -\newcommand*{\namestyle}[1]{{\namefont\color{color0}#1}} -\newcommand*{\titlestyle}[1]{{\titlefont\color{color2}#1}} -\newcommand*{\addressstyle}[1]{{\addressfont\color{color1}#1}} -\newcommand*{\quotestyle}[1]{{\quotefont\color{color1}#1}} -\newcommand*{\sectionstyle}[1]{{\sectionfont\color{color1}#1}} -\newcommand*{\subsectionstyle}[1]{{\subsectionfont\color{color1}#1}} -\newcommand*{\hintstyle}[1]{{\hintfont\color{color0}#1}} +\newcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#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}}} % length used \newlength{\quotewidth} @@ -118,7 +118,7 @@ % detailed information \usebox{\maketitledetailsbox}% % optional photo - \usebox{\maketitlepicturebox}\\[3em]% + \usebox{\maketitlepicturebox}\\[2.5em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty index 8c7a35ad306..84bfb70e767 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleempty}[2012/01/15 v0.16 modern curriculum vitae scheme: empty] +\ProvidesPackage{moderncvstyleempty}[2012/01/25 v0.17 modern curriculum vitae scheme: empty] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty index 8b374e07a62..6ce1bc052c5 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleoldstyle}[2012/01/15 v0.16 modern curriculum vitae style: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2012/01/25 v0.17 modern curriculum vitae style: oldstyle] %------------------------------------------------------------------------------- @@ -39,13 +39,13 @@ \renewcommand*{\hintfont}{\bfseries} % styles -\newcommand*{\namestyle}[1]{{\namefont\color{color0}#1}} -\newcommand*{\titlestyle}[1]{{\titlefont\color{color2}#1}} -\newcommand*{\addressstyle}[1]{{\addressfont\color{color2}#1}} -\newcommand*{\quotestyle}[1]{{\quotefont\color{color1}#1}} -\newcommand*{\sectionstyle}[1]{{\sectionfont\color{color1}#1}} -\newcommand*{\subsectionstyle}[1]{{\subsectionfont\color{color1}#1}} -\newcommand*{\hintstyle}[1]{{\hintfont\color{color0}#1}} +\newcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}} +\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}} +\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#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}}} % symbols \renewcommand*{\listitemsymbol}{\labelitemi~} @@ -122,7 +122,7 @@ \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% % optional photo - \usebox{\maketitlepicturebox}\\[3em]% + \usebox{\maketitlepicturebox}\\[2.5em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% @@ -174,7 +174,7 @@ \newlength{\cventrytitleboxwidth} \renewcommand*{\cventry}[7][.25em]{% \savebox{\cventryyearbox}{% - \hspace*{\separatorcolumnwidth}% + \hspace*{2\separatorcolumnwidth}% {\hintfont#2}}% \setlength{\cventrytitleboxwidth}{\widthof{\usebox{\cventryyearbox}}}% \setlength{\cventrytitleboxwidth}{\maincolumnwidth-\cventrytitleboxwidth}% @@ -186,10 +186,11 @@ \ifthenelse{\equal{#6}{}}{}{, #6}% .}% \usebox{\cventryyearbox}% - \ifx&% + \end{minipage}% + \ifx&% \else{% \newline{}\begin{minipage}[t]{\maincolumnwidth}\small#7\end{minipage}}\fi% - \end{minipage}\\[#1]} + \\[#1]} \newbox{\cvitemwithcommentmainbox} -- cgit v1.2.3