moderncv 0.15 (19dec11)

git-svn-id: svn://tug.org/texlive/trunk@24875 c570f23f-e606-0410-a88d-b1316a301751

16 files changed, 878 insertions, 620 deletions

diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index b4199d585ea..3e26ca4dae0 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}[2011/12/04 v0.14 modern curriculum vitae document class]
+\ProvidesClass{moderncv}[2011/12/19 v0.15 modern curriculum vitae document class]
 
 
 %-------------------------------------------------------------------------------
@@ -56,16 +56,16 @@
 \DeclareOption{11pt}{\renewcommand\@ptsize{1}}
 \DeclareOption{12pt}{\renewcommand\@ptsize{2}}
 
+% font type options
+\DeclareOption{sans}{\renewcommand{\familydefault}{\sfdefault}}
+\DeclareOption{roman}{\renewcommand{\familydefault}{\rmdefault}}
+
 % draft/final option
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
 
-% nolmodern option
-\newif\if@lmodern\@lmoderntrue
-\DeclareOption{nolmodern}{\@lmodernfalse}
-
 % execute default options
-\ExecuteOptions{a4paper,11pt,color,final}
+\ExecuteOptions{a4paper,11pt,sans,final}
 
 % process given options
 \ProcessOptions\relax
@@ -86,27 +86,17 @@
 \RequirePackage{ifthen}
 
 % color
-\RequirePackage{color}
+\RequirePackage{xcolor}
 
-% font encoding
-\RequirePackage[T1]{fontenc}
-
-% latin modern fonts
-\if@lmodern
-  \RequirePackage{lmodern}\fi
+% automatic loading of latin modern fonts if present on the system
+\IfFileExists{lmodern.sty}
+  {\RequirePackage[T1]{fontenc}\RequirePackage{lmodern}}
+  {}
 
 % symbols like \Telefon, \Mobilefone, \Letter and \Email
 \RequirePackage{marvosym}
 
-% page geometry
-\addtolength{\oddsidemargin}{-54pt}
-\addtolength{\textwidth}{109pt}
-\addtolength{\topmargin}{-70pt}
-\addtolength{\textheight}{122pt}
-\addtolength{\marginparsep}{-5pt}
-\addtolength{\marginparwidth}{-10pt}
-
-% hyperrefs
+% hyper links
 \RequirePackage{url}
 \urlstyle{tt}
 % load hyperred at the end of the preamble to pass options required by loaded packages (like CJK)
@@ -142,9 +132,15 @@
   \fancyhf{}}
 \pagestyle{plain}
 
+% lengths calculations
+\RequirePackage{calc}
+
 % advanced command arguments
 \RequirePackage{xargs}
 
+% micro-typography (e.g., character  protrusion, font expansion, hyphenatable letterspacing)
+\RequirePackage{microtype}
+
 % compatibility package with older versions of moderncv
 \RequirePackageWithOptions{moderncvcompatibility}
 
@@ -176,63 +172,61 @@
 
 
 %-------------------------------------------------------------------------------
-%                style commands definitions
+%                design commands definitions
 %-------------------------------------------------------------------------------
-% symbols used 
-\providecommand*{\listitemsymbol}{\Neutral}%{{\fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}}}
-\providecommand*{\addresssymbol}{}
-\providecommand*{\mobilesymbol}{\Mobilefone}
-\providecommand*{\phonesymbol}{\Telefon}
-\providecommand*{\faxsymbol}{\FAX}
-\providecommand*{\emailsymbol}{\Letter}
-\providecommand*{\homepagesymbol}{{\Large\ComputerMouse}}
+% 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}}
+%   enumerate labels
+\renewcommand{\theenumi}{\@arabic\c@enumi}
+\renewcommand{\theenumii}{\@alph\c@enumii}
+\renewcommand{\theenumiii}{\@roman\c@enumiii}
+\renewcommand{\theenumiv}{\@Alph\c@enumiv}
+%   other symbols
+\newcommand*{\listitemsymbol}{\labelitemi~}
+\newcommand*{\addresssymbol}{}
+\newcommand*{\mobilesymbol}{\Mobilefone~}
+\newcommand*{\phonesymbol}{\Telefon~}
+\newcommand*{\faxsymbol}{\FAX~}
+\newcommand*{\emailsymbol}{\Letter~}
+\newcommand*{\homepagesymbol}{{\Large\ComputerMouse}~}
 
 % colors
-\definecolor{firstnamecolor}{rgb}{0,0,0}
-\definecolor{familynamecolor}{rgb}{0,0,0}
-\definecolor{titlecolor}{rgb}{0,0,0}
-\definecolor{addresscolor}{rgb}{0,0,0}
-\definecolor{quotecolor}{rgb}{0,0,0}
-\definecolor{sectionrectanglecolor}{rgb}{0,0,0}
-\definecolor{sectiontitlecolor}{rgb}{0,0,0}
-\definecolor{subsectioncolor}{rgb}{0,0,0}
-\definecolor{hintcolor}{rgb}{0,0,0}
+\definecolor{color0}{rgb}{0,0,0}% main default color, normally left to black
+\definecolor{color1}{rgb}{0,0,0}% primary theme color
+\definecolor{color2}{rgb}{0,0,0}% secondary theme color
+\definecolor{color3}{rgb}{0,0,0}% tertiary theme color
 
 % fonts
