summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/moderncv
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-06 00:42:34 +0000
committerKarl Berry <karl@freefriends.org>2012-02-06 00:42:34 +0000
commit27d1d1646fa5dc2daba1e09c2d2175c211d93def (patch)
treee7b644fc1c31207cb69662f4278db7d555a63116 /Master/texmf-dist/tex/latex/moderncv
parent4e9750715f219d797d201e091dd0917660b68178 (diff)
moderncv 0.18 (5feb12)
git-svn-id: svn://tug.org/texlive/trunk@25300 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv')
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls19
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty212
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty26
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty36
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty53
14 files changed, 293 insertions, 71 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index cf19a0457a9..f7e73d5e436 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/25 v0.17 modern curriculum vitae document class]
+\ProvidesClass{moderncv}[2012/02/05 v0.18 modern curriculum vitae document class]
%-------------------------------------------------------------------------------
@@ -114,6 +114,7 @@
pdfcreator = \LaTeX{} with `moderncv' package,
pdfproducer = \LaTeX{},
bookmarksopen = true,
+ bookmarksdepth= 2,% to show sections and subsections
pdfauthor = \@firstname~\@familyname,
pdftitle = \@title,
pdfsubject = \@firstname~\@familyname,
@@ -175,11 +176,11 @@
% design commands definitions
%-------------------------------------------------------------------------------
% symbols
-% itemize labels
-\newcommand*{\labelitemi}{\textcolor{color1}{\Neutral}}% alternative" \fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}
-\newcommand*{\labelitemii}{\textcolor{color1}{\large\bfseries-}}
-\newcommand*{\labelitemiii}{\textcolor{color1}{\textperiodcentered}}% alternative: \textasteriskcentered; both force the use of the CMSY font, even when lmodern fonts are used :(
-\newcommand*{\labelitemiv}{\textcolor{color1}{\textperiodcentered}}
+% itemize labels (the struts were added to correct inter-item spacing (works for single line items, until a solution is found for multi-line ones...)
+\newcommand*{\labelitemi}{\strut\textcolor{color1}{\Neutral}}% alternative" \fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}
+\newcommand*{\labelitemii}{\strut\textcolor{color1}{\large\bfseries-}}
+\newcommand*{\labelitemiii}{\strut\textcolor{color1}{\textperiodcentered}}% alternative: \textasteriskcentered; both force the use of the CMSY font, even when lmodern fonts are used :(
+\newcommand*{\labelitemiv}{\strut\textcolor{color1}{\textperiodcentered}}
% enumerate labels
\renewcommand{\theenumi}{\@arabic\c@enumi}
\renewcommand{\theenumii}{\@alph\c@enumii}
@@ -278,12 +279,12 @@
\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol]{}
% makes a typical cv job / education entry
-% usage: \cventry{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description}
-\newcommand*{\cventry}[6]{}
+% usage: \cventry[spacing]{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description}
+\newcommand*{\cventry}[7][.25em]{}
% makes a cv entry with a proficiency comment
% usage: \cvitemwithcomment[spacing]{header}{text}{comment}
-\newcommand*{\cvitemwithcomment}[4]{}
+\newcommand*{\cvitemwithcomment}[4][.25em]{}
% makes a generic hyperlink
% usage: \link[optional text]{link}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
index 3ea0481f9e2..32429ae9b76 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/25 v0.17 modern curriculum vitae color scheme: black]
+\ProvidesPackage{moderncvcolorblack}[2012/02/05 v0.18 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 2f5e62a41ac..8e470db39c0 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/25 v0.17 modern curriculum vitae color scheme: blue]
+\ProvidesPackage{moderncvcolorblue}[2012/02/05 v0.18 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 0dce84a1ded..84fd4f2b939 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/25 v0.17 modern curriculum vitae color scheme: green]
+\ProvidesPackage{moderncvcolorgreen}[2012/02/05 v0.18 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 a079fc66c02..fd2aaf864b6 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/25 v0.17 modern curriculum vitae color scheme: grey]
+\ProvidesPackage{moderncvcolorgrey}[2012/02/05 v0.18 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 3fa87323507..00ae0d10962 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/25 v0.17 modern curriculum vitae color scheme: orange]
+\ProvidesPackage{moderncvcolororange}[2012/02/05 v0.18 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 cfbdc212e8c..b944aa6dcd7 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/25 v0.17 modern curriculum vitae color scheme: purple]
+\ProvidesPackage{moderncvcolorpurple}[2012/02/05 v0.18 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 5edc0f9714a..fa539d84476 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/25 v0.17 modern curriculum vitae color scheme: red]
+\ProvidesPackage{moderncvcolorred}[2012/02/05 v0.18 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 62bba4bb64f..c8d86ebde1b 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/25 v0.17 modern curriculum vitae compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2012/02/05 v0.18 modern curriculum vitae compatibility patches]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
new file mode 100644
index 00000000000..f6c8d56d4c6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
@@ -0,0 +1,212 @@
+%% start of file `moderncvstylebanking.sty'.
+%% Copyright 2006-2012 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,
+% available at http://www.latex-project.org/lppl/.
+
+
+%-------------------------------------------------------------------------------
+% identification
+%-------------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{moderncvstylebanking}[2012/02/05 v0.18 modern curriculum vitae scheme: banking]
+
+
+%-------------------------------------------------------------------------------
+% required packages
+%-------------------------------------------------------------------------------
+
+
+%-------------------------------------------------------------------------------
+% package options
+%-------------------------------------------------------------------------------
+\RequirePackage{tgpagella}
+\renewcommand*{\familydefault}{\rmdefault}
+
+
+%-------------------------------------------------------------------------------
+% style definition
+%-------------------------------------------------------------------------------
+% fonts
+\renewcommand*{\namefont}{\Huge\bfseries\upshape}
+\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
+\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}}}
+
+% length used
+\newlength{\quotewidth}
+\newlength{\hintscolumnwidth}
+\setlength{\hintscolumnwidth}{0.3\textwidth}%
+\newlength{\separatorcolumnwidth}
+\setlength{\separatorcolumnwidth}{0.025\textwidth}%
+\newlength{\maincolumnwidth}
+\newlength{\doubleitemcolumnwidth}
+\newlength{\listitemsymbolwidth}
+\settowidth{\listitemsymbolwidth}{\listitemsymbol}
+\newlength{\listitemmaincolumnwidth}
+\newlength{\listdoubleitemmaincolumnwidth}
+
+% recompute all the lengths that depends on the text width
+\renewcommand*{\recomputelengths}{%
+ \setlength{\quotewidth}{0.65\textwidth}%
+ % main lenghts
+ \setlength{\maincolumnwidth}{\textwidth}%
+ % listitem lengths
+ \setlength{\listitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
+ % doubleitem lengths
+ \setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\separatorcolumnwidth}%
+ \setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
+ % listdoubleitem lengths
+ \setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
+ \setlength{\listdoubleitemmaincolumnwidth}{0.5\listdoubleitemmaincolumnwidth}%
+ % fancyhdr lengths
+ \renewcommand{\headwidth}{\textwidth}}
+
+% cv footer
+\newcommand*{\maketitlesymbol}{%
+ {~~~\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{\maketitlebox}%
+\newsavebox{\maketitletempbox}%
+\newlength{\maketitlewidth}%
+\newlength{\maketitleboxwidth}%
+% adds an element to the maketitle, separated by maketitlesymbol
+% usage: \addtomaketitle[maketitlesymbol]{element}
+\newcommand*{\addtomaketitle}[2][\maketitlesymbol]{%
+ \savebox{\maketitletempbox}{\usebox{\maketitlebox}#1#2}%
+ \settowidth{\maketitleboxwidth}{\usebox{\maketitletempbox}}%
+ \ifnum\maketitleboxwidth<\maketitlewidth%
+ \savebox{\maketitlebox}{\usebox{\maketitletempbox}}
+ \else%
+ \flushmaketitle{}\\%
+ \savebox{\maketitlebox}{#2}%
+ \savebox{\maketitletempbox}{#2}\fi}
+% internal command to flush the maketitle
+\newcommand*{\flushmaketitle}{%
+ \strut\usebox{\maketitlebox}%
+ \savebox{\maketitlebox}{}%
+ \savebox{\maketitletempbox}{}}
+\renewcommand*{\maketitle}{%
+ \setlength{\maketitlewidth}{0.8\textwidth}%
+ \hfil%
+ \parbox{\maketitlewidth}{%
+ \centering%
+ % name (title is not visible)
+ \namestyle{\@firstname~\@familyname}\\%
+ % detailed information
+ \color{color2}\addressfont%
+ \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle[]{\addresssymbol\@addressstreet}%
+ \ifthenelse{\isundefined{\@addresscity}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}%
+ \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}}}%
+ \ifthenelse{\isundefined{\@homepage}}{}{\addtomaketitle{\homepagesymbol\httplink{\@homepage}}}%
+ \ifthenelse{\isundefined{\@extrainfo}}{}{\addtomaketitle{\@extrainfo}}%
+ \flushmaketitle}\\[2.5em]%
+ % optional quote
+ \ifthenelse{\isundefined{\@quote}}%
+ {}%
+ {{\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
+
+\renewcommand*{\section}[1]{%
+ \par\addvspace{2.5ex}%
+ \phantomsection{}%
+ \addcontentsline{toc}{section}{#1}%
+ \strut\sectionstyle{#1}%
+ {\color{color1}\hrule}%
+ \par\nobreak\addvspace{1ex}\@afterheading}
+
+\newcommand{\subsectionfill}{\cleaders\hbox to 0.35em{\scriptsize.}\hfill}% for a dashed fill
+\renewcommand*{\subsection}[1]{%
+ \par\addvspace{1ex}%
+ \phantomsection{}%
+ \addcontentsline{toc}{subsection}{#1}%
+ \strut\subsectionstyle{#1}{\color{color1}{\subsectionfill}}%
+ \par\nobreak\addvspace{0.5ex}\@afterheading}
+
+\renewcommand*{\cvitem}[3][.25em]{%
+ \ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }{#3}%
+ \par\addvspace{#1}}
+
+\renewcommand*{\cvdoubleitem}[5][.25em]{%
+ \begin{minipage}[t]{\doubleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}%
+ \par\addvspace{#1}}
+
+\renewcommand*{\cvlistitem}[2][.25em]{%
+ \listitemsymbol#2%
+ \par\addvspace{#1}}
+
+\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
+ \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \ifthenelse{\equal{#3}{}}%
+ {}%
+ {\listitemsymbol\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}}
+
+\renewcommand*{\cventry}[7][.25em]{
+ \begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}%
+ {\bfseries #4} & {\bfseries #5} \\%
+ {\itshape #3\ifthenelse{\equal{#6}{}}{}{, #6}} & {\itshape #2}\\%
+ \end{tabular*}%
+ \ifx&#7&%
+ \else{\\\vbox{\small#7}}\fi%
+ \par\addvspace{#1}}
+
+\newbox{\cvitemwithcommentmainbox}
+\newlength{\cvitemwithcommentmainlength}
+\newlength{\cvitemwithcommentcommentlength}
+\renewcommand*{\cvitemwithcomment}[4][.25em]{%
+ \savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3}%
+ \setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%
+ \setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}%
+ \begin{minipage}[t]{\cvitemwithcommentmainlength}\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3\end{minipage}%
+ \hfill% fill of \separatorcolumnwidth
+ \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}%
+ \par\addvspace{#1}}
+
+\renewenvironment{thebibliography}[1]%
+ {%
+ \bibliographyhead{\refname}%
+% \small%
+ \begin{list}{\bibliographyitemlabel}%
+ {%
+ \setlength{\topsep}{0pt}%
+ \setlength{\labelwidth}{0pt}%
+ \setlength{\labelsep}{0pt}%
+ \leftmargin\labelwidth%
+ \advance\leftmargin\labelsep%
+ \@openbib@code%
+ \usecounter{enumiv}%
+ \let\p@enumiv\@empty%
+ \renewcommand\theenumiv{\@arabic\c@enumiv}}%
+ \sloppy\clubpenalty4000\widowpenalty4000%
+% \sfcode`\.\@m%
+% \sfcode `\=1000\relax%
+ }%
+ {%
+ \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
+ \end{list}%
+ }
+
+\endinput
+
+
+%% end of file `moderncvstylebanking.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
index aa4dc60a994..5dd5ae6b063 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/25 v0.17 modern curriculum vitae style scheme: casual]
+\ProvidesPackage{moderncvstylecasual}[2012/02/05 v0.18 modern curriculum vitae style scheme: casual]
%-------------------------------------------------------------------------------
@@ -37,26 +37,26 @@
{~~~\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}%
+\newsavebox{\footerbox}%
+\newsavebox{\footertempbox}%
\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}}%
+ \savebox{\footertempbox}{\usebox{\footerbox}#1#2}%
+ \settowidth{\footerboxwidth}{\usebox{\footertempbox}}%
\ifnum\footerboxwidth<\footerwidth%
- \savebox{\footertempabox}{\usebox{\footertempbbox}}
+ \savebox{\footerbox}{\usebox{\footertempbox}}
\else%
\flushfooter{}\\%
- \savebox{\footertempabox}{#2}%
- \savebox{\footertempbbox}{#2}\fi}
+ \savebox{\footerbox}{#2}%
+ \savebox{\footertempbox}{#2}\fi}
% internal command to flush the footer
\newcommand*{\flushfooter}{%
- \strut\usebox{\footertempabox}%
- \savebox{\footertempabox}{}%
- \savebox{\footertempbbox}{}}
+ \strut\usebox{\footerbox}%
+ \savebox{\footerbox}{}%
+ \savebox{\footertempbox}{}}
\renewcommand*{\makefooter}{%
\setlength{\footerwidth}{0.8\textwidth}%
\fancypagestyle{plain}{%
@@ -92,9 +92,9 @@
\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
+ % optional title
\ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\raggedleft\titlestyle{\@title}}\\[2.5em]%
-% optional quote
+ % optional quote
\ifthenelse{\isundefined{\@quote}}%
{}%
{{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
index 359f9904d8a..ac261ef8bdd 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/25 v0.17 modern curriculum vitae style scheme: classic]
+\ProvidesPackage{moderncvstyleclassic}[2012/02/05 v0.18 modern curriculum vitae style scheme: classic]
%-------------------------------------------------------------------------------
@@ -122,39 +122,41 @@
% 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
\newlength{\baseletterheight}
\settoheight{\baseletterheight}{\sectionstyle{o}}
\setlength{\baseletterheight}{\baseletterheight-0.95ex}
\renewcommand*{\section}[1]{%
- \vspace*{2.5ex}%
- \parbox[t]{\hintscolumnwidth}{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}%
+ \par\addvspace{2.5ex}%
\phantomsection{}% reset the anchor for hyperrefs
- \addcontentsline{toc}{part}{#1}%
+ \addcontentsline{toc}{section}{#1}%
+ \parbox[t]{\hintscolumnwidth}{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}%
\hspace{\separatorcolumnwidth}%
\parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#1}}%
- \par\nobreak\vskip 1ex\@afterheading}% to avoid a pagebreak after the heading
+ \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading
\renewcommand*{\subsection}[1]{%
+ \par\addvspace{1ex}%
+ \phantomsection{}% reset the anchor for hyperrefs
+ \addcontentsline{toc}{subsection}{#1}%
\begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
- \raggedleft\hintfont{} &{\subsectionstyle{#1}}%
+ \raggedleft\hintstyle{} &{\strut\subsectionstyle{#1}}%
\end{tabular}%
- \par\nobreak\vskip 0.5ex\@afterheading}% to avoid a pagebreak after the heading
-% \phantomsection{}% reset the anchor for hyperrefs
-% \addcontentsline{toc}{chapter}{#1}% does not work, the bookmark is placed at the same level as sections (placed themselves at part level to be visible, as hyperref does not allow sections without parents...)
+ \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading
\renewcommand*{\cvitem}[3][.25em]{%
\begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
- \raggedleft\hintfont{#2} &{#3}%
- \end{tabular}\\[#1]}
+ \raggedleft\hintstyle{#2} &{#3}%
+ \end{tabular}%
+ \par\addvspace{#1}}
\renewcommand*{\cvdoubleitem}[5][.25em]{%
\cvitem[#1]{#2}{%
\begin{minipage}[t]{\doubleitemmaincolumnwidth}#3\end{minipage}%
\hfill% fill of \separatorcolumnwidth
- \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#4}\end{minipage}%
+ \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#4}\end{minipage}%
\hspace*{\separatorcolumnwidth}%
\begin{minipage}[t]{\doubleitemmaincolumnwidth}#5\end{minipage}}}
@@ -174,7 +176,7 @@
\ifthenelse{\equal{#4}{}}{}{, {\slshape#4}}%
\ifthenelse{\equal{#5}{}}{}{, #5}%
\ifthenelse{\equal{#6}{}}{}{, #6}%
- .%
+ .\strut%
\ifx&#7&%
\else{\newline{}\begin{minipage}[t]{\linewidth}\small#7\end{minipage}}\fi}}
@@ -186,14 +188,14 @@
\setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%
\setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}%
\cvitem[#1]{#2}{%
- \begin{minipage}[t]{\cvitemwithcommentmainlength}\textbf{#3}\end{minipage}%
+ \begin{minipage}[t]{\cvitemwithcommentmainlength}\bfseries#3\end{minipage}%
\hfill% fill of \separatorcolumnwidth
\begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}}}
\renewenvironment{thebibliography}[1]%
{%
\bibliographyhead{\refname}%
- \small%
+% \small%
\begin{list}{\bibliographyitemlabel}%
{%
\setlength{\topsep}{0pt}%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
index 84bfb70e767..176e0caa9ed 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/25 v0.17 modern curriculum vitae scheme: empty]
+\ProvidesPackage{moderncvstyleempty}[2012/02/05 v0.18 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 6ce1bc052c5..29441f8331d 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/25 v0.17 modern curriculum vitae style: oldstyle]
+\ProvidesPackage{moderncvstyleoldstyle}[2012/02/05 v0.18 modern curriculum vitae style: oldstyle]
%-------------------------------------------------------------------------------
@@ -126,7 +126,7 @@
% 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]}}%
% optional details
\makeinfo{%
\ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
@@ -139,26 +139,28 @@
\ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}}}
\renewcommand*{\section}[1]{%
- \vspace*{2.5ex}%
+ \par\addvspace{2.5ex}%
\phantomsection{}% reset the anchor for hyperrefs
- \addcontentsline{toc}{part}{#1}%
- \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}%
- \par\nobreak\vskip 1ex\@afterheading}% to avoid a pagebreak after the heading
-% starred variant, which is identical but defined to allow its use (e.g. for natbib compatibility, who uses \section*{} for the bibliography header)
+ \addcontentsline{toc}{section}{#1}%
+ \strut\sectionstyle{#1}%
+ \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading
\renewcommand*{\subsection}[1]{%
- \subsectionstyle{#1}%
- \par\nobreak\vskip 0.5ex\@afterheading}% to avoid a pagebreak after the heading
-% \phantomsection{}% reset the anchor for hyperrefs
-% \addcontentsline{toc}{chapter}{#1}% does not work, the bookmark is placed at the same level as sections (placed themselves at part level to be visible, as hyperref does not allow sections without parents...)
+ \par\addvspace{1ex}%
+ \phantomsection{}% reset the anchor for hyperrefs
+ \addcontentsline{toc}{subsection}{#1}%
+ \strut\subsectionstyle{#1}%
+ \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading
\renewcommand*{\cvitem}[3][.25em]{%
- \ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }{#3}\\[#1]}
+ \ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }{#3}%
+ \par\addvspace{#1}}
\renewcommand*{\cvdoubleitem}[5][.25em]{%
- \begin{minipage}[t]{\doubleitemcolumnwidth}{\hintfont#2}: #3\end{minipage}%
+ \begin{minipage}[t]{\doubleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
\hfill% fill of \separatorcolumnwidth
- \begin{minipage}[t]{\doubleitemcolumnwidth}{\hintfont#4}: #5\end{minipage}\\[#1]}
+ \begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}%
+ \par\addvspace{#1}}
\renewcommand*{\cvlistitem}[2][.25em]{%
\cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}}
@@ -175,39 +177,44 @@
\renewcommand*{\cventry}[7][.25em]{%
\savebox{\cventryyearbox}{%
\hspace*{2\separatorcolumnwidth}%
- {\hintfont#2}}%
+ \hintstyle{#2}}%
\setlength{\cventrytitleboxwidth}{\widthof{\usebox{\cventryyearbox}}}%
\setlength{\cventrytitleboxwidth}{\maincolumnwidth-\cventrytitleboxwidth}%
\begin{minipage}{\maincolumnwidth}%
\parbox[t]{\cventrytitleboxwidth}{%
+ \strut%
{\bfseries#3}%
\ifthenelse{\equal{#4}{}}{}{, {\slshape#4}}%
\ifthenelse{\equal{#5}{}}{}{, #5}%
\ifthenelse{\equal{#6}{}}{}{, #6}%
- .}%
+ .\strut}%
\usebox{\cventryyearbox}%
\end{minipage}%
\ifx&#7&%
\else{%
- \newline{}\begin{minipage}[t]{\maincolumnwidth}\small#7\end{minipage}}\fi%
- \\[#1]}
-
+ \newline{}%
+ \begin{minipage}[t]{\maincolumnwidth}%
+ \small%
+ #7%
+ \end{minipage}}\fi%
+ \par\addvspace{#1}}
\newbox{\cvitemwithcommentmainbox}
\newlength{\cvitemwithcommentmainlength}
\newlength{\cvitemwithcommentcommentlength}
\renewcommand*{\cvitemwithcomment}[4][.25em]{%
- \savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }#3}%
+ \savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3}%
\setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%
\setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}%
- \begin{minipage}[t]{\cvitemwithcommentmainlength}\ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }#3\end{minipage}%
+ \begin{minipage}[t]{\cvitemwithcommentmainlength}\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3\end{minipage}%
\hfill% fill of \separatorcolumnwidth
- \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}\\[#1]}
+ \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}%
+ \par\addvspace{#1}}
\renewenvironment{thebibliography}[1]%
{%
\bibliographyhead{\refname}%
- \small%
+% \small%
\begin{list}{\bibliographyitemlabel}%
{%
\setlength{\topsep}{0pt}%