summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/CHANGELOG14
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS4
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/README6
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.pdfbin147364 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.tex112
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.pdfbin177177 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.tex112
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/jdoe_publications.bib48
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/letter.pdfbin0 -> 70696 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/letter.tex96
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/picture.eps (renamed from Master/texmf-dist/doc/latex/moderncv/examples/jdoe_picture.eps)0
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/picture.jpg (renamed from Master/texmf-dist/doc/latex/moderncv/examples/jdoe_picture.jpg)bin1693 -> 1693 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/publications.bib24
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex96
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdfbin0 -> 150303 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdfbin0 -> 216856 bytes
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls159
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty10
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty121
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty108
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty153
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty149
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty (renamed from Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty)10
-rw-r--r--Master/texmf-dist/tpm/moderncv.tpm27
-rw-r--r--Master/texmf/lists/moderncv21
25 files changed, 656 insertions, 614 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index 8869f5b9512..8c0e49a8b53 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,3 +1,17 @@
+version 0.6 (28 May 2007)
+ - corrected some spacing bugs and cleaned up the code.
+ - corrected a bug in the bibliography file of the examples spotted by
+ U. Stöhr.
+ - added color variants to the classic and casual style, as suggested by
+ U. Stöhr.
+ - added a requested by A. Martin.
+ - added commands to include a mobile phone and fax number.
+ - made the symbols used for the phone number, the email, ... customizable.
+ To modify those symbols, just redefine \phonesymbol, emailsymbol, ...
+ - corrected the pdf information given to hyperref as pointed out by
+ C. Knuepfer.
+ - rewrote the examples.
+
version 0.5 (9 September 2006)
- added a \photo command to display a picture. That command takes the name of
the file with the picture as argument, and the desired height as optional
diff --git a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
index b78d7a63ca4..061bf42fb21 100644
--- a/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
+++ b/Master/texmf-dist/doc/latex/moderncv/KNOWN_BUGS
@@ -1,5 +1,3 @@
-- Inside the last argument of \cventry, used to display some complementary
-information of an entry, the command "\\" doesn't seem to work, while "\newline"
-works perfectly. I have no idea why...
+- moderncv doesn't work with natbib
- The \cvsection command seems to be unable to handle a Chinese argument, using
CJK.
diff --git a/Master/texmf-dist/doc/latex/moderncv/README b/Master/texmf-dist/doc/latex/moderncv/README
index ea86341a133..98bd8421fd2 100644
--- a/Master/texmf-dist/doc/latex/moderncv/README
+++ b/Master/texmf-dist/doc/latex/moderncv/README
@@ -12,12 +12,10 @@ commands like:
\maketitle,
but also defines its own special commands:
\cventry,
- \makequote,
\firstname,
\familyname,
...
-All the commands are defined in such a way that the arguments are always
-optional.
+Most commands are defined in such a way that the arguments are optional.
Documents can be compiled into dvi, ps or pdf.
@@ -26,4 +24,4 @@ directory for some examples.
Author: Xavier Danaux <xdanaux@gmail.com>
-Date: 09 September 2006
+Date: 28 May 2007
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.pdf
deleted file mode 100644
index 89c83cadc6e..00000000000
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.tex b/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.tex
deleted file mode 100644
index 397b3244bc0..00000000000
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_casual.tex
+++ /dev/null
@@ -1,112 +0,0 @@
-%% start of file `jdoe_casual.tex'.
-%% Copyright 2006 Xavier Danaux.
-%
-% 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/.
-
-
-\documentclass[11pt]{moderncv}
-
-% moderncv styles
-\moderncvstyle{casual} % optional argument are 'nocolor' (black & white cv) and 'roman' (for roman fonts, instead of sans serif fonts)
-%\moderncvstyle{classic} % idem
-
-% character encoding
-\usepackage[utf8]{inputenc} % replace by the encoding you are using
-
-% personal data (the given example is exhaustive; just give what you want)
-\firstname{John}
-\familyname{Doe}
-\title{Design enthusiast\dots}
-%\address{12 somestreet\\3456 somecity} % for classic style
-\address{12 somestreet, 3456 somecity} % for casual style
-\phone{+12 (3)456 78 90}
-\email{jdoe@design.org}
-\extrainfo{\weblink{www.ctan.org}}
-\photo[64pt]{jdoe_picture} % also optional, and the optional argument is the height the picture must be resized to
-\quote{Any intelligent fool can make things bigger, more complex, and more violent. It takes a touch of genius -- and a lot of courage -- to move in the opposite direction.}% also optional
-
-%\renewcommand{\listsymbol}{{\fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}}} % define another symbol to be used in front of the list items
-
-% the ConTeXt symbol
-\def\ConTeXt{%
- C%
- \kern-.0333emo%
- \kern-.0333emn%
- \kern-.0667em\TeX%
- \kern-.0333emt}
-
-% slanted small caps (only with roman family; the sans serif font doesn't exists :-()
-%\usepackage{slantsc}
-%\DeclareFontFamily{T1}{myfont}{}
-%\DeclareFontShape{T1}{myfont}{m}{scsl}{ <-> cork-lmssqbo8}{}
-%\usefont{T1}{myfont}{m}{scsl}Testing the font
-
-% command and color used in this document, independently from moderncv
-\definecolor{see}{rgb}{0.5,0.5,0.5}% for web links
-\newcommand{\up}[1]{\ensuremath{^\textsf{\scriptsize#1}}}% for text subscripts
-
-%----------------------------------------------------------------------------------
-% content
-%----------------------------------------------------------------------------------
-\begin{document}
-\maketitle
-\makequote
-
-\section{Education}
-\cventry{2003--2006}{Master of Design}{Valparezzo School of Design}{}{}{1\up{st} year: 79\%\hspace{2em}2\up{nd} year: 84\%\hspace{2em}3\up{rd} year: ---\hspace{2em}(graduation expected in June 2006)}
-\cventry{2001--2003}{Bachelor of Design}{Beijing Drawing University}{}{}{1\up{st} year: 63\%\hspace{2em}2\up{nd} year: 76\%}
-
-\section{Master thesis}
-\cvitem{title}{\emph{On the design of modern curriculum vit\ae{}s}}
-\cvitem{supervisors}{Pr P. Picasso and Pr G. Klimt}
-\cvitem{description}{\small Study of the complex design of a curriculum vit\ae{}, also known as ``résumé''. In my opinion, a good design needs to be show the personality of its author. Some people will thus prefer a more classic style, and others will be more audacious\dots}
-
-\section{Experience}
-\cventry{February 2006--\\current}{Maintainer of the a CTAN package}{CTAN}{World}{}{Maintainer of the {\ttfamily moderncv} package, meant to ease the production of beautiful curriculum vit\ae{}s.}
-\cventry{2005--2006}{Mathematics tutor}{UCL}{Louvain-la-Neuve}{}{Supervision of practical sessions for a mathematical course given to second year engineering students (course \emph{FSAB1104: Numerical Methods}).\hfill{\itshape\color{see}\footnotesize{}See \httplink{www.legat-online.be/b2q1/num}.}}
-\cventry{2004--2006}{Cultural project leader}{Tchouque-Tschouk Kot}{Louvain-la-Neuve}{}{Leader of a student home with a cultural project, requiring day to day management as well as the organization of public events.\hfill{\itshape\color{see}\footnotesize{}See \httplink{www.organe.be}.}}
-\cventry{1999--2001}{IMO preselected}{SBPMef}{Wépion}{}{Advanced mathematical training, as Belgian preselected candidate for the International Mathematical Olympiads, selected by the Belgian mathematical society.\hfill{\itshape\color{see}\footnotesize{}See \weblink{imo.math.ca/belgium.html}.}}
-
-\section{Languages}
-\cvlanguage{French}{Native}{}
-\cvlanguage{Dutch}{Near-native}{Primary education degree obtained in a Dutch college\\(Sint-Jozefscollege te Sint-Pieters-Woluwe).}
-\cvlanguage{English}{Very good}{Many journeys in English speaking countries, including the United States,\\the United Kingdom and Kenya.}
-\cvlanguage{Mandarin}{Elementary}{Taking classes at the ``Institut des Langues Vivantes'' (UCL), for the second year now.}
-\closesection{}
-\pagebreak{}
-
-\section{Computer skills}
-\cvcomputer{OS}{Linux, Unix, Windows}{administration}{Apache, Mailman}
-\cvcomputer{programming}{\textsc{Java}, C/C++}{scripting}{PHP, Shell, Ruby}
-\cvcomputer{scientific}{Matlab, Autocad, Abaqus}{typography}{\LaTeX, \ConTeXt, Scribus, QuarkXPress}
-\cvcomputer{web design}{XHTML, CSS, AJAX}{database}{MySQL, PostgreSQL}
-
-\section{Interests}
-\cvitem{design}{\small I am a design fan, especially when it comes to typography and photography.}
-\cvitem{adventure sports}{\small I like practicing adventure sports like skiing, rock climbing and scuba diving, and have been a boy scout for five years.}
-\cvitem{travelling}{\small I have been living abroad during my childhood, and love travelling around the world.}
-
-\section{Section with a list}
-\cvlistitem{Single item.}
-\cvlistitem{Another single item.}
-\cvlistdoubleitem{Double\dots{}}{\dots{} item.}
-\cvlistdoubleitem{Another double\dots{}}{\dots{} item.}
-
-\section{Section with your own content}\closesection
-Your content here, inside the normal \LaTeX{} environment. You can use any regular \LaTeX{} command, display mathematics
-\[e =m\,c^2,\]
-put some table or figure, \dots
-
-\emptysection{}
-\cvitem{Now}{Back to moderncv layout, without making a new section :-)}
-
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{jdoe_publications}
-
-\end{document}
-
-
-%% end of file `jdoe_casual.tex'.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.pdf
deleted file mode 100644
index 2b5640ce758..00000000000
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.tex b/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.tex
deleted file mode 100644
index 48edefec6b4..00000000000
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_classic.tex
+++ /dev/null
@@ -1,112 +0,0 @@
-%% start of file `jdoe_classic.tex'.
-%% Copyright 2006 Xavier Danaux.
-%
-% 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/.
-
-
-\documentclass[10pt]{moderncv}
-
-% moderncv styles
-%\moderncvstyle{casual} % optional argument are 'nocolor' (black & white cv) and 'roman' (for roman fonts, instead of sans serif fonts)
-\moderncvstyle{classic} % idem
-
-% character encoding
-\usepackage[utf8]{inputenc} % replace by the encoding you are using
-
-% personal data (the given example is exhaustive; just give what you want)
-\firstname{John}
-\familyname{Doe}
-\title{Design enthusiast\dots}
-\address{12 somestreet\\3456 somecity} % for classic style
-%\address{12 somestreet, 3456 somecity} % for casual style
-\phone{+12 (3)456 78 90}
-\email{jdoe@design.org}
-\extrainfo{\weblink{www.ctan.org}}
-\photo[64pt]{jdoe_picture} % also optional, and the optional argument is the height the picture must be resized to
-\quote{Any intelligent fool can make things bigger, more complex, and more violent. It takes a touch of genius -- and a lot of courage -- to move in the opposite direction.}% also optional
-
-%\renewcommand{\listsymbol}{{\fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}}} % define another symbol to be used in front of the list items
-
-% the ConTeXt symbol
-\def\ConTeXt{%
- C%
- \kern-.0333emo%
- \kern-.0333emn%
- \kern-.0667em\TeX%
- \kern-.0333emt}
-
-% slanted small caps (only with roman family; the sans serif font doesn't exists :-()
-%\usepackage{slantsc}
-%\DeclareFontFamily{T1}{myfont}{}
-%\DeclareFontShape{T1}{myfont}{m}{scsl}{ <-> cork-lmssqbo8}{}
-%\usefont{T1}{myfont}{m}{scsl}Testing the font
-
-% command and color used in this document, independently from moderncv
-\definecolor{see}{rgb}{0.5,0.5,0.5}% for web links
-\newcommand{\up}[1]{\ensuremath{^\textrm{\scriptsize#1}}}% for text subscripts
-
-%----------------------------------------------------------------------------------
-% content
-%----------------------------------------------------------------------------------
-\begin{document}
-\maketitle
-%\makequote
-
-\section{Education}
-\cventry{2003--2006}{Master of Design}{Valparezzo School of Design}{}{}{1\up{st} year: 79\%\hspace{2em}2\up{nd} year: 84\%\hspace{2em}3\up{rd} year: ---\hspace{2em}(graduation expected in June 2006)}
-\cventry{2001--2003}{Bachelor of Design}{Beijing Drawing University}{}{}{1\up{st} year: 63\%\hspace{2em}2\up{nd} year: 76\%}
-
-\section{Master thesis}
-\cvitem{title}{\emph{On the design of modern curriculum vit\ae{}s}}
-\cvitem{supervisors}{Pr P. Picasso and Pr G. Klimt}
-\cvitem{description}{\small Study of the complex design of a curriculum vit\ae{}, also known as ``résumé''. In my opinion, a good design needs to be show the personality of its author. Some people will thus prefer a more classic style, and others will be more audacious\dots}
-
-\section{Experience}
-\cventry{February 2006--\\current}{Maintainer of the a CTAN package}{CTAN}{World}{}{Maintainer of the {\ttfamily moderncv} package, meant to ease the production of beautiful curriculum vit\ae{}s.}
-\cventry{2005--2006}{Mathematics tutor}{UCL}{Louvain-la-Neuve}{}{Supervision of practical sessions for a mathematical course given to second year engineering students (course \emph{FSAB1104: Numerical Methods}).\hfill{\itshape\color{see}\footnotesize{}See \httplink{www.legat-online.be/b2q1/num}.}}
-\cventry{2004--2006}{Cultural project leader}{Tchouque-Tschouk Kot}{Louvain-la-Neuve}{}{Leader of a student home with a cultural project, requiring day to day management as well as the organization of public events.\hfill{\itshape\color{see}\footnotesize{}See \httplink{www.organe.be}.}}
-\cventry{1999--2001}{IMO preselected}{SBPMef}{Wépion}{}{Advanced mathematical training, as Belgian preselected candidate for the International Mathematical Olympiads, selected by the Belgian mathematical society.\hfill{\itshape\color{see}\footnotesize{}See \weblink{imo.math.ca/belgium.html}.}}
-
-\section{Languages}
-\cvlanguage{French}{Native}{}
-\cvlanguage{Dutch}{Near-native}{Primary education degree obtained in a Dutch college\\(Sint-Jozefscollege te Sint-Pieters-Woluwe).}
-\cvlanguage{English}{Very good}{Many journeys in English speaking countries, including the United States,\\the United Kingdom and Kenya.}
-\cvlanguage{Mandarin}{Elementary}{Taking classes at the ``Institut des Langues Vivantes'' (UCL), for the second year now.}
-\closesection{}
-\pagebreak{}
-
-\section{Computer skills}
-\cvcomputer{OS}{Linux, Unix, Windows}{administration}{Apache, Mailman}
-\cvcomputer{programming}{\textsc{Java}, C/C++}{scripting}{PHP, Shell, Ruby}
-\cvcomputer{scientific}{Matlab, Autocad, Abaqus}{typography}{\LaTeX, \ConTeXt, Scribus, QuarkXPress}
-\cvcomputer{web design}{XHTML, CSS, AJAX}{database}{MySQL, PostgreSQL}
-
-\section{Interests}
-\cvitem{design}{\small I am a design fan, especially when it comes to typography and photography.}
-\cvitem{adventure sports}{\small I like practicing adventure sports like skiing, rock climbing and scuba diving, and have been a boy scout for five years.}
-\cvitem{travelling}{\small I have been living abroad during my childhood, and love travelling around the world.}
-
-\section{Section with a list}
-\cvlistitem{Single item.}
-\cvlistitem{Another single item.}
-\cvlistdoubleitem{Double\dots{}}{\dots{} item.}
-\cvlistdoubleitem{Another double\dots{}}{\dots{} item.}
-
-\section{Section with your own content}\closesection
-Your content here, inside the normal \LaTeX{} environment. You can use any regular \LaTeX{} command, display mathematics
-\[e =m\,c^2,\]
-put some table or figure, \dots
-
-\emptysection{}
-\cvitem{Now}{Back to moderncv layout, without making a new section :-)}
-
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{jdoe_publications}
-
-\end{document}
-
-
-%% end of file `jdoe_classic.tex'.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_publications.bib b/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_publications.bib
deleted file mode 100644
index 3aaec5b6102..00000000000
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_publications.bib
+++ /dev/null
@@ -1,48 +0,0 @@
-%% start of file `jdoe_publications.bib'.
-%% Copyright 2006 Xavier Danaux.
-%
-% 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/.
-
-
-@BOOK{Parkin2005,
- author = {Scott Pakin},
- title = {The Comprehensive \LaTeX{} Symbol List},
- year = {2005},
-}
-
-@BOOK{Bird1987,
- title = {Dynamics of polymeric liquids},
- publisher = {John Wiley \& Sons, New York},
- year = {1987},
- author = {R. Byron Bird and C. F. Curtiss and Robert C. Armstrong and Ole Hassager},
-}
-
-@ARTICLE{DesCloizeaux1988,
- author = {J. Des~Cloizeaux},
- title = {Double reptation vs simple reptation in polymer melts},
- journal = {J.~Europhys.~Lett.},
- year = {1988},
- volume = {5},
- pages = {437-442},
-}
-
-@ARTICLE{deGennes1971,
- author = {P. G. de~Gennes},
- title = {Reptation of a polymer chain in the presence of fixed obstacles},
- journal = {J. Chem. Phys},
- year = {1971},
- volume = {55},
- pages = {572-579},
-}
-
-@BOOK{Doi1986,
- title = {The theory of polymer dynamics},
- publisher = {Oxford University Press},
- year = {1986},
- author = {Masao Doi and S. F. Edwards},
-}
-
-
-%% end of file `jdoe_publications.bib'. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/letter.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/letter.pdf
new file mode 100644
index 00000000000..b21aed75eca
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/letter.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex b/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex
new file mode 100644
index 00000000000..bb613b0ee73
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex
@@ -0,0 +1,96 @@
+\documentclass[11pt]{article}
+
+
+\usepackage[utf8x]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{marvosym}
+\usepackage{ifpdf}
+\ifpdf
+ \usepackage[pdftex]{graphicx}
+\else
+ \usepackage[dvips]{graphicx}\fi
+
+\pagestyle{empty}
+
+\usepackage[scale=0.775]{geometry}
+\setlength{\parindent}{0pt}
+\addtolength{\parskip}{6pt}
+
+\def\firstname{John}
+\def\familyname{Doe}
+\def\FileAuthor{\firstname \familyname}
+\def\FileTitle{\firstname \familyname's cover letter}
+\def\FileSubject{Cover letter}
+\def\FileKeyWords{\firstname \familyname, Cover letter}
+
+\renewcommand{\ttdefault}{pcr}
+
+\usepackage{url}
+\urlstyle{tt}
+\ifpdf
+ \usepackage[pdftex,pdfborder=0,breaklinks,baseurl=http://,pdfpagemode=None,pdfstartview=XYZ,pdfstartpage=1]{hyperref}
+ \hypersetup{
+ pdfauthor = \FileAuthor,%
+ pdftitle = \FileTitle,%
+ pdfsubject = \FileSubject,%
+ pdfkeywords = \FileKeyWords,%
+ pdfcreator = \LaTeX,%
+ pdfproducer = \LaTeX}
+\else
+ \usepackage[dvips]{hyperref}
+\fi
+
+
+\begin{document}
+\sffamily % for use with a résumé using sans serif fonts;
+%\rmfamily % for use with a résumé using serif fonts;
+\hfill%
+\begin{minipage}[t]{.6\textwidth}
+\raggedleft%
+{\bfseries John Doe}\\[.35ex]
+\small\itshape%
+street and number\\
+postcode city\\[.35ex]
+\Telefon~phone number\\
+\Letter~\href{mailto:jdoe@gmail.com}{jdoe@gmail.com}
+\end{minipage}\\[1em]
+%
+\begin{minipage}[t]{.4\textwidth}
+\raggedright%
+{\bfseries Company XYZ}\\[.35ex]
+\small\itshape%
+street and number\\
+postcode city
+\end{minipage}
+\hfill % US style
+%\\[1em] % UK style
+\begin{minipage}[t]{.4\textwidth}
+\raggedleft % US style
+\today
+%April 6, 2006 % US informal style
+%05/04/2006 % UK formal style
+\end{minipage}\\[2em]
+\raggedright
+Dear Sir or Madam:\\[1.5em]
+%
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed nec sem sit amet lacus aliquam blandit. Nunc tristique mollis eros. Praesent elit. Maecenas turpis. Vestibulum consectetuer velit sit amet ipsum. Aliquam pede nunc, dictum ac, dictum nec, bibendum ut, ante. Phasellus justo urna, convallis vitae, scelerisque a, egestas vitae, diam. Cras eu enim a eros tristique varius.
+
+Pellentesque pellentesque magna a arcu. Phasellus enim purus, pellentesque sed, interdum hendrerit, interdum elementum, sapien. Nunc lobortis neque sed elit congue tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nam lacus mi, volutpat bibendum, ullamcorper in, imperdiet vel, purus. Aliquam egestas sollicitudin mauris. Maecenas quis massa euismod tortor interdum consectetuer. Mauris rutrum leo adipiscing erat.
+
+Vivamus ullamcorper pellentesque arcu. Sed laoreet. Aenean porttitor, purus vel porta pretium, ante metus ultrices neque, id volutpat felis tellus vitae nunc. Vivamus tellus neque, tincidunt non, cursus non, porttitor vel, erat. Cras dictum, nisi vitae condimentum tempor, erat nisl pharetra diam, vitae scelerisque odio purus scelerisque massa. Curabitur malesuada purus volutpat dui. Fusce vitae sem. Fusce tempor felis vitae pede.
+
+Nurabitur id mi. Morbi tempor porta neque. Curabitur nunc dui, posuere sed, ornare eget, pellentesque eu, nisl. Suspendisse eget nulla in nisl consequat vulputate. Quisque id neque. Curabitur consectetuer, risus viverra suscipit rutrum, tortor mauris consequat lectus, quis gravida dolor arcu a velit. Sed elementum sagittis pede. Fusce erat. Aliquam quis justo. Praesent justo. Fusce turpis justo, fermentum et, placerat quis, vestibulum sed, sem. Morbi iaculis. Nunc in massa.
+
+Nulla mi. Suspendisse potenti. Quisque sapien nisl, congue id, egestas a, lacinia ut, pede. Etiam vehicula nisi eu dolor. Aliquam nulla elit, dignissim nec, suscipit ut, cursus sit amet, dui. Sed vel lorem ut lacus sagittis egestas. Quisque justo nisl, convallis non, ultrices et, tempor at, pede. Phasellus orci. Morbi non velit blandit pede adipiscing mollis. Cras malesuada. Mauris tincidunt massa ut risus. Maecenas sit amet mi nec elit ultrices tincidunt. Nullam hendrerit congue ipsum. Fusce felis.
+
+%Yours sincerely,\\[2em] % if the opening is "Dear Mr(s) Doe,"
+Yours faithfully,\\[2em] % if the opening is "Dear Sir or Madam,"
+%
+%\includegraphics[scale=0.75]{signature_blue}\\
+{\bfseries John Doe}\\
+%
+\vfill%
+{\slshape Enclosure}
+%{\slshape Attachment: curriculum vit\ae{}}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_picture.eps b/Master/texmf-dist/doc/latex/moderncv/examples/picture.eps
index 67696ddc606..67696ddc606 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_picture.eps
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/picture.eps
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_picture.jpg b/Master/texmf-dist/doc/latex/moderncv/examples/picture.jpg
index ef48e69ce85..ef48e69ce85 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/jdoe_picture.jpg
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/picture.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib b/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib
new file mode 100644
index 00000000000..2149ec056e2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib
@@ -0,0 +1,24 @@
+%% start of file `jdoe_publications.bib'.
+%% Copyright 2006 Xavier Danaux (xdanaux<AT>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/.
+
+
+@BOOK{publication1,
+ author = {Author 1 and Author 2},
+ title = {Title},
+ publisher = {Publisher},
+ edition = {edition},
+ year = {year},
+}
+
+@MISC{publication2,
+ author = {Author},
+ title = {Title},
+ year = {year},
+}
+
+
+%% end of file `jdoe_publications.bib'.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex
new file mode 100644
index 00000000000..8722001efa2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_en.tex
@@ -0,0 +1,96 @@
+%% start of file `template_en.tex'.
+%% Copyright 2007 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/.
+
+
+\documentclass[11pt,a4paper]{moderncv}
+
+% moderncv themes
+\moderncvtheme[blue]{casual} % optional argument are 'blue' (default), 'orange', 'red', 'green', 'grey' and 'roman' (for roman fonts, instead of sans serif fonts)
+%\moderncvtheme[green]{classic} % idem
+
+% character encoding
+\usepackage[utf8]{inputenc} % replace by the encoding you are using
+
+% adjust the page margins
+\usepackage[scale=0.8]{geometry}
+\recomputelengths % required when changes are made to page layout lengths
+
+% personal data
+\firstname{John}
+\familyname{Doe}
+\title{Resumé title (optional)} % optional, remove the line if not wanted
+\address{street and number}{postcode city} % optional, remove the line if not wanted
+\mobile{mobile (optional)} % optional, remove the line if not wanted
+\phone{phone (optional)} % optional, remove the line if not wanted
+\fax{fax (optional)} % optional, remove the line if not wanted
+\email{email (optional)} % optional, remove the line if not wanted
+\extrainfo{additional information (optional)} % optional, remove the line if not wanted
+\photo[64pt]{picture} % '64pt' is the height the picture must be resized to and 'picture' is the name of the picture file; optional, remove the line if not wanted
+\quote{Some quote (optional)} % optional, remove the line if not wanted
+
+%\nopagenumbers{} % uncomment to suppress automatic page numbering for CVs longer than one page
+
+
+%----------------------------------------------------------------------------------
+% content
+%----------------------------------------------------------------------------------
+\begin{document}
+\maketitle
+
+\section{Education}
+\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description} % arguments 3 to 6 are optional
+\cventry{year--year}{Degree}{Institution}{City}{\textit{Grade}}{Description} % arguments 3 to 6 are optional
+
+\section{Master thesis}
+\cvline{title}{\emph{Title}}
+\cvline{supervisors}{Supervisors}
+\cvline{description}{\small Short thesis abstract}
+
+\section{Experience}
+\subsection{Vocational}
+\cventry{year--year}{Job title}{Employer}{City}{}{Description} % arguments 3 to 6 are optional
+\cventry{year--year}{Job title}{Employer}{City}{}{Description} % arguments 3 to 6 are optional
+\subsection{Miscellaneous}
+\cventry{year--year}{Job title}{Employer}{City}{}{Description line 1\newline{}Description line 2}% arguments 3 to 6 are optional
+
+\section{Languages}
+\cvlanguage{language 1}{Skill level}{Comment}
+\cvlanguage{language 2}{Skill level}{Comment}
+\cvlanguage{language 3}{Skill level}{Comment}
+
+\section{Computer skills}
+\cvcomputer{category 1}{XXX, YYY, ZZZ}{category 4}{XXX, YYY, ZZZ}
+\cvcomputer{category 2}{XXX, YYY, ZZZ}{category 5}{XXX, YYY, ZZZ}
+\cvcomputer{category 3}{XXX, YYY, ZZZ}{category 6}{XXX, YYY, ZZZ}
+
+\section{Interests}
+\cvline{hobby 1}{\small Description}
+\cvline{hobby 2}{\small Description}
+\cvline{hobby 3}{\small Description}
+
+\closesection{} % needed to renewcommands
+\renewcommand{\listitemsymbol}{-} % change the symbol for lists
+
+\section{Extra 1}
+\cvlistitem{Item 1}
+\cvlistitem{Item 2}
+\cvlistitem[+]{Item 3} % optional other symbol
+
+\section{Extra 2}
+\cvlistdoubleitem[\Neutral]{Item 1}{Item 4}
+\cvlistdoubleitem[\Neutral]{Item 2}{Item 5}
+\cvlistdoubleitem[\Neutral]{Item 3}{}
+
+% Publications from a BibTeX file
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{publications} % 'publications' is the name of a BibTeX file
+
+\end{document}
+
+
+%% end of file `template_en.tex'.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf
new file mode 100644
index 00000000000..415e19eaae0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf
new file mode 100644
index 00000000000..839351296e1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index a790680fe55..44c4877b94a 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -1,5 +1,5 @@
%% start of file `moderncv.cls'.
-%% Copyright 2006 Xavier Danaux.
+%% Copyright 2007 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,
@@ -10,7 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2006/09/09 v0.5 modern curriculum vitae document class]
+\ProvidesClass{moderncv}[2007/05/28 v0.6 modern curriculum vitae document class]
+
+
+%-------------------------------------------------------------------------------
+% debugging
+%-------------------------------------------------------------------------------
+\newif\if@DEBUG\@DEBUGfalse
%-------------------------------------------------------------------------------
@@ -114,25 +120,31 @@
% hyperrefs
\RequirePackage{url}
\ifpdf
- \RequirePackage[pdftex,pdfborder=0,breaklinks,baseurl=http://,pdfpagemode=None,pdfstartview=FitH,pdfpagelayout=SinglePage,pdfstartpage=1]{hyperref}
- \AtEndOfClass{%
- \AtBeginDocument{%
- \hypersetup{%
- pdfauthor = \@firstname~\@familyname,%
- pdftitle = \@title,%
- pdfsubject = \@firstname~\@familyname,%
- pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{},%
- pdfcreator = \LaTeX{} with `moderncv' package,%
- pdfproducer = \LaTeX}}}
+ \RequirePackage[pdftex]{hyperref}
\else
\RequirePackage[dvips]{hyperref}\fi
+\AtEndOfClass{%
+ \AtBeginDocument{%
+ \hypersetup{%
+ breaklinks,
+ baseurl = http://,
+ pdfborder = 0 0 0,
+ pdfpagemode = None,
+ pdfstartview = XYZ,
+ pdfstartpage = 1,
+ pdfauthor = \@firstname~\@familyname,%
+ pdftitle = \@title,%
+ pdfsubject = \@firstname~\@familyname,%
+ pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{},%
+ pdfcreator = \LaTeX{} with `moderncv' package,%
+ pdfproducer = \LaTeX}}}
\urlstyle{tt}
% tables that split across multiple pages
\RequirePackage[]{longtable}
% spacing between sections
-\setlength{\LTpre}{\medskipamount}
-\setlength{\LTpost}{\medskipamount}
+\setlength{\LTpre}{\smallskipamount}
+\setlength{\LTpost}{\smallskipamount}
\setlength{\LTleft}{0pt}
\setlength{\LTright}{0pt}
@@ -176,6 +188,11 @@
%-------------------------------------------------------------------------------
% symbols used
\providecommand*{\listitemsymbol}{\textbullet}
+\providecommand*{\addresssymbol}{}
+\providecommand*{\mobilesymbol}{\Mobilefone}
+\providecommand*{\phonesymbol}{\Telefon}
+\providecommand*{\faxsymbol}{\FAX}
+\providecommand*{\emailsymbol}{\Letter}
% colors
\definecolor{firstnamecolor}{rgb}{0,0,0}
@@ -208,14 +225,12 @@
\providecommand*{\subsectionstyle}[1]{{\subsectionfont\color{subsectioncolor}#1}}
\providecommand*{\hintstyle}[1]{{\hintfont\color{hintcolor}#1}}
-% styles: casual (default), classic, ...
-\newcommand*{\moderncvstyle}[2][]{
- \def\@moderncvstyle{#2}
- \def\@moderncvstyleoptions{#1}}
-\AtBeginDocument{\RequirePackage[\@moderncvstyleoptions]{moderncvstyle\@moderncvstyle}}
-
-% load default style
-\moderncvstyle{casual}
+% themes: casual (default), classic, ...
+\newcommand*{\moderncvtheme}[2][]{
+ \def\@moderncvtheme{#2}
+ \def\@moderncvthemeoptions{#1}}
+\moderncvtheme{casual} % default theme
+\AtBeginDocument{\RequirePackage[\@moderncvthemeoptions]{moderncvtheme\@moderncvtheme}}
%-------------------------------------------------------------------------------
@@ -224,21 +239,14 @@
\newcommand*{\firstname}[1]{\def\@firstname{#1}}
\newcommand*{\familyname}[1]{\def\@familyname{#1}}
\renewcommand*{\title}[1]{\def\@title{#1}}
-\newcommand*{\address}[1]{\def\@address{#1}}
+\newcommand*{\address}[2]{\def\@addressstreet{#1}\def\@addresscity{#2}}
+\newcommand*{\mobile}[1]{\def\@mobile{#1}}
\newcommand*{\phone}[1]{\def\@phone{#1}}
+\renewcommand*{\fax}[1]{\def\@fax{#1}}
\newcommand*{\email}[1]{\def\@email{#1}}
\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
-\newcommand*{\photo}[2][84pt]{\def\@photoheight{#1}\def\@photo{#2}}
+\newcommand*{\photo}[2][64pt]{\def\@photoheight{#1}\def\@photo{#2}}
\newcommand*{\quote}[1]{\def\@quote{#1}}
-\firstname{}
-\familyname{}
-\title{}
-\address{}
-\phone{}
-\email{}
-\extrainfo{}
-\photo{}{}
-\quote{}
% length used by the moderncv layout
% quote length
@@ -277,29 +285,26 @@
% listdoubleitem lengths
\setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth}%
\addtolength{\listdoubleitemmaincolumnwidth}{-\listitemsymbolwidth}%
- \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}}
+ \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}%
+ % fancyhdr lengths
+ \renewcommand{\headwidth}{\textwidth}}
\sethintscolumnlength{0.15\textwidth}
\recomputelengths
% makes the cv title
\renewcommand*{\maketitle}{}%
-% make a quote
-\newcommand*{\makequote}{%
- {\centering{%
- \begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}}
-
% draws a colored rectangle
% usage: \colorrule[optional height]{width}
%\newcommand*{\colorrule}[2][1ex]{{\color{sectionrectanglecolor}{\rule{#2}{#1}}}}
\newif\if@sectionopen\@sectionopenfalse
-\newif\if@firstcvline\@firstcvlinefalse % bug if initially set to true...
+\newif\if@firstcvlineofsection\@firstcvlineofsectionfalse % bug if initially set to true...
% usage: \closesection{} to force a section to be closed (and the tabular layout it generates)
\newcommand*{\closesection}{%
\if@sectionopen%
\end{longtable}%
- \phantomsection% reset the anchor for hyperrefs
+% \phantomsection% reset the anchor for hyperrefs
% \par\null%
\@sectionopenfalse\fi}
\AtEndDocument{\closesection{}}
@@ -307,73 +312,64 @@
\newcommand*{\section}[1]{%
\closesection{}%
\@sectionopentrue%
- \phantomsection{}%
+ \phantomsection{}% reset the anchor for hyperrefs
\addcontentsline{toc}{part}{#1}%
-% \ignorespacesafterend% NOT WORKING
- \begin{longtable}[l]{@{}l@{\hspace{\separatorcolumnwidth}}@{}p{\maincolumnwidth}@{}}%
-% \colorrule{\hintscolumnwidth}&\mbox{\sectionstyle{#1}}\\[1ex]}%
+ \begin{longtable}[l]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
{\color{sectionrectanglecolor}\rule{\hintscolumnwidth}{1ex}} &\sectionstyle{#1}\\[1ex]%
- \@firstcvlinetrue}
+ \@firstcvlineofsectiontrue%
+ }
\newcommand*{\emptysection}{%
\closesection{}%
\@sectionopentrue%
-% \ignorespacesafterend% NOT WORKING
- \begin{longtable}[l]{@{}l@{\hspace{\separatorcolumnwidth}}@{}p{\maincolumnwidth}@{}}%
- \@firstcvlinetrue}
+ \begin{longtable}[l]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
+ \@firstcvlineofsectiontrue%
+ }
% usage (inside section): \subsection{title}
\newcommand*{\subsection}[1]{%
- &\subsectionstyle{#1}\\[1ex]}
+ \cvline[0.65em]{}{\subsectionstyle{#1}}}
% usage (inside section): \cvline{leftmark}{text}
-\newcommand*{\cvline}[2]{%
- \if@firstcvline%
- \@firstcvlinefalse%
- \\[-1em]% ugly hack to remove spaces before the first line
+\newcommand*{\cvline}[3][.25em]{%
+ \if@firstcvlineofsection%
+ \@firstcvlineofsectionfalse%
\else%
- \\\fi%
- \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#1}\end{minipage}&\begin{minipage}[t]{\maincolumnwidth}#2\end{minipage}}
-% #1&\framebox{\begin{minipage}[t]{\maincolumnwidth}#2\end{minipage}}}
-% \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#1}\end{minipage}&\begin{minipage}[t]{\maincolumnwidth}#2\end{minipage}}
-
-% usage (inside section): \cvitem{leftmark}{text}
-\newcommand*{\cvitem}[2]{%
- \if@firstcvline
- \else
- \\[-0.75em]\fi
- \cvline{#1}{#2}}
+ \\[#1]\fi%
+ \raggedleft\hintfont{#2} &#3}
% usage (inside section}: \cvdoubleitem{subtitle}{text}{subtitle}{text}
\newcommand*{\cvdoubleitem}[4]{%
- \cvitem{#1}{\begin{minipage}[t]{\doubleitemmaincolumnwidth}#2\end{minipage}%
+ \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 (inside section): \cvlistitem{point1}
-\newcommand*{\cvlistitem}[1]{%
- \cvline{}{\listitemsymbol{}~#1}}
+\newcommand*{\cvlistitem}[2][\listitemsymbol{}]{%
+ \cvline[0pt]{}{#1~#2}}
% usage (inside section): \cvlistdoubleitem{point1}{point2}
-\newcommand*{\cvlistdoubleitem}[2]{%
- \cvline{}{\listitemsymbol{}~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#1\end{minipage}%
+\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{%
+ \cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}%
\hfill%
- \ifthenelse{\equal{#2}{}}%
+ \ifthenelse{\equal{#3}{}}%
{}%
- {\listitemsymbol{}~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}}}}
+ {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}}
% usage : \cventry{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description}
\newcommand*{\cventry}[6]{%
- \cvitem{#1}{%
+ \cvline{#1}{%
{\bfseries#2}%
\ifthenelse{\equal{#3}{}}{}{, {\slshape#3}}%
\ifthenelse{\equal{#4}{}}{}{, #4}%
\ifthenelse{\equal{#5}{}}{}{, #5}%
.%
- \ifthenelse{\equal{#6}{}}{}{\\\begin{minipage}[t]{\textwidth}\small#6\end{minipage}}}}
+ \ifthenelse{\equal{#6}{}}{}{\newline{}\small#6}
+ }}%
+% \ifthenelse{\equal{#6}{}}{}{\cvline[0pt]{}{\small#6}}}
% usage (inside 'language' cvsection environment): \cvlanguage{name}{level}{comment}
\newcommand*{\cvlanguage}[3]{%
- \cvitem{#1}{\begin{minipage}[t]{.225\maincolumnwidth}\textbf{#2}\end{minipage}\hfill\begin{minipage}[t]{0.725\maincolumnwidth}\raggedleft\footnotesize\itshape #3\end{minipage}}}
+ \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]{%
@@ -400,6 +396,19 @@
{\def\@linktext{#1}}%
\href{mailto:#2}{\@linktext{}}}
+% usage: \nopagenumbers{}
+\newif\if@displaypagenumbers\@displaypagenumberstrue
+\newcommand*{\nopagenumbers}{\@displaypagenumbersfalse}
+\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}}%
+ \fi}
+
% thebibliography environment, for use with BibTeX
\newcommand{\refname}{Publications}
\newlength{\bibindent}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index 6f5a4e1e882..04f95016236 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcompatibility.sty'.
-%% Copyright 2006 Xavier Danaux.
+%% Copyright 2007 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,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2006/09/09 v0.5 modern curriculum vitae compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2007/05/28 v0.6 modern curriculum vitae compatibility patches]
%-------------------------------------------------------------------------------
@@ -38,7 +38,7 @@
% compatibility with version 0.1
\newcommand*{\cvresume}[2]{\cvlistdoubleitem{#1}{#2}}
-% compatibility with version 0.2
+% compatibility with versions <= 0.2
% section, cvline, ... with width argument...
%\newcommand*{\section}[2][0.825]{%
% \closesection{}%
@@ -52,6 +52,10 @@
%\newcommand*{\cvitem}[3][.825]{%
% \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}}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
deleted file mode 100644
index 5fffa579ce4..00000000000
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
+++ /dev/null
@@ -1,121 +0,0 @@
-%% start of file `moderncvstylecasual.sty'.
-%% Copyright 2006 Xavier Danaux.
-%
-% 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}[2006/09/09 v0.5 modern curriculum vitae style: casual]
-
-
-%-------------------------------------------------------------------------------
-% required packages
-%-------------------------------------------------------------------------------
-
-
-%-------------------------------------------------------------------------------
-% package options
-%-------------------------------------------------------------------------------
-% nocolor option
-\newif\if@color\@colortrue
-\DeclareOption{nocolor}{\@colorfalse}
-
-% roman option
-\newif\if@roman\@romanfalse
-\DeclareOption{roman}{\@romantrue}
-
-% unused options
-\DeclareOption*{
- \PackageWarning{moderncvstylecasual}{Unknown option ‘\CurrentOption’}}
-
-% execute default options
-\ExecuteOptions{color}
-
-% process given options
-\ProcessOptions\relax
-
-
-%-------------------------------------------------------------------------------
-% style definition
-%-------------------------------------------------------------------------------
-% symbols used
-\renewcommand*{\listitemsymbol}{\textbullet}
-
-% colors
-\if@color
- \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{sectionrectanglecolor}{rgb}{0.25,0.5,0.75}
- \definecolor{sectiontitlecolor}{rgb}{0.2,0.4,0.65}
-\else
- \definecolor{firstnamecolor}{rgb}{0.5,0.5,0.5}
- \definecolor{familynamecolor}{rgb}{0,0,0}
- \definecolor{quotecolor}{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}\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}{\normalsize\sffamily\mdseries\upshape}
-
-% styles
-
-% maketitle
-\renewcommand*{\maketitle}{%
- {%
- \ifthenelse{\equal{\@photo}{}}%
- {}%
- {{\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}}%
- \hfill%
- \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}%
- {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}}%
-
-% cv footer
-\providecommand*{\footersymbol}{}
-\renewcommand*{\footersymbol}{\textbullet}
-\providecommand*{\footerfont}{}
-\renewcommand*{\footerfont}{\addressfont}
-\if@color
- \definecolor{footertextcolor}{rgb}{0.35,0.35,0.35}
- \definecolor{footersymbolcolor}{rgb}{0.25,0.5,0.75}
-\else
- \definecolor{footertextcolor}{rgb}{0.35,0.35,0.35}
- \definecolor{footersymbolcolor}{rgb}{0.75,0.75,0.75}\fi
-\providecommand*{\makefooter}{}
-\renewcommand*{\makefooter}{%
- \fancypagestyle{plain}{%
- \fancyfoot[c]{%
- \footerfont%
- \color{footertextcolor}\@address%
- ~~\color{footersymbolcolor}\footersymbol~~%
- \color{footertextcolor}\Telefon~\@phone%
- ~~\color{footersymbolcolor}\footersymbol~~%
- \color{footertextcolor}\Letter~\emaillink{\@email}%
- \ifthenelse{\equal{\@extrainfo}{}}%
- {}%
- {%
- ~~\color{footersymbolcolor}\footersymbol~~%
- \color{footertextcolor}{\@extrainfo}}}}%
- \pagestyle{plain}}
-\AtBeginDocument{\makefooter}
-
-
-\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
deleted file mode 100644
index 82f0e4e656f..00000000000
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
+++ /dev/null
@@ -1,108 +0,0 @@
-%% start of file `moderncvstyleclassic.sty'.
-%% Copyright 2006 Xavier Danaux.
-%
-% 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}[2006/09/09 v0.5 modern curriculum vitae style: classic]
-
-
-%-------------------------------------------------------------------------------
-% required packages
-%-------------------------------------------------------------------------------
-
-
-%-------------------------------------------------------------------------------
-% package options
-%-------------------------------------------------------------------------------
-% nocolor option
-\newif\if@color\@colortrue
-\DeclareOption{nocolor}{\@colorfalse}
-
-% roman option
-\newif\if@roman\@romanfalse
-\DeclareOption{roman}{\@romantrue}
-
-% unused options
-\DeclareOption*{
- \PackageWarning{moderncvstyleclassic}{Unknown option ‘\CurrentOption’}}
-
-% execute default options
-\ExecuteOptions{color}
-
-% process given options
-\ProcessOptions\relax
-
-
-%-------------------------------------------------------------------------------
-% style definition
-%-------------------------------------------------------------------------------
-% symbols used
-\renewcommand*{\listitemsymbol}{\textbullet}
-
-% colors
-\if@color
- \definecolor{firstnamecolor}{rgb}{0,0,0}
- \definecolor{familynamecolor}{rgb}{0,0,0}
- \definecolor{titlecolor}{rgb}{0.35,0.35,0.35}
- \definecolor{addresscolor}{rgb}{0.25,0.5,0.75}
- \definecolor{quotecolor}{rgb}{0.35,0.35,0.35}
- \definecolor{sectionrectanglecolor}{rgb}{0.25,0.5,0.75}
- \definecolor{sectiontitlecolor}{rgb}{0.2,0.4,0.65}
-\else
- \definecolor{firstnamecolor}{rgb}{0,0,0}
- \definecolor{familynamecolor}{rgb}{0,0,0}
- \definecolor{titlecolor}{rgb}{0.35,0.35,0.35}
- \definecolor{addresscolor}{rgb}{0.35,0.35,0.35}
- \definecolor{quotecolor}{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}\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}{\rmfamily\mdseries\slshape}
-\renewcommand*{\familynamefont}{\firstnamefont}
-\renewcommand*{\quotefont}{\large\slshape}
-\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape}
-\renewcommand*{\subsectionfont}{\normalsize\sffamily\mdseries\upshape}
-
-% styles
-
-% maketitle
-\renewcommand*{\maketitle}{%
- \begin{minipage}[b]{.5\textwidth}%
- \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}%
- \ifthenelse{\equal{\@title}{}}%
- {}%
- {\\[1.25em]\titlestyle{\@title}}%
- \end{minipage}%
- \hfill%
- \begin{minipage}[b]{.35\textwidth}%
- \raggedleft\addressfont\color{addresscolor}\@address\\[0.2em]%
- \Telefon~\@phone\\[.2em]%
- \Letter~\emaillink{\@email}%
- \ifthenelse{\equal{\@extrainfo}{}}%
- {}%
- {\\[0.2em]\@extrainfo}
- \end{minipage}%
- \ifthenelse{\equal{\@photo}{}}%
- {}%
- {\hspace*{1em}\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}\\[3em]}
-
-
-\endinput
-
-
-%% end of file `moderncvstyleclassic.sty'.
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
new file mode 100644
index 00000000000..58f25c710a4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
@@ -0,0 +1,153 @@
+%% start of file `moderncvthemecasual.sty'.
+%% Copyright 2007 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}[2007/05/28 v0.6 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}
+% grey
+\newif\if@colorgrey\@colorgreyfalse
+\DeclareOption{grey}{\@colorgreytrue}
+
+% roman option
+\newif\if@roman\@romanfalse
+\DeclareOption{roman}{\@romantrue}
+
+% unused options
+\DeclareOption*{
+ \PackageWarning{moderncvthemecasual}{Unknown option ‘\CurrentOption’}}
+
+% execute default options
+\ExecuteOptions{color}
+
+% process given options
+\ProcessOptions\relax
+
+
+%-------------------------------------------------------------------------------
+% style definition
+%-------------------------------------------------------------------------------
+% symbols used
+\renewcommand*{\listitemsymbol}{\textbullet}
+
+% 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@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
+
+% 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
+
+% maketitle
+\renewcommand*{\maketitle}{%
+ {%
+ \ifthenelse{\isundefined{\@photo}}%
+ {}%
+ {{\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}}%
+ \hfill%
+ \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@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]}%
+ }%
+
+% cv footer
+\newif\if@firstfooterelement\@firstfooterelementtrue
+\providecommand*{\footersymbol}{}
+\renewcommand*{\footersymbol}{%
+ \if@firstfooterelement%
+ \else%
+ { ~~\color{footersymbolcolor}\textbullet~~~}\fi}
+\providecommand*{\makefooter}{}
+\renewcommand*{\makefooter}{%
+ \fancypagestyle{plain}{%
+ \fancyfoot[c]{%
+ \parbox{0.8\textwidth}{%
+ \centering%
+ \addressfont\color{addresscolor}%
+ \ifthenelse{\isundefined{\@addressstreet}}{}{%
+ \addresssymbol~\@addressstreet%
+ \@firstfooterelementfalse%
+ \ifthenelse{\isundefined{\@addresscity}}{}{\footersymbol\@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{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}%
+ }%
+ \pagestyle{plain}}
+\AtBeginDocument{\makefooter}
+
+
+\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
new file mode 100644
index 00000000000..a9c44f3904b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
@@ -0,0 +1,149 @@
+%% start of file `moderncvthemeclassic.sty'.
+%% Copyright 2007 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}[2007/05/28 v0.6 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}
+% grey
+\newif\if@colorgrey\@colorgreyfalse
+\DeclareOption{grey}{\@colorgreytrue}
+
+% roman option
+\newif\if@roman\@romanfalse
+\DeclareOption{roman}{\@romantrue}
+
+% unused options
+\DeclareOption*{
+ \PackageWarning{moderncvthemeclassic}{Unknown option ‘\CurrentOption’}}
+
+% execute default options
+\ExecuteOptions{color}
+
+% process given options
+\ProcessOptions\relax
+
+
+%-------------------------------------------------------------------------------
+% style definition
+%-------------------------------------------------------------------------------
+% symbols used
+\renewcommand*{\listitemsymbol}{\textbullet}
+
+% 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@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
+
+% 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
+\renewcommand*{\maketitle}{%
+ % name and title
+ \if@DEBUG\framebox{\fi
+ \begin{minipage}[b]{.525\textwidth}%
+ \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}%
+ \ifthenelse{\isundefined{\@title}}%
+ {}%
+ {\\[1.25em]\titlestyle{\@title}}%
+ \end{minipage}%
+ \if@DEBUG}\fi
+ \hfill%
+ \if@DEBUG\framebox{\fi%
+ % optional data
+ \begin{minipage}[b]{.225\textwidth}%
+ \raggedleft\addressfont\color{addresscolor}%
+ \ifthenelse{\isundefined{\@addressstreet}}{}{%
+ \addresssymbol~\@addressstreet%
+ \ifthenelse{\isundefined{\@addresscity}}{}{\\\@addresscity}%
+ \\[.2em]}%
+ \ifthenelse{\isundefined{\@mobile}}{}{\mobilesymbol~\@mobile\\[.2em]}%
+ \ifthenelse{\isundefined{\@phone}}{}{\phonesymbol~\@phone\\[.2em]}%
+ \ifthenelse{\isundefined{\@fax}}{}{\faxsymbol~\@fax\\[.2em]}%
+ \ifthenelse{\isundefined{\@email}}{}{\emailsymbol~\emaillink{\@email}\\[.2em]}%
+ \ifthenelse{\isundefined{\@extrainfo}}{}{\@extrainfo\\[.2em]}%
+ \end{minipage}%
+ % optional photo
+ \ifthenelse{\isundefined{\@photo}}%
+ {}%
+ {\hspace*{0.75em}\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}\\[3em]%
+ \if@DEBUG}\fi%
+ % 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/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
index aa797675275..5c823af8e24 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
@@ -1,5 +1,5 @@
-%% start of file `moderncvstyleempty.sty'.
-%% Copyright 2006 Xavier Danaux.
+%% start of file `moderncvthemeempty.sty'.
+%% Copyright 2007 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,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleempty}[2006/09/09 v0.5 modern curriculum vitae style: empty]
+\ProvidesPackage{moderncvthemeempty}[2007/05/28 v0.6 modern curriculum vitae style: empty]
%-------------------------------------------------------------------------------
@@ -23,7 +23,7 @@
%-------------------------------------------------------------------------------
% unused options
\DeclareOption*{
- \PackageWarning{moderncvstyleempty}{Unknown option ‘\CurrentOption’}}
+ \PackageWarning{moderncvthemeempty}{Unknown option ‘\CurrentOption’}}
% execute default options
\ExecuteOptions{}
@@ -40,4 +40,4 @@
\endinput
-%% end of file `moderncvstyleempty.sty'.
+%% end of file `moderncvthemeempty.sty'.
diff --git a/Master/texmf-dist/tpm/moderncv.tpm b/Master/texmf-dist/tpm/moderncv.tpm
index 727ef61b90e..6756813a61c 100644
--- a/Master/texmf-dist/tpm/moderncv.tpm
+++ b/Master/texmf-dist/tpm/moderncv.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/moderncv.zip">
<TPM:Name>moderncv</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/09/12 18:42:46</TPM:Date>
+ <TPM:Date>2007/05/28 21:05:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>The moderncv package.</TPM:Title>
@@ -12,25 +12,26 @@
<TPM:Size>433827</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="28300">
+ <TPM:RunFiles size="32130">
texmf-dist/tex/latex/moderncv/moderncv.cls
texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
-texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
-texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
-texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
+texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
+texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
+texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
texmf-dist/tpm/moderncv.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="405527">
+ <TPM:DocFiles size="515162">
texmf-dist/doc/latex/moderncv/CHANGELOG
texmf-dist/doc/latex/moderncv/KNOWN_BUGS
texmf-dist/doc/latex/moderncv/README
-texmf-dist/doc/latex/moderncv/examples/jdoe_casual.pdf
-texmf-dist/doc/latex/moderncv/examples/jdoe_casual.tex
-texmf-dist/doc/latex/moderncv/examples/jdoe_classic.pdf
-texmf-dist/doc/latex/moderncv/examples/jdoe_classic.tex
-texmf-dist/doc/latex/moderncv/examples/jdoe_picture.eps
-texmf-dist/doc/latex/moderncv/examples/jdoe_picture.jpg
-texmf-dist/doc/latex/moderncv/examples/jdoe_publications.bib
+texmf-dist/doc/latex/moderncv/examples/letter.pdf
+texmf-dist/doc/latex/moderncv/examples/letter.tex
+texmf-dist/doc/latex/moderncv/examples/picture.eps
+texmf-dist/doc/latex/moderncv/examples/picture.jpg
+texmf-dist/doc/latex/moderncv/examples/publications.bib
+texmf-dist/doc/latex/moderncv/examples/template_en.tex
+texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf
+texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf
</TPM:DocFiles>
<TPM:Provides>Package/moderncv</TPM:Provides>
</rdf:Description>
diff --git a/Master/texmf/lists/moderncv b/Master/texmf/lists/moderncv
index 2ee2bf61977..c5e549e5995 100644
--- a/Master/texmf/lists/moderncv
+++ b/Master/texmf/lists/moderncv
@@ -1,19 +1,20 @@
texmf-dist/doc/latex/moderncv/CHANGELOG
texmf-dist/doc/latex/moderncv/KNOWN_BUGS
texmf-dist/doc/latex/moderncv/README
-texmf-dist/doc/latex/moderncv/examples/jdoe_casual.pdf
-texmf-dist/doc/latex/moderncv/examples/jdoe_casual.tex
-texmf-dist/doc/latex/moderncv/examples/jdoe_classic.pdf
-texmf-dist/doc/latex/moderncv/examples/jdoe_classic.tex
-texmf-dist/doc/latex/moderncv/examples/jdoe_picture.eps
-texmf-dist/doc/latex/moderncv/examples/jdoe_picture.jpg
-texmf-dist/doc/latex/moderncv/examples/jdoe_publications.bib
+texmf-dist/doc/latex/moderncv/examples/letter.pdf
+texmf-dist/doc/latex/moderncv/examples/letter.tex
+texmf-dist/doc/latex/moderncv/examples/picture.eps
+texmf-dist/doc/latex/moderncv/examples/picture.jpg
+texmf-dist/doc/latex/moderncv/examples/publications.bib
+texmf-dist/doc/latex/moderncv/examples/template_en.tex
+texmf-dist/doc/latex/moderncv/examples/template_en_casual_blue.pdf
+texmf-dist/doc/latex/moderncv/examples/template_en_classic_green.pdf
texmf-dist/tex/latex/moderncv/moderncv.cls
texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
-texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
-texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
-texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
+texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty
+texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty
+texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty
texmf-dist/tpm/moderncv.tpm
texmf/lists/moderncv