-\providecommand*{\firstnamefont}{}
-\providecommand*{\familynamefont}{}
-\providecommand*{\titlefont}{}
-\providecommand*{\addressfont}{}
-\providecommand*{\quotefont}{}
-\providecommand*{\sectionfont}{}
-\providecommand*{\subsectionfont}{}
-\providecommand*{\hintfont}{\small\sffamily}
-
-% styles
-\providecommand*{\firstnamestyle}[1]{{\firstnamefont\color{firstnamecolor}#1}}
-\providecommand*{\familynamestyle}[1]{{\familynamefont\color{familynamecolor}#1}}
-\providecommand*{\titlestyle}[1]{{\titlefont\color{titlecolor}#1}}
-\providecommand*{\addresstyle}[1]{{\addressfont\color{addresscolor}#1}}
-\providecommand*{\quotestyle}[1]{{\quotefont\color{quotecolor}#1}}
-\providecommand*{\sectionstyle}[1]{{\sectionfont\color{sectiontitlecolor}#1}}
-\providecommand*{\subsectionstyle}[1]{{\subsectionfont\color{subsectioncolor}#1}}
-\providecommand*{\hintstyle}[1]{{\hintfont\color{hintcolor}#1}}
-
-% makes the cv title
-\newcommand*{\maketitle}{}%
-\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
-
-% makes the cv footer
-\newcommand*{\makefooter}
-
-% loads a style
-\newcommand*{\moderncvtheme}[2][]{
-  \RequirePackage[#1]{moderncvtheme#2}}
+\newcommand*{\namefont}{}
+\newcommand*{\titlefont}{}
+\newcommand*{\addressfont}{}
+\newcommand*{\quotefont}{}
+\newcommand*{\sectionfont}{}
+\newcommand*{\subsectionfont}{}
+\newcommand*{\hintfont}{}
+\AtBeginDocument{\normalfont\color{color0}}
+
+% loads a style scheme
+\newcommand*{\moderncvstyle}[1]{
+  \RequirePackage{moderncvstyle#1}}
+  
+% loads a color scheme
+\newcommand*{\moderncvcolor}[1]{
+  \RequirePackage{moderncvcolor#1}}
+
+% recompute all automatic lengths
+\newcommand*{\recomputelengths}{}
+\AtBeginDocument{\recomputelengths{}}
 
 
 %-------------------------------------------------------------------------------
 %                structure commands definitions
 %-------------------------------------------------------------------------------
+% cv elements
 \newcommand*{\firstname}[1]{\def\@firstname{#1}}
 \newcommand*{\familyname}[1]{\def\@familyname{#1}}
 \renewcommand*{\title}[1]{\def\@title{#1}}
@@ -246,62 +240,18 @@
 \newcommandx*{\photo}[3][1=64pt,2=0.4pt,usedefault]{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}% the 1st (optional) argument is the width of the photo, the 2nd (optional) argument is the thickness of the frame around it.
 \newcommand*{\quote}[1]{\def\@quote{#1}}
 
-% length used by the moderncv layout
-% quote length
-\newlength{\quotewidth}
-% section lengths
-\newlength{\hintscolumnwidth}
-\setlength{\hintscolumnwidth}{0.15\textwidth}
-\newlength{\separatorcolumnwidth}
-\setlength{\separatorcolumnwidth}{0.025\textwidth}
-\newlength{\maincolumnwidth}
-% doubleitem lengths
-\newlength{\doubleitemmaincolumnwidth}
-% listitem lengths
-\newlength{\listitemsymbolwidth}
-\settowidth{\listitemsymbolwidth}{\listitemsymbol{}~}
-\newlength{\listitemmaincolumnwidth}
-% listdoubleitem lengths
-\newlength{\listdoubleitemmaincolumnwidth}
-% recompute all the lengths that depends on the text width
-\newcommand*{\recomputethemelengths}{}
-\newcommand*{\recomputelengths}{%
-  \setlength{\quotewidth}{0.65\textwidth}%
-  % main lenghts
-  \setlength{\maincolumnwidth}{\textwidth}%
-  \addtolength{\maincolumnwidth}{-\separatorcolumnwidth}%
-  \addtolength{\maincolumnwidth}{-\hintscolumnwidth}%
-  % listitem lengths
-  \setlength{\listitemmaincolumnwidth}{\maincolumnwidth}%
-  \addtolength{\listitemmaincolumnwidth}{-\listitemsymbolwidth}%
-  % doubleitem lengths
-  \setlength{\doubleitemmaincolumnwidth}{\maincolumnwidth}%
-  \addtolength{\doubleitemmaincolumnwidth}{-\hintscolumnwidth}%
-  \addtolength{\doubleitemmaincolumnwidth}{-\separatorcolumnwidth}%
-  \setlength{\doubleitemmaincolumnwidth}{0.5\doubleitemmaincolumnwidth}%
-  % listdoubleitem lengths
-  \setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth}%
-  \addtolength{\listdoubleitemmaincolumnwidth}{-\listitemsymbolwidth}%
-  \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}%
-  % fancyhdr lengths
-  \renewcommand{\headwidth}{\textwidth}%
-  \recomputethemelengths{}}
-\AtBeginDocument{\recomputelengths{}}
+% makes the cv title
+% usage: \maketitle
+\newcommand*{\maketitle}{}%
+\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
 
-% draws a colored rectangle
-% usage: \colorrule[optional height]{width}
-%\newcommand*{\colorrule}[2][1ex]{{\color{sectionrectanglecolor}{\rule{#2}{#1}}}}
+% makes the cv footer
+% usage: \makefooter
+\newcommand*{\makefooter}
 
+% makes a cv section
 % usage: \section{<title>}
-\newcommand*{\section}[1]{%
-  \vspace*{2.5ex}%
-  \parbox[m]{\hintscolumnwidth}{\raggedleft\hintfont{\color{sectionrectanglecolor}\rule{\hintscolumnwidth}{1ex}}}%
-  \phantomsection{}% reset the anchor for hyperrefs
-  \addcontentsline{toc}{part}{#1}%
-  \hspace{\separatorcolumnwidth}%
-  \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)
+\newcommand*{\section}[1]{}
 \AtEndPreamble{%
   \@ifpackageloaded{natbib}
     {
@@ -310,89 +260,67 @@
     }{}
 }
 
+% makes a cv subsection
 % usage: \subsection{title}
-\newcommand*{\subsection}[1]{%
-  \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
- 	  \raggedleft\hintfont{} &{\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...)
-
-% usage: \cvline{margintext}{linetext}
-\newcommand*{\cvline}[3][.25em]{%
-  \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
- 	  \raggedleft\hintfont{#2} &{#3}%
-  \end{tabular}\\[#1]}
-
-% usage: \cvdoubleitem{subtitle}{text}{subtitle}{text}
-\newcommand*{\cvdoubleitem}[4]{%
- \cvline{#1}{\begin{minipage}[t]{\doubleitemmaincolumnwidth}#2\end{minipage}%
- \hfill%
- \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#3}\end{minipage}\hspace*{\separatorcolumnwidth}\begin{minipage}[t]{\doubleitemmaincolumnwidth}#4\end{minipage}}}
-
-% usage: \cvlistitem[symbol]{point1}
-\newcommand*{\cvlistitem}[2][\listitemsymbol{}]{%
-  \cvline[0pt]{}{#1~\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}}
-
-% usage: \cvlistdoubleitem[symbol]{point1}{point2}
-\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{%
-  \cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}%
-  \hfill%
-  \ifthenelse{\equal{#3}{}}%
-    {}%
-    {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}}
+\newcommand*{\subsection}[1]{}
 
+% makes a cv line with a header and a corresponding text
+% usage: \cvitem[spacing]{header}{text}
+\newcommand*{\cvitem}[3][.25em]{}
+
+% makes a cv line 2 headers and their corresponding text
+% usage: \cvdoubleitem[spacing]{header1}{text1}{header2}{text2}
+\newcommand*{\cvdoubleitem}[5][.25em]{}
+
+% makes a cv line with a list item
+% usage: \cvlistitem[label]{item}
+\newcommand*{\cvlistitem}[2][\listitemsymbol]{}
+
+% makes a cv line with 2 list items
+% usage: \cvlistdoubleitem[label]{item1}{item2}
+\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]{%
-  \cvline{#1}{%
-    {\bfseries#2}%
-    \ifthenelse{\equal{#3}{}}{}{, {\slshape#3}}%
-    \ifthenelse{\equal{#4}{}}{}{, #4}%
-    \ifthenelse{\equal{#5}{}}{}{, #5}%
-    .%
-    \ifx&#6&%
-      \else{\newline{}\begin{minipage}[t]{\linewidth}\small#6\end{minipage}}\fi%
-  }}%
-
-% usage (inside 'language' cvsection environment): \cvlanguage{name}{level}{comment}
-\newcommand*{\cvlanguage}[3]{%
-  \cvline{#1}{\begin{minipage}[t]{.225\maincolumnwidth}\textbf{#2}\end{minipage}\hfill\begin{minipage}[t]{0.725\maincolumnwidth}\raggedleft\footnotesize\itshape #3\end{minipage}}}
-
-% usage (inside 'computer skills' cvsection environment): \cvcomputer{category}{programs}{category}{programs}
-\newcommand*{\cvcomputer}[4]{%
-  \cvdoubleitem{#1}{\small#2}{#3}{\small#4}}
+\newcommand*{\cventry}[6]{}
 
+% makes a cv entry with a proficiency comment
+% usage: \cvitemwithcomment[spacing]{header}{text}{comment}
+\newcommand*{\cvitemwithcomment}[4]{}
+
+% makes a generic hyperlink
 % usage: \link[optional text]{link}
 \newcommand*{\link}[2][]{%
   \ifthenelse{\equal{#1}{}}%
     {\href{#2}{#2}}%
     {\href{#2}{#1}}}
 
+% makes a http hyperlink
 % usage: \httplink[optional text]{link}
 \newcommand*{\httplink}[2][]{%
   \ifthenelse{\equal{#1}{}}%
     {\href{http://#2}{#2}}%
     {\href{http://#2}{#1}}}
 
+% makes an email hyperlink
 % usage: \emaillink[optional text]{link}
 \newcommand*{\emaillink}[2][]{%
   \ifthenelse{\equal{#1}{}}%
     {\href{mailto:#2}{#2}}%
     {\href{mailto:#2}{#1}}}
 
-% usage: \nopagenumbers{}
+% page numbers in footer if more than 1 page
 \newif\if@displaypagenumbers\@displaypagenumberstrue
 \newcommand*{\nopagenumbers}{\@displaypagenumbersfalse}
 \AtEndPreamble{%
-\AtBeginDocument{%
-  \if@displaypagenumbers%
-    \@ifundefined{r@lastpage}{}{%
-      \ifthenelse{\pageref{lastpage} > 1}{%
-        \fancypagestyle{plain}{%
-          \fancyfoot[r]{\addressfont\color{quotecolor}\footnotesize\thepage/\pageref{lastpage}}}%
-        \pagestyle{plain}}{}}%
-    \AtEndDocument{\label{lastpage}}\else\fi}}
+  \AtBeginDocument{%
+    \if@displaypagenumbers%
+      \@ifundefined{r@lastpage}{}{%
+        \ifthenelse{\pageref{lastpage} > 1}{%
+          \fancypagestyle{plain}{%
+            \fancyfoot[r]{\addressfont\color{color2}\footnotesize\thepage/\pageref{lastpage}}}%
+          \pagestyle{plain}}{}}%
+      \AtEndDocument{\label{lastpage}}\else\fi}}
 
 % thebibliography environment, for use with BibTeX and possibly multibib
 \newcommand{\refname}{Publications}
@@ -405,56 +333,24 @@
 \newcommand*{\bibliographyhead}[1]{\section{#1}}
 \AtEndPreamble{\@ifpackageloaded{multibib}{\renewcommand*{\bibliographyhead}[1]{\subsection{#1}}}{}}
 % thebibliography environment definition
-\newenvironment{thebibliography}[1]%
-  {%
-    \bibliographyhead{\refname}%
-    \small%
-    \begin{list}{\bibliographyitemlabel}%
-      {%
-        \setlength{\topsep}{0pt}%
-        \setlength{\labelwidth}{\hintscolumnwidth}%
-        \setlength{\labelsep}{\separatorcolumnwidth}%
-        \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}%
-  }
+\newenvironment{thebibliography}[1]{}{}
 \newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
 \let\@openbib@code\@empty
 
 % itemize, enumerate and description environment
-\setlength{\leftmargini}   {1.2em}
+\setlength{\leftmargini}   {1em}
 \leftmargin\leftmargini
-\setlength{\leftmarginii}  {1em}
-\setlength{\leftmarginiii} {1.87em}
-\setlength{\leftmarginiv}  {1.7em}
-\setlength{\leftmarginv}   {1em}
-\setlength{\leftmarginvi}  {1em}
-\setlength{\labelsep}      {.5em}
-\setlength{\labelwidth}    {\leftmargini}
+\setlength{\leftmarginii}  {\leftmargini}
+\setlength{\leftmarginiii} {\leftmargini}
+\setlength{\leftmarginiv}  {\leftmargini}
+\setlength{\leftmarginv}   {\leftmargini}
+\setlength{\leftmarginvi}  {\leftmargini}
+\setlength{\labelsep}      {.5em}% this is the distance between the label and the body, but it pushes the label to the left rather than pushing the body to the right (to do the latter, modify \leftmargin(i)
+\setlength{\labelwidth}    {\leftmargini}% unfortunately, \labelwidth is not defined by item level (i.e. no \labeliwidth, \labeliiwidth, etc)
 \addtolength{\labelwidth}  {-\labelsep}
 \@beginparpenalty -\@lowpenalty
 \@endparpenalty   -\@lowpenalty
 \@itempenalty     -\@lowpenalty
-% itemize labels
-\newcommand\labelitemi{\listitemsymbol{}}
-\newcommand\labelitemii{{\large\bfseries-}}
-\newcommand\labelitemiii{\textperiodcentered}%{\textasteriskcentered}
-\newcommand\labelitemiv{\textperiodcentered}
-% enumerate labels
-\renewcommand\theenumi{\@arabic\c@enumi}
-\renewcommand\theenumii{\@alph\c@enumii}
-\renewcommand\theenumiii{\@roman\c@enumiii}
-\renewcommand\theenumiv{\@Alph\c@enumiv}
 \newcommand\labelenumi{\theenumi.}
 \newcommand\labelenumii{(\theenumii)}
 \newcommand\labelenumiii{\theenumiii.}
@@ -468,6 +364,8 @@
 \RequirePackage{tweaklist}% distributed with moderncv, not found on ctan and slightly modified
 \renewcommand*{\itemhook}{
   \setlength{\topsep}{0pt}%
+  \setlength{\parsep}{0pt}%
+  \setlength{\parskip}{0pt}%
   \setlength{\itemsep}{0pt}}
 \renewcommand*{\enumhook}{\itemhook{}}
 \renewcommand*{\deschook}{\itemhook{}}
@@ -478,6 +376,12 @@
   July\or August\or September\or October\or November\or December\fi
   \space\number\day, \number\year}
 
+%\newcommand{\widthofautobox}[1]{%
+%  \widthof{\begin{tabular}{@{}l@{}}#1\end{tabular}}}
+
+%\newcommand{\autobox}[2][b]{%
+%  \parbox[#1]{\widthofautobox{#2}}{#2}}
+
 
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
new file mode 100644
index 00000000000..920c3f75aac
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolorblack.sty'.
+%% Copyright 2006-2011 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{moderncvcolorblack}[2011/12/19 v0.15 modern curriculum vitae color scheme: black]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0,0,0}% black
+\definecolor{color2}{rgb}{0,0,0}% black
+
+
+\endinput
+
+
+%% end of file `moderncvcolorblack.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
new file mode 100644
index 00000000000..fb2d697eeda
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolorblue.sty'.
+%% Copyright 2006-2011 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{moderncvcolorblue}[2011/12/19 v0.15 modern curriculum vitae color scheme: blue]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0.22,0.45,0.70}% light blue
+\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+
+
+\endinput
+
+
+%% end of file `moderncvcolorblue.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
new file mode 100644
index 00000000000..1f51864c69b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolorgreen.sty'.
+%% Copyright 2006-2011 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{moderncvcolorgreen}[2011/12/19 v0.15 modern curriculum vitae color scheme: green]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0.35,0.70,0.30}% green
+\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+
+
+\endinput
+
+
+%% end of file `moderncvcolorgreen.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
new file mode 100644
index 00000000000..661f424d29b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolorgrey.sty'.
+%% Copyright 2006-2011 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{moderncvcolorgrey}[2011/12/19 v0.15 modern curriculum vitae color scheme: grey]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0.55,0.55,0.55}% dark grey
+\definecolor{color2}{rgb}{0.55,0.55,0.55}% dark grey
+
+
+\endinput
+
+
+%% end of file `moderncvcolorgrey.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
new file mode 100644
index 00000000000..afbd18bb842
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolororange.sty'.
+%% Copyright 2006-2011 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{moderncvcolororange}[2011/12/19 v0.15 modern curriculum vitae color scheme: orange]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0.95,0.55,0.15}% orange
+\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+
+
+\endinput
+
+
+%% end of file `moderncvcolororange.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
new file mode 100644
index 00000000000..ac746cc7904
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolorpurple.sty'.
+%% Copyright 2006-2011 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{moderncvcolorpurple}[2011/12/19 v0.15 modern curriculum vitae color scheme: purple]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0.50,0.33,0.80}% purple
+\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+
+
+\endinput
+
+
+%% end of file `moderncvcolorpurple.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
new file mode 100644
index 00000000000..a1b16b4112d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
@@ -0,0 +1,27 @@
+%% start of file `moderncvcolorred.sty'.
+%% Copyright 2006-2011 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{moderncvcolorred}[2011/12/19 v0.15 modern curriculum vitae color scheme: red]
+
+
+%-------------------------------------------------------------------------------
+%                color scheme definition
+%-------------------------------------------------------------------------------
+\definecolor{color0}{rgb}{0,0,0}% black
+\definecolor{color1}{rgb}{0.95,0.20,0.20}% red
+\definecolor{color2}{rgb}{0.45,0.45,0.45}% dark grey
+
+
+\endinput
+
+
+%% end of file `moderncvcolorred.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index 9069a4d5f17..8f5612baedf 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}[2011/12/04 v0.14 modern curriculum vitae compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2011/12/19 v0.15 modern curriculum vitae compatibility patches]
 
 
 %-------------------------------------------------------------------------------
@@ -53,10 +53,10 @@
 %  \cvline[#1]{#2}{#3\vspace*{.75em}}}   % the \vspace*{} inside the cvline environment is a hack... (should conceptually be outside the environment)
 
 % compatibility with versions <= 0.5
-\newcommand*{\cvitem}[2]{\cvline{#1}{#2}}
-\newcommand*{\moderncvstyle}[1]{\moderncvtheme{#1}}
+%\newcommand*{\cvitem}[2]{\cvline{#1}{#2}}
+%\newcommand*{\moderncvstyle}[1]{\moderncvtheme{#1}}
 
-% compatibility with versions <=0.7
+% compatibility with versions <= 0.7
 \newcommand*{\closesection}{}
 \newcommand*{\emptysection}{}
 \newcommand*{\sethintscolumnlength}[1]{%
@@ -66,6 +66,14 @@
   \settowidth{\hintscolumnwidth}{#1}%
   \recomputelengths}
 
+% compatibility with versions <= 0.15
+\newcommand*{\cvline}[2]{\cvitem{#1}{#2}}
+\newcommand*{\cvlanguage}[3]{\cvitemwithcomment{#1}{#2}{#3}}
+\newcommand*{\cvcomputer}[4]{\cvdoubleitem{#1}{\small#2}{#3}{\small#4}}
+\newcommand*{\moderncvtheme}[2][blue]{%
+  \moderncvcolor{#1}%
+  \moderncvstyle{#2}}
+
 \endinput
 
 
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
new file mode 100644
index 00000000000..c6e4780351a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
@@ -0,0 +1,85 @@
+%% start of file `moderncvstylecasual.sty'.
+%% Copyright 2006-2011 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{moderncvstylecasual}[2011/12/19 v0.15 modern curriculum vitae style scheme: casual]
+
+
+%-------------------------------------------------------------------------------
+%                required packages
+%-------------------------------------------------------------------------------
+
+
+%-------------------------------------------------------------------------------
+%                package options
+%-------------------------------------------------------------------------------
+\RequirePackage{moderncvstyleclassic}
+
+
+%-------------------------------------------------------------------------------
+%                style scheme definition
+%-------------------------------------------------------------------------------
+% fonts
+\renewcommand*{\namefont}{\fontsize{38}{40}\mdseries\upshape}
+\renewcommand*{\addressfont}{\small\mdseries\slshape}
+
+% cv footer
+\newif\if@firstfooterelement\@firstfooterelementtrue
+\newcommand*{\footersymbol}{%
+  \if@firstfooterelement%
+  \else%
+    { ~~\color{color2}\textbullet~~~}\fi\@firstfooterelementfalse}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :(
+\renewcommand*{\makefooter}{%
+  \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}}}%
+  }%
+  \pagestyle{plain}}
+
+% maketitle
+\renewcommand*{\maketitle}{%
+  \makefooter{}%
+  \newbox{\maketitlepicturebox}%
+  \savebox{\maketitlepicturebox}{%
+    \ifthenelse{\isundefined{\@photo}}%
+      {}%
+      {%
+       \setlength\fboxrule{\@photoframewidth}%
+       \ifdim\@photoframewidth=0pt%
+         \setlength{\fboxsep}{0pt}\fi%
+       {\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]}%
+% 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
+
+
+\endinput
+
+
+%% end of file `moderncvstylecasual.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
new file mode 100644
index 00000000000..4a3e1413d04
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
@@ -0,0 +1,219 @@
+%% start of file `moderncvstyleclassic.sty'.
+%% Copyright 2006-2011 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{moderncvstyleclassic}[2011/12/19 v0.15 modern curriculum vitae style scheme: classic]
+
+
+%-------------------------------------------------------------------------------
+%                required packages
+%-------------------------------------------------------------------------------
+
+
+%-------------------------------------------------------------------------------
+%                package options
+%-------------------------------------------------------------------------------
+
+
+%-------------------------------------------------------------------------------
+%                style scheme definition
+%-------------------------------------------------------------------------------
+% fonts
+\renewcommand*{\namefont}{\fontsize{34}{36}\mdseries\upshape}
+\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
+\renewcommand*{\addressfont}{\small\mdseries\slshape}
+\renewcommand*{\quotefont}{\large\slshape}
+\renewcommand*{\sectionfont}{\Large\mdseries\upshape}
+\renewcommand*{\subsectionfont}{\large\mdseries\upshape}
+\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}}
+
+% length used
+\newlength{\quotewidth}
+\newlength{\hintscolumnwidth}
+\setlength{\hintscolumnwidth}{0.15\textwidth}
+\newlength{\separatorcolumnwidth}
+\setlength{\separatorcolumnwidth}{0.025\textwidth}
+\newlength{\maincolumnwidth}
+\newlength{\doubleitemmaincolumnwidth}
+\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-\separatorcolumnwidth-\hintscolumnwidth}%
+  % listitem lengths
+  \setlength{\listitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
+  % doubleitem lengths
+  \setlength{\doubleitemmaincolumnwidth}{\maincolumnwidth-\hintscolumnwidth-\separatorcolumnwidth-\separatorcolumnwidth}%
+  \setlength{\doubleitemmaincolumnwidth}{0.5\doubleitemmaincolumnwidth}%
+  % listdoubleitem lengths
+  \setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
+  \setlength{\listdoubleitemmaincolumnwidth}{0.5\listdoubleitemmaincolumnwidth}%
+  % fancyhdr lengths
+  \renewcommand{\headwidth}{\textwidth}}
+
+\newif\if@firstdetailselement\@firstdetailselementtrue
+\newcommand*{\maketitledetailsnewline}{
+  \if@firstdetailselement%
+  \else%
+    \\[.2em]\fi%
+  \@firstdetailselementfalse%
+  \addressfont\color{color2}}
+\renewcommand*{\maketitle}{%
+  % optional detailed information box
+  \newbox{\maketitledetailsbox}%
+  \savebox{\maketitledetailsbox}{%
+    \begin{tabular}[b]{@{}r@{}}%
+      \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
+      \ifthenelse{\isundefined{\@addresscity}}{}{\maketitledetailsnewline\@addresscity}%
+      \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol\@mobile}%
+      \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol\@phone}%
+      \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol\@fax}%
+      \ifthenelse{\isundefined{\@email}}{}{\maketitledetailsnewline\emailsymbol\emaillink{\@email}}%
+      \ifthenelse{\isundefined{\@homepage}}{}{\maketitledetailsnewline\homepagesymbol\httplink{\@homepage}}%
+      \ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}%
+    \end{tabular}
+  }%
+  % optional picture box
+  \newbox{\maketitlepicturebox}%
+  \savebox{\maketitlepicturebox}{%
+    \ifthenelse{\isundefined{\@photo}}%
+    {}%
+    {%
+      \hspace*{\separatorcolumnwidth}%
+      \color{color1}%
+      \setlength\fboxrule{\@photoframewidth}%
+      \ifdim\@photoframewidth=0pt%
+        \setlength{\fboxsep}{0pt}\fi%
+      \framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
+  % name and title
+  \newlength{\maketitledetailswidth}\settowidth{\maketitledetailswidth}{\usebox{\maketitledetailsbox}}%
+  \newlength{\maketitlepicturewidth}\settowidth{\maketitlepicturewidth}{\usebox{\maketitlepicturebox}}%
+  \newlength{\maketitlenamewidth}\setlength{\maketitlenamewidth}{\textwidth-\maketitledetailswidth-\maketitlepicturewidth}%
+  \begin{minipage}[b]{\maketitlenamewidth}%
+    \namestyle{\@firstname\ \@familyname}%
+    \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
+  \end{minipage}%
+  % detailed information
+  \usebox{\maketitledetailsbox}%
+  % optional photo
+  \usebox{\maketitlepicturebox}\\[3em]%
+  % optional quote
+  \ifthenelse{\isundefined{\@quote}}%
+    {}%
+    {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
+  }
+
+\renewcommand*{\section}[1]{%
+  \vspace*{2.5ex}%
+  \parbox[m]{\hintscolumnwidth}{\raggedleft\hintfont{\color{color1}\rule{\hintscolumnwidth}{1ex}}}%
+  \phantomsection{}% reset the anchor for hyperrefs
+  \addcontentsline{toc}{part}{#1}%
+  \hspace{\separatorcolumnwidth}%
+  \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)
+
+\renewcommand*{\subsection}[1]{%
+  \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
+ 	  \raggedleft\hintfont{} &{\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...)
+
+\renewcommand*{\cvitem}[3][.25em]{%
+  \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
+ 	  \raggedleft\hintfont{#2} &{#3}%
+  \end{tabular}\\[#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}%
+   \hspace*{\separatorcolumnwidth}%
+   \begin{minipage}[t]{\doubleitemmaincolumnwidth}#5\end{minipage}}}
+
+\renewcommand*{\cvlistitem}[2][.25em]{%
+  \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}}
+
+\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]{%
+  \cvitem[#1]{#2}{%
+    {\bfseries#3}%
+    \ifthenelse{\equal{#4}{}}{}{, {\slshape#4}}%
+    \ifthenelse{\equal{#5}{}}{}{, #5}%
+    \ifthenelse{\equal{#6}{}}{}{, #6}%
+    .%
+    \ifx&#7&%
+      \else{\newline{}\begin{minipage}[t]{\linewidth}\small#7\end{minipage}}\fi}}
+
+\newbox{\cvitemwithcommentmainbox}
+\newlength{\cvitemwithcommentmainlength}
+\newlength{\cvitemwithcommentcommentlength}
+\renewcommand*{\cvitemwithcomment}[4][.25em]{%
+  \savebox{\cvitemwithcommentmainbox}{{\bfseries#3}}%
+  \setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%
+  \setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}%
+  \cvitem[#1]{#2}{%
+    \begin{minipage}[t]{\cvitemwithcommentmainlength}\textbf{#3}\end{minipage}%
+    \hfill% fill of \separatorcolumnwidth
+    \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}}}
+
+\renewenvironment{thebibliography}[1]%
+  {%
+    \bibliographyhead{\refname}%
+    \small%
+    \begin{list}{\bibliographyitemlabel}%
+      {%
+        \setlength{\topsep}{0pt}%
+        \setlength{\labelwidth}{\hintscolumnwidth}%
+        \setlength{\labelsep}{\separatorcolumnwidth}%
+        \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 `moderncvstyleclassic.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
index e2c7d59e884..ced1bc66a06 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
@@ -1,4 +1,4 @@
-%% start of file `moderncvthemeempty.sty'.
+%% start of file `moderncvstyleempty.sty'.
 %% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com).
 %
 % This work may be distributed and/or modified under the
@@ -10,7 +10,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvthemeempty}[2011/12/04 v0.14 modern curriculum vitae style: empty]
+\ProvidesPackage{moderncvstyleempty}[2011/12/19 v0.15 modern curriculum vitae scheme: empty]
 
 
 %-------------------------------------------------------------------------------
@@ -21,23 +21,14 @@
 %-------------------------------------------------------------------------------
 %                package options
 %-------------------------------------------------------------------------------
-% unused options
-\DeclareOption*{
-  \PackageWarning{moderncvthemeempty}{Unknown option ‘\CurrentOption’}}
-
-% execute default options
-\ExecuteOptions{}
-
-% process given options
-\ProcessOptions\relax
 
 
 %-------------------------------------------------------------------------------
 %                style definition
 %-------------------------------------------------------------------------------
-
+% see moderncv.cls for command declarations that needs to be implemented, e.g. \maketitle, \section, \subsections, \cvline, etc
 
 \endinput
 
 
-%% end of file `moderncvthemeempty.sty'.
+%% end of file `moderncvstyleempty.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
new file mode 100644
index 00000000000..1566eded6e0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
@@ -0,0 +1,234 @@
+%% start of file `moderncvstyleoldstyle.sty'.
+%% Copyright 2006-2011 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{moderncvstyleoldstyle}[2011/12/19 v0.15 modern curriculum vitae style: oldstyle]
+
+
+%-------------------------------------------------------------------------------
+%                required packages
+%-------------------------------------------------------------------------------
+
+
+%-------------------------------------------------------------------------------
+%                package options
+%-------------------------------------------------------------------------------
+
+
+%-------------------------------------------------------------------------------
+%                style definition
+%-------------------------------------------------------------------------------
+% fonts
+\IfFileExists{kurier.sty}
+  {\RequirePackage[light,math]{kurier}}
+  {}
+\renewcommand*{\namefont}{\fontsize{34}{36}\mdseries\upshape}
+\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
+\renewcommand*{\addressfont}{\small\mdseries}
+\renewcommand*{\quotefont}{\large\itshape}
+\renewcommand*{\sectionfont}{\Large\bfseries\upshape}
+\renewcommand*{\subsectionfont}{\large\bfseries\itshape}
+\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}}
+
+% symbols
+\renewcommand*{\listitemsymbol}{\labelitemi~}
+\renewcommand*{\addresssymbol}{}
+\renewcommand*{\mobilesymbol}{\textbf{M}~}
+\renewcommand*{\phonesymbol}{\textbf{T}~}
+\renewcommand*{\faxsymbol}{\textbf{F}~}
+\renewcommand*{\emailsymbol}{\textbf{E}~}
+\renewcommand*{\homepagesymbol}{}
+
+% 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-\hintscolumnwidth-\separatorcolumnwidth}%
+  % 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}}
+
+\newcommand{\makeinfo}[1]{%
+  \newbox{\makeinfobox}%
+  \savebox{\makeinfobox}{\parbox[b]{\hintscolumnwidth}{\if@DEBUG\rule{20cm}{.1pt}\\\fi#1}}%
+  \newlength{\makeinfoheight}%
+  \setlength{\makeinfoheight}{\totalheightof{\usebox{\makeinfobox}}}% the total height of the parbox is the sum of its height (\the\ht\makeinfobox) and its depth (\the\dp\makeinfobox); the \totalheightof command is provided by the "calc" package
+  \usebox{\makeinfobox}\vspace*{-\makeinfoheight}%
+  \newlength{\leftcolumnwidth}%
+  \setlength{\leftcolumnwidth}{\hintscolumnwidth+\separatorcolumnwidth}
+  \par\nointerlineskip\vspace*{-\parskip}\vspace*{-2.5ex}\leftskip=\leftcolumnwidth\if@DEBUG\rule{20cm}{.1pt}\fi}% the -2.5ex vertical slip is to counter the 2.5ex skip of sections
+
+\newif\if@firstdetailselement\@firstdetailselementtrue
+\newcommand*{\maketitledetailsnewline}{
+  \if@firstdetailselement%
+  \else%
+    \\[.2em]\fi%
+  \@firstdetailselementfalse%
+  \addressfont\color{color2}}
+\renewcommand*{\maketitle}{
+  % optional picture box
+  \newbox{\maketitlepicturebox}%
+  \savebox{\maketitlepicturebox}{%
+    \ifthenelse{\isundefined{\@photo}}%
+    {}%
+    {%
+      \color{color1}%
+      \setlength\fboxrule{\@photoframewidth}%
+      \ifdim\@photoframewidth=0pt%
+        \setlength{\fboxsep}{0pt}\fi%
+      \framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
+  % name and title
+  \newlength{\maketitlepicturewidth}\settowidth{\maketitlepicturewidth}{\usebox{\maketitlepicturebox}}%
+  \newlength{\maketitlenamewidth}\setlength{\maketitlenamewidth}{\textwidth-\maketitlepicturewidth}%
+  \begin{minipage}[b]{\maketitlenamewidth}%
+    \namestyle{\@firstname\ \@familyname}%
+    \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
+  \end{minipage}%
+  % optional photo
+  \usebox{\maketitlepicturebox}\\[3em]%
+   % optional quote
+  \ifthenelse{\isundefined{\@quote}}%
+    {}%
+    {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
+  % optional details
+  \makeinfo{%
+    \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
+    \ifthenelse{\isundefined{\@addresscity}}{}{\maketitledetailsnewline\@addresscity}%
+    \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol\@mobile}%
+    \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol\@phone}%
+    \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol\@fax}%
+    \ifthenelse{\isundefined{\@email}}{}{\maketitledetailsnewline\emailsymbol\emaillink{\@email}}%
+    \ifthenelse{\isundefined{\@homepage}}{}{\maketitledetailsnewline\homepagesymbol\httplink{\@homepage}}%
+    \ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}}}
+
+\renewcommand*{\section}[1]{%
+  \vspace*{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)
+
+\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...)
+
+\renewcommand*{\cvitem}[3][.25em]{%
+  \ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }{#3}\\[#1]}
+
+\renewcommand*{\cvdoubleitem}[5][.25em]{%
+  \begin{minipage}[t]{\doubleitemcolumnwidth}{\hintfont#2}: #3\end{minipage}%
+  \hfill% fill of \separatorcolumnwidth
+  \begin{minipage}[t]{\doubleitemcolumnwidth}{\hintfont#4}: #5\end{minipage}\\[#1]}
+
+\renewcommand*{\cvlistitem}[2][.25em]{%
+  \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}}
+
+\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}}}}
+
+\newbox{\cventryyearbox}
+\newlength{\cventrytitleboxwidth}
+\renewcommand*{\cventry}[7][.25em]{%
+  \savebox{\cventryyearbox}{%
+    \hspace*{\separatorcolumnwidth}%
+    {\hintfont#2}}%
+  \setlength{\cventrytitleboxwidth}{\widthof{\usebox{\cventryyearbox}}}%
+  \setlength{\cventrytitleboxwidth}{\maincolumnwidth-\cventrytitleboxwidth}%
+  \begin{minipage}{\maincolumnwidth}%
+    \parbox[t]{\cventrytitleboxwidth}{%
+      {\bfseries#3}%
+      \ifthenelse{\equal{#4}{}}{}{, {\slshape#4}}%
+      \ifthenelse{\equal{#5}{}}{}{, #5}%
+      \ifthenelse{\equal{#6}{}}{}{, #6}%
+      .}%
+    \usebox{\cventryyearbox}%
+    \ifx&#7&%
+    \else{%
+      \newline{}\begin{minipage}[t]{\maincolumnwidth}\small#7\end{minipage}}\fi%
+  \end{minipage}\\[#1]}
+
+
+\newbox{\cvitemwithcommentmainbox}
+\newlength{\cvitemwithcommentmainlength}
+\newlength{\cvitemwithcommentcommentlength}
+\renewcommand*{\cvitemwithcomment}[4][.25em]{%
+  \savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }#3}%
+  \setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%
+  \setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}%
+  \begin{minipage}[t]{\cvitemwithcommentmainlength}\ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }#3\end{minipage}%
+  \hfill% fill of \separatorcolumnwidth
+  \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}\\[#1]}
+
+\renewenvironment{thebibliography}[1]%
+  {%
+    \bibliographyhead{\refname}%
+    \small%
+    \begin{list}{\bibliographyitemlabel}%
+      {%
+        \setlength{\topsep}{0pt}%
+        \setlength{\labelwidth}{\hintscolumnwidth}%
+        \setlength{\labelsep}{\separatorcolumnwidth}%
+        \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 `moderncvstyleoldstyle.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
deleted file mode 100644
index 77cd1b58139..00000000000
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
+++ /dev/null
@@ -1,177 +0,0 @@
-%% start of file `moderncvthemecasual.sty'.
-%% Copyright 2006-2011 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{moderncvthemecasual}[2011/12/04 v0.14 modern curriculum vitae style: casual]
-
-
-%-------------------------------------------------------------------------------
-%                required packages
-%-------------------------------------------------------------------------------
-
-
-%-------------------------------------------------------------------------------
-%                package options
-%-------------------------------------------------------------------------------
-% color options
-% blue (default option)
-\DeclareOption{blue}{}
-% orange
-\newif\if@colororange\@colororangefalse
-\DeclareOption{orange}{\@colororangetrue}
-% green
-\newif\if@colorgreen\@colorgreenfalse
-\DeclareOption{green}{\@colorgreentrue}
-% red
-\newif\if@colorred\@colorredfalse
-\DeclareOption{red}{\@colorredtrue}
-% purple
-\newif\if@colorpurple\@colorpurplefalse
-\DeclareOption{purple}{\@colorpurpletrue}
-% grey
-\newif\if@colorgrey\@colorgreyfalse
-\DeclareOption{grey}{\@colorgreytrue}
-% black
-\newif\if@colorblack\@colorblackfalse
-\DeclareOption{black}{\@colorblacktrue}
-
-% roman option
-\newif\if@roman\@romanfalse
-\DeclareOption{roman}{\@romantrue}
-
-% unused options
-\DeclareOption*{
-  \PackageWarning{moderncvthemecasual}{Unknown option ‘\CurrentOption’}}
-
-% execute default options
-\ExecuteOptions{}
-
-% process given options
-\ProcessOptions\relax
-
-
-%-------------------------------------------------------------------------------
-%                style definition
-%-------------------------------------------------------------------------------
-% symbols used
-
-% colors
-\definecolor{firstnamecolor}{rgb}{0.65,0.65,0.65}
-\definecolor{familynamecolor}{rgb}{0.45,0.45,0.45}
-\definecolor{quotecolor}{rgb}{0.35,0.35,0.35}
-\definecolor{addresscolor}{rgb}{0.35,0.35,0.35}
-% default blue color
-  \definecolor{sectionrectanglecolor}{rgb}{0.25,0.50,0.75}
-  \definecolor{sectiontitlecolor}{rgb}{0.20,0.40,0.65}
-  \definecolor{subsectioncolor}{rgb}{0.20,0.40,0.65}
-  \definecolor{footersymbolcolor}{rgb}{0.25,0.50,0.75}
-\if@colororange
-  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.65,0.20}
-  \definecolor{sectiontitlecolor}{rgb}{0.95,0.55,0.15}
-  \definecolor{subsectioncolor}{rgb}{0.95,0.55,0.15}
-  \definecolor{footersymbolcolor}{rgb}{0.95,0.55,0.15}\fi
-\if@colorgreen
-  \definecolor{sectionrectanglecolor}{rgb}{0.55,0.85,0.35}
-  \definecolor{sectiontitlecolor}{rgb}{0.30,0.65,0.15}
-  \definecolor{subsectioncolor}{rgb}{0.30,0.65,0.15}
-  \definecolor{footersymbolcolor}{rgb}{0.30,0.65,0.15}\fi
-\if@colorred
-  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30}
-  \definecolor{sectiontitlecolor}{rgb}{0.95,0.20,0.20}
-  \definecolor{subsectioncolor}{rgb}{0.95,0.20,0.20}
-  \definecolor{footersymbolcolor}{rgb}{0.95,0.20,0.20}\fi
-\if@colorpurple
-  \definecolor{sectionrectanglecolor}{rgb}{0.40,0.23,0.80}
-  \definecolor{sectiontitlecolor}{rgb}{0.50,0.33,0.80}
-  \definecolor{subsectioncolor}{rgb}{0.50,0.33,0.80}
-  \definecolor{addresscolor}{rgb}{0.40,0.23,0.70}\fi
-\if@colorgrey
-  \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75}
-  \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35}
-  \definecolor{subsectioncolor}{rgb}{0.35,0.35,0.35}
-  \definecolor{footersymbolcolor}{rgb}{0.35,0.35,0.35}\fi
-\if@colorblack
-  \definecolor{firstnamecolor}{rgb}{0,0,0}
-  \definecolor{familynamecolor}{rgb}{0,0,0}
-  \definecolor{quotecolor}{rgb}{0,0,0}
-  \definecolor{addresscolor}{rgb}{0,0,0}
-  \definecolor{sectionrectanglecolor}{rgb}{0,0,0}
-  \definecolor{sectiontitlecolor}{rgb}{0,0,0}
-  \definecolor{subsectioncolor}{rgb}{0,0,0}
-  \definecolor{footersymbolcolor}{rgb}{0,0,0}\fi
-
-% fonts
-\if@roman
-  \AtBeginDocument{\rmfamily}
-\else
-  \AtBeginDocument{\sffamily}\fi
-\renewcommand*{\ttdefault}{pcr}
-\renewcommand*{\firstnamefont}{\fontsize{38}{40}\sffamily\mdseries\upshape}
-\renewcommand*{\familynamefont}{\firstnamefont}
-\renewcommand*{\addressfont}{\normalsize\sffamily\mdseries\slshape}
-\renewcommand*{\quotefont}{\large\slshape}
-\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape}
-\renewcommand*{\subsectionfont}{\large\sffamily\mdseries\upshape}
-
-% styles
-
-% cv footer
-\newif\if@firstfooterelement\@firstfooterelementtrue
-\providecommand*{\footersymbol}{}
-\renewcommand*{\footersymbol}{%
-  \if@firstfooterelement%
-  \else%
-    { ~~\color{footersymbolcolor}\textbullet~~~}\fi}
-\renewcommand*{\makefooter}{%
-  \fancypagestyle{plain}{%
-    \fancyfoot[c]{%
-      \parbox{0.8\textwidth}{%
-      \centering%
-      \addressfont\color{addresscolor}%
-      \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}}}%
-  }%
-  \pagestyle{plain}}
-
-% maketitle
-\renewcommand*{\maketitle}{%
-  \makefooter{}%
-  {%
-    \ifthenelse{\isundefined{\@photo}}%
-      {}%
-      {%
-      \setlength\fboxrule{\@photoframewidth}%
-        \ifdim\@photoframewidth=0pt%
-          \setlength{\fboxsep}{0pt}\fi%
-        {\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}%
-    \hfill%
-%    \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
-    \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}%
-  {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[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
-
-
-\endinput
-
-
-%% end of file `moderncvthemecasual.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
deleted file mode 100644
index 799851a5f2a..00000000000
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
+++ /dev/null
@@ -1,199 +0,0 @@
-%% start of file `moderncvthemeclassic.sty'.
-%% Copyright 2006-2011 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{moderncvthemeclassic}[2011/12/04 v0.14 modern curriculum vitae style: classic]
-
-
-%-------------------------------------------------------------------------------
-%                required packages
-%-------------------------------------------------------------------------------
-
-
-%-------------------------------------------------------------------------------
-%                package options
-%-------------------------------------------------------------------------------
-% color options
-% blue (default option)
-\DeclareOption{blue}{}
-% orange
-\newif\if@colororange\@colororangefalse
-\DeclareOption{orange}{\@colororangetrue}
-% green
-\newif\if@colorgreen\@colorgreenfalse
-\DeclareOption{green}{\@colorgreentrue}
-% red
-\newif\if@colorred\@colorredfalse
-\DeclareOption{red}{\@colorredtrue}
-% purple
-\newif\if@colorpurple\@colorpurplefalse
-\DeclareOption{purple}{\@colorpurpletrue}
-% grey
-\newif\if@colorgrey\@colorgreyfalse
-\DeclareOption{grey}{\@colorgreytrue}
-% black
-\newif\if@colorblack\@colorblackfalse
-\DeclareOption{black}{\@colorblacktrue}
-
-% roman option
-\newif\if@roman\@romanfalse
-\DeclareOption{roman}{\@romantrue}
-
-% unused options
-\DeclareOption*{
-  \PackageWarning{moderncvthemeclassic}{Unknown option ‘\CurrentOption’}}
-
-% execute default options
-\ExecuteOptions{}
-
-% process given options
-\ProcessOptions\relax
-
-
-%-------------------------------------------------------------------------------
-%                style definition
-%-------------------------------------------------------------------------------
-% symbols used
-
-% colors
-\definecolor{firstnamecolor}{rgb}{0,0,0}
-\definecolor{familynamecolor}{rgb}{0,0,0}
-\definecolor{titlecolor}{rgb}{0.35,0.35,0.35}
-\definecolor{quotecolor}{rgb}{0.35,0.35,0.35}
-% default blue color
-  \definecolor{addresscolor}{rgb}{0.25,0.5,0.75}
-  \definecolor{sectionrectanglecolor}{rgb}{0.25,0.5,0.75}
-  \definecolor{sectiontitlecolor}{rgb}{0.2,0.4,0.65}
-  \definecolor{subsectioncolor}{rgb}{0.2,0.4,0.65}
-\if@colororange
-  \definecolor{addresscolor}{rgb}{0.95,0.55,0.15}
-  \definecolor{sectionrectanglecolor}{rgb}{1,0.65,0.20}
-  \definecolor{sectiontitlecolor}{rgb}{0.95,0.55,0.15}
-  \definecolor{subsectioncolor}{rgb}{0.95,0.55,0.15}\fi
-\if@colorgreen
-  \definecolor{addresscolor}{rgb}{0.30,0.65,0.15}
-  \definecolor{sectionrectanglecolor}{rgb}{0.55,0.85,0.35}
-  \definecolor{sectiontitlecolor}{rgb}{0.30,0.65,0.15}
-  \definecolor{subsectioncolor}{rgb}{0.30,0.65,0.15}\fi
-\if@colorred
-  \definecolor{addresscolor}{rgb}{0.95,0.20,0.20}
-  \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30}
-  \definecolor{sectiontitlecolor}{rgb}{0.95,0.20,0.20}
-  \definecolor{subsectioncolor}{rgb}{0.95,0.20,0.20}\fi
-\if@colorpurple
-  \definecolor{sectionrectanglecolor}{rgb}{0.40,0.23,0.80}
-  \definecolor{sectiontitlecolor}{rgb}{0.50,0.33,0.80}
-  \definecolor{subsectioncolor}{rgb}{0.50,0.33,0.80}
-  \definecolor{addresscolor}{rgb}{0.40,0.23,0.70}\fi
-\if@colorgrey
-  \definecolor{addresscolor}{rgb}{0.35,0.35,0.35}
-  \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75}
-  \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35}
-  \definecolor{subsectioncolor}{rgb}{0.35,0.35,0.35}\fi
-\if@colorblack
-  \definecolor{titlecolor}{rgb}{0,0,0}
-  \definecolor{quotecolor}{rgb}{0,0,0}
-  \definecolor{addresscolor}{rgb}{0,0,0}
-  \definecolor{sectionrectanglecolor}{rgb}{0,0,0}
-  \definecolor{sectiontitlecolor}{rgb}{0,0,0}
-  \definecolor{subsectioncolor}{rgb}{0,0,0}\fi
-
-% fonts
-\if@roman
-  \AtBeginDocument{\rmfamily}
-\else
-  \AtBeginDocument{\sffamily}\fi
-\renewcommand*{\ttdefault}{pcr}
-\renewcommand*{\firstnamefont}{\fontsize{34}{36}\sffamily\mdseries\upshape}
-\renewcommand*{\titlefont}{\LARGE\sffamily\mdseries\slshape}
-\renewcommand*{\addressfont}{\normalsize\rmfamily\mdseries\slshape}
-\renewcommand*{\familynamefont}{\firstnamefont}
-\renewcommand*{\quotefont}{\large\slshape}
-\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape}
-\renewcommand*{\subsectionfont}{\large\sffamily\mdseries\upshape}
-
-% styles
-
-% maketitle
-%   set \maketitlenamewidth to the desired length, or leave it up to moderncv to try to optimize it
-\newlength{\maketitlenamemaxwidth}
-\setlength{\maketitlenamemaxwidth}{.525\textwidth}
-\newlength{\maketitlenamewidth}
-\setlength{\maketitlenamewidth}{0pt}
-\newlength{\maketitlepicturewidth}
-\newlength{\maketitledetailswidth}
-%   recompute theme-specific lengths, called by class to recompute all lengths
-\renewcommand*{\recomputethemelengths}{%
-  \setlength{\maketitledetailswidth}{\textwidth}%
-  \addtolength{\maketitledetailswidth}{-\maketitlenamewidth}%
-  \ifthenelse{\isundefined{\@photo}}%
-  	{}%
-  	{\setlength{\maketitlepicturewidth}{\@photowidth}
-  	\addtolength{\maketitledetailswidth}{-\separatorcolumnwidth}%
-  	\addtolength{\maketitledetailswidth}{-\maketitlepicturewidth}}}
-\newif\if@firstdetailselement\@firstdetailselementtrue
-\newcommand*{\maketitledetailsnewline}{
-  \if@firstdetailselement%
-    \@firstdetailselementfalse%
-  \else%
-    \\[.2em]\fi}
-\renewcommand*{\maketitle}{%
-  % recompute lengths (necessary to delay the computation of \maketitlenamefullwidth until \maketitle because of potential CJK requirement in \@firstname and \@familyname)
-  \ifdim\maketitlenamewidth=0pt%
-    \newlength{\maketitlenamefullwidth}%
-    \settowidth{\maketitlenamefullwidth}{\firstnamestyle{\@firstname~}\familynamestyle{\@familyname}}%
-    \ifnum\maketitlenamemaxwidth<\maketitlenamefullwidth%
-      \setlength{\maketitlenamewidth}{\maketitlenamemaxwidth}%
-    \else%
-      \setlength{\maketitlenamewidth}{\maketitlenamefullwidth}\fi\fi
-  \recomputethemelengths{}%
-  % name and title
-  \begin{minipage}[b]{\maketitlenamewidth}%
-    \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}%
-    \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
-  \end{minipage}%
-  % optional data
-  \begin{minipage}[b]{\maketitledetailswidth}%
-    \raggedleft\addressfont\color{addresscolor}%
-    \ifthenelse{\isundefined{\@addressstreet}}{}{%
-      \maketitledetailsnewline%
-      \addresssymbol~\@addressstreet%
-      \ifthenelse{\isundefined{\@addresscity}}{}{\\\@addresscity}}%
-    \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol~\@mobile}%
-    \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol~\@phone}%
-    \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol~\@fax}%
-    \ifthenelse{\isundefined{\@email}}{}{\maketitledetailsnewline\emailsymbol~\emaillink{\@email}}%
-    \ifthenelse{\isundefined{\@homepage}}{}{\maketitledetailsnewline\homepagesymbol~\httplink{\@homepage}}%
-    \ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}%
-  \end{minipage}%
-  % optional photo
-  \ifthenelse{\isundefined{\@photo}}%
-    {}%
-    {%
-      \hspace*{\separatorcolumnwidth}%
-      \begin{minipage}[b]{\maketitlepicturewidth}%
-        \raggedleft{}\addressfont\color{addresscolor}% required to correctly align content
-        \setlength\fboxrule{\@photoframewidth}%
-        \ifdim\@photoframewidth=0pt%
-          \setlength{\fboxsep}{0pt}\fi%
-        \framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}%
-      \end{minipage}}\\[3em]%
-  % optional quote
-  \ifthenelse{\isundefined{\@quote}}%
-    {}%
-    {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
-  }
-
-
-\endinput
-
-
-%% end of file `moderncvthemeclassic.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty b/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
index 096bc3f4590..adc93989326 100644
--- a/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/tweaklist.sty
@@ -33,8 +33,10 @@
       \expandafter
       \list
         \csname label\@enumctr\endcsname
-        {\usecounter\@enumctr\def\makelabel##1{\hss\llap{##1}}%
-          \enumhook \csname enumhook\romannumeral\the\@enumdepth\endcsname}%
+        {%
+          \enumhook \csname enumhook\romannumeral\the\@enumdepth\endcsname%
+          \usecounter\@enumctr\def\makelabel##1{\hss\llap{##1}}%
+        }%
   \fi}
 \def\itemize{%
   \ifnum \@itemdepth >\thr@@\@toodeep\else
@@ -43,10 +45,12 @@
     \expandafter
     \list
       \csname\@itemitem\endcsname
-      {\def\makelabel##1{\hss\llap{##1}}%
-        \itemhook \csname itemhook\romannumeral\the\@itemdepth\endcsname}%
+      {%
+        \itemhook \csname itemhook\romannumeral\the\@itemdepth\endcsname%
+        \def\makelabel##1{\hss\llap{##1}}%
+      }%
   \fi}
 \newenvironment{description}
-  {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-           \let\makelabel\descriptionlabel\deschook}}
+  {\list{}{\deschook\labelwidth\z@ \itemindent-\leftmargin
+           \let\makelabel\descriptionlabel}}
   {\endlist}