summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/CHANGELOG21
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdfbin171907 -> 171988 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdfbin241625 -> 241627 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template.pdfbin233763 -> 232235 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template.tex20
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdfbin199140 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdfbin167160 -> 167532 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdfbin233641 -> 232785 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdfbin280738 -> 276451 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdfbin171468 -> 234078 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdfbin68523 -> 68883 bytes
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls43
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty51
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty10
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty18
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty16
25 files changed, 117 insertions, 80 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index 4fb217b0a85..c70ae146063 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,3 +1,24 @@
+version 1.2.0 (31 Oct 2012)
+ - updated the banking style header to include the option to show a title.
+ - set the values of \arrayrulewidth and \doublerulesep to their standard values
+ (0.4pt and 2pt resp.) to enable the drawing of rules in tabulars and arrays by
+ default.
+ - modified the code of \makecvtitle and \makelettertitle of the "casual" style
+ to avoid it to cause horizontal alignment issues after and before itself.
+ - corrected a bug in \makelettertitle of most styles that displayed the current
+ date (\today) instead of the date given through the \date command, as reported
+ by B. Schlimmchen and S. Fnord.
+ - removed the need to set pdfpagelabels=false when loading hyperref, by putting
+ \pagenumbering{arabic} (to define \thepage) before loading hyperref, as figured
+ out by J. Wolf.
+ - corrected the line wrapping of \cvlistitem of the "banking" style.
+ - corrected a bug in \makecvtitle and \makelettertitle of the "banking" style.
+ - removed an unwanted space in the footer of the "casual" style.
+ - moved the font style definitions to moderncv.cls for better readability
+ (moderncv.cls is meant to be a sort of header file, implementing only some
+ macros shared by all styles and defining the macros that the style files need
+ to implement).
+
version 1.1.3 (10 Aug 2012)
- corrected a longstanding issue causing hyperref to issue two warnings
regarding its "pdfpagelabels" option, as pointed out and solved by P. Leifeld
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf
index 4c4b872b31b..2199a5b8c4c 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf
index cbfbbdafd21..3cc5e930288 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
index a8cf07adcbb..85a52d36184 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
index dd170b5481a..7a009a683fc 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
@@ -26,16 +26,16 @@
% 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{+1~(234)~567~890} % optional, remove the line if not wanted
-\phone{+2~(345)~678~901} % optional, remove the line if not wanted
-\fax{+3~(456)~789~012} % optional, remove the line if not wanted
-\email{john@doe.org} % optional, remove the line if not wanted
-\homepage{www.johndoe.com} % optional, remove the line if not wanted
-\extrainfo{additional information} % optional, remove the line if not wanted
-\photo[64pt][0.4pt]{picture} % '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) 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
+\title{Resumé title} % optional, remove / comment the line if not wanted
+\address{street and number}{postcode city} % optional, remove / comment the line if not wanted
+\mobile{+1~(234)~567~890} % optional, remove / comment the line if not wanted
+\phone{+2~(345)~678~901} % optional, remove / comment the line if not wanted
+\fax{+3~(456)~789~012} % optional, remove / comment the line if not wanted
+\email{john@doe.org} % optional, remove / comment the line if not wanted
+\homepage{www.johndoe.com} % optional, remove / comment the line if not wanted
+\extrainfo{additional information} % optional, remove / comment the line if not wanted
+\photo[64pt][0.4pt]{picture} % optional, remove / comment the line if not wanted; '64pt' is the height the picture must be resized to, 0.4pt is the thickness of the frame around it (put it to 0pt for no frame) and 'picture' is the name of the picture file
+\quote{Some quote} % optional, remove / comment the line if not wanted
% to show numerical labels in the bibliography (default is to show no labels); only useful if you make citations in your resume
%\makeatletter
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdf
deleted file mode 100644
index 43dde0b6db9..00000000000
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf
index 0593dd71e85..74afecdb829 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
index d1c8eca0a2a..52274b9bb72 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
index d3a0e2aa963..91fb74c0c98 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
index 042be9d7945..617c9583397 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf
index 830cb1c79c6..b405dcfa0ae 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.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 5d8b23a2f61..1107842c5d4 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2012/08/10 v1.1.3 modern curriculum vitae and letter document class]
+\ProvidesClass{moderncv}[2012/10/31 v1.2.0 modern curriculum vitae and letter document class]
%-------------------------------------------------------------------------------
@@ -69,19 +69,17 @@
%-------------------------------------------------------------------------------
% required packages
%-------------------------------------------------------------------------------
-% \AtEndPreamble hook (loading tetoolbox instead of defining the macro, as to avoid incompatibilities with etoolbox (and packages relying on it) defining the macro too)
+% \AtEndPreamble hook (loading etoolbox instead of defining the macro, as to avoid incompatibilities with etoolbox (and packages relying on it) defining the macro too)
\RequirePackage{etoolbox}
%\let\@endpreamblehook\@empty
%\def\AtEndPreamble{\g@addto@macro\@endpreamblehook}
-%\let\moderncv@document\document
-%\def\document{\endgroup\@endpreamblehook\begingroup\moderncv@document}
+%\let\document@original\document
+%\def\document{\endgroup\@endpreamblehook\begingroup\document@original}
% if... then... else... constructs
\RequirePackage{ifthen}
% TODO: move to xifthen and \isempty{<arg>} instead of \equal{<arg>}{}
-% TODO: replace \newcommand by \NewDocumentCommand (LaTeX 3)
-
% color
\RequirePackage{xcolor}
@@ -125,7 +123,8 @@
\RequirePackage{url}
\urlstyle{tt}
\AtEndPreamble{
- \RequirePackage[unicode,pdfpagelabels=false]{hyperref}% unicode is required for unicode pdf metadata, pdfpagelabels=false is required to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
+ \pagenumbering{arabic}% has to be issued before loading hyperref, as to set \thepage and hence to avoid hyperref issuing a warning and setting pdfpagelabels=false
+ \RequirePackage[unicode]{hyperref}% unicode is required for unicode pdf metadata
\hypersetup{
breaklinks,
baseurl = http://,
@@ -139,9 +138,7 @@
pdfauthor = {\@firstname{}~\@familyname{}},
pdftitle = {\@firstname{}~\@familyname{} -- \@title{}},
pdfsubject = {Resum\'{e} of \@firstname{}~\@familyname{}},
- pdfkeywords = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}
- \pagenumbering{arabic}% has to be issued after loading hyperref
-}
+ pdfkeywords = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}}
% graphics
\RequirePackage{graphicx}
@@ -171,10 +168,11 @@
% lengths calculations
\RequirePackage{calc}
-% advanced command arguments
+% advanced command arguments (LaTeX 3)
\RequirePackage{xargs}
+% TODO (?): replace all \newcommand by \NewDocumentCommand
-% micro-typography (e.g., character protrusion, font expansion, hyphenatable letterspacing)
+% micro-typography (e.g., character protrusion, font expansion, hyphenatable letterspacing)
\RequirePackage{microtype}
% compatibility package with older versions of moderncv
@@ -194,12 +192,12 @@
\setlength\columnseprule{0\p@}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
+\setlength\arrayrulewidth{.4\p@}
+\setlength\doublerulesep{2\p@}
-% not required
+% not set on purpose
%\setlength\arraycolsep{5\p@}
%\setlength\tabcolsep{6\p@}
-%\setlength\arrayrulewidth{.4\p@}
-%\setlength\doublerulesep{2\p@}
%\setlength\tabbingsep{\labelsep}
\raggedbottom
@@ -291,6 +289,15 @@
\newcommand*{\subsectionfont}{}
\newcommand*{\hintfont}{}
+% styles
+\newcommand*{\namestyle}[1]{{\namefont#1}}
+\newcommand*{\titlestyle}[1]{{\titlefont#1}}
+\newcommand*{\addressstyle}[1]{{\addressfont#1}}
+\newcommand*{\quotestyle}[1]{{\quotefont#1}}
+\newcommand*{\sectionstyle}[1]{{\sectionfont#1}}
+\newcommand*{\subsectionstyle}[1]{{\subsectionfont#1}}
+\newcommand*{\hintstyle}[1]{{\hintfont#1}}
+
% recompute all resume lengths
\newcommand*{\recomputecvlengths}{}
@@ -305,11 +312,11 @@
% makes the resume title
% usage: \makecvtitle
-\newcommand*{\makecvtitle}{}%
+\newcommand*{\makecvtitle}{}
% makes the resume footer
% usage: \makecvfooter
-\newcommand*{\makecvfooter}{\makefooter}%
+\newcommand*{\makecvfooter}{\makefooter}
% makes a resume section
% usage: \section{<title>}
@@ -433,7 +440,7 @@
%-------------------------------------------------------------------------------
% elements
\newcommand*{\recipient}[2]{\def\@recipientname{#1}\def\@recipientaddress{#2}}
-\renewcommand*{\date}[1]{\def\@date{#1}}
+\renewcommand*{\date}[1]{\def\@date{#1}}\date{\today}
\newcommand*{\opening}[1]{\def\@opening{#1}}
\newcommand*{\closing}[1]{\def\@closing{#1}}
\newcommand*{\enclosure}[2][]{%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
index 64f2d30f68a..d61fc795070 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblack}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: black]
+\ProvidesPackage{moderncvcolorblack}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: black]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
index 4296eb20c27..29852d7488e 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblue}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: blue]
+\ProvidesPackage{moderncvcolorblue}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: blue]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
index a31b2da9d52..5feaf9502cc 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgreen}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: green]
+\ProvidesPackage{moderncvcolorgreen}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: green]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
index 4bccc2a0eb8..fc8ec43c863 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgrey}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: grey]
+\ProvidesPackage{moderncvcolorgrey}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: grey]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
index 5ec8244dd53..d2bcb8bb0c2 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolororange}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: orange]
+\ProvidesPackage{moderncvcolororange}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: orange]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
index e84474138a7..3102cc4f588 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorpurple}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: purple]
+\ProvidesPackage{moderncvcolorpurple}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: purple]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
index a3b090b46e9..dd7f3b6c3f9 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorred}[2012/08/10 v1.1.3 modern curriculum vitae and letter color scheme: red]
+\ProvidesPackage{moderncvcolorred}[2012/10/31 v1.2.0 modern curriculum vitae and letter color scheme: red]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index 5a8a1f4b8dd..132f68ac279 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2012/08/10 v1.1.3 modern curriculum vitae and letter compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2012/10/31 v1.2.0 modern curriculum vitae and letter compatibility patches]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
index 71dd7fab5c8..8494fe26f47 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylebanking}[2012/08/10 v1.1.3 modern curriculum vitae and letter style scheme: banking]
+\ProvidesPackage{moderncvstylebanking}[2012/10/31 v1.2.0 modern curriculum vitae and letter style scheme: banking]
%-------------------------------------------------------------------------------
@@ -58,34 +58,43 @@
\newsavebox{\maketitletempbox}%
\newlength{\maketitlewidth}%
\newlength{\maketitleboxwidth}%
+\newif\if@firstmaketitleelement\@firstmaketitleelementtrue%
% adds an element to the maketitle, separated by maketitlesymbol
% usage: \addtomaketitle[maketitlesymbol]{element}
\newcommand*{\addtomaketitle}[2][\maketitlesymbol]{%
- \savebox{\maketitletempbox}{\usebox{\maketitlebox}#1#2}%
+ \if@firstmaketitleelement%
+ \savebox{\maketitletempbox}{\usebox{\maketitlebox}#2}%
+ \else%
+ \savebox{\maketitletempbox}{\usebox{\maketitlebox}#1#2}\fi%
\settowidth{\maketitleboxwidth}{\usebox{\maketitletempbox}}%
\ifnum\maketitleboxwidth<\maketitlewidth%
- \savebox{\maketitlebox}{\usebox{\maketitletempbox}}
+ \savebox{\maketitlebox}{\usebox{\maketitletempbox}}%
+ \@firstmaketitleelementfalse%
\else%
\flushmaketitle{}\\%
\savebox{\maketitlebox}{#2}%
- \savebox{\maketitletempbox}{#2}\fi}
+ \savebox{\maketitletempbox}{#2}%
+ \settowidth{\maketitleboxwidth}{\usebox{\maketitlebox}}%
+ \@firstmaketitleelementfalse\fi}
% internal command to flush the maketitle
\newcommand*{\flushmaketitle}{%
\strut\usebox{\maketitlebox}%
\savebox{\maketitlebox}{}%
- \savebox{\maketitletempbox}{}}
+ \savebox{\maketitletempbox}{}%
+ \setlength{\maketitleboxwidth}{0pt}}
\renewcommand*{\maketitle}{%
\setlength{\maketitlewidth}{0.8\textwidth}%
\hfil%
\parbox{\maketitlewidth}{%
\centering%
- % name (title is not visible)
- \namestyle{\@firstname~\@familyname}\\%
+ % name and title
+ \namestyle{\@firstname~\@familyname}%
+ \ifthenelse{\isundefined{\@title}}{}{\titlestyle{~|~\@title}}\\%
% detailed information
\addressfont\color{color2}%
- \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle[]{\addresssymbol\@addressstreet}%
- \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}% if \addresstreet is defined, \addresscity will always be defined but could be empty
- \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle[]{\mobilesymbol\@mobile}}%
+ \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle{\addresssymbol\@addressstreet}%
+ \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle\@firstmaketitleelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
+ \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle{\mobilesymbol\@mobile}}%
\ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}%
\ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}%
\ifthenelse{\isundefined{\@email}}{}{\addtomaketitle{\emailsymbol\emaillink{\@email}}}%
@@ -99,21 +108,21 @@
%-------------------------------------------------------------------------------
% fonts
\renewcommand*{\namefont}{\Huge\bfseries\upshape}
-\renewcommand*{\titlefont}{\LARGE\mdseries\slshape}
-\renewcommand*{\addressfont}{\small\mdseries\upshape}
+\renewcommand*{\titlefont}{\Huge\mdseries\upshape}
+\renewcommand*{\addressfont}{\normalsize\mdseries\upshape}
\renewcommand*{\quotefont}{\large\slshape}
\renewcommand*{\sectionfont}{\Large\bfseries\upshape}
\renewcommand*{\subsectionfont}{\large\upshape\fontseries{sb}\selectfont}
\renewcommand*{\hintfont}{\bfseries}
% styles
-\newcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
-\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}}
-\newcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
-\newcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\newcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\newcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
% lengths
\newlength{\quotewidth}
@@ -183,7 +192,7 @@
\par\addvspace{#1}}
\renewcommand*{\cvlistitem}[2][.25em]{%
- \listitemsymbol#2%
+ \listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}%
\par\addvspace{#1}}
\renewcommand*{\cvlistdoubleitem}[3][.25em]{%
@@ -263,7 +272,7 @@
% date
\hfill % US style
% \\[1em] % UK style
- \hbox{\today}\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
+ \@date\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
index 9cc6bf80dd7..7c019c0ade4 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylecasual}[2012/08/10 v1.1.3 modern curriculum vitae and letter style scheme: casual]
+\ProvidesPackage{moderncvstylecasual}[2012/10/31 v1.2.0 modern curriculum vitae and letter style scheme: casual]
%-------------------------------------------------------------------------------
@@ -59,7 +59,7 @@
\newcommand*{\flushfooter}{%
\strut\usebox{\footerbox}%
\savebox{\footerbox}{}%
- \savebox{\footertempbox}{}
+ \savebox{\footertempbox}{}%
\setlength{\footerboxwidth}{0pt}}
@@ -94,11 +94,11 @@
\raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@familyname}}\\[-.35em]% alternate design: \MakeLowercase and no space
{\color{color2!50}\rule{\textwidth}{.25ex}}%
% optional title
- \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\raggedleft\titlestyle{\@title}}\\[2.5em]%
+ \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\null\hfill\titlestyle{\@title}}\\[2.5em]% \null is required as there is no box on the line after \\, so glue (and leaders) disappears; this is in contrast to after \par, where the next line starts with an indent box (even after \noindent).
% optional quote
\ifthenelse{\isundefined{\@quote}}%
{}%
- {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
+ {{\null\hfill\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\hfill\null\\[2.5em]}}%
\par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle
\renewcommand*{\makecvfooter}{%
@@ -139,7 +139,7 @@
% date
\hfill% US style
% \\[1em]% UK style
- \hbox{\today}\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
+ \@date\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
index f207d8f3017..a0031e4bcb6 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleclassic}[2012/08/10 v1.1.3 modern curriculum vitae and letter style scheme: classic]
+\ProvidesPackage{moderncvstyleclassic}[2012/10/31 v1.2.0 modern curriculum vitae and letter style scheme: classic]
%-------------------------------------------------------------------------------
@@ -58,13 +58,13 @@
\renewcommand*{\hintfont}{}
% styles
-\newcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
-\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}}
-\newcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
-\newcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\newcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\newcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
% lengths
\newlength{\quotewidth}
@@ -279,7 +279,7 @@
% date
\hfill% US style
% \\[1em]% UK style
- \hbox{\today}\\[2em]% US informal style: "April 6, 2006"; UK formal style: "05/04/2006"
+ \@date\\[2em]% US informal style: "January 1, 1900"; UK formal style: "01/01/1900"
% opening
\raggedright%
\@opening\\[1.5em]%
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
index 781eb186e4d..8ff142afa37 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleempty}[2012/08/10 v1.1.3 modern curriculum vitae scheme: empty]
+\ProvidesPackage{moderncvstyleempty}[2012/10/31 v1.2.0 modern curriculum vitae scheme: empty]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
index 291775e9104..007425b467a 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleoldstyle}[2012/08/10 v1.1.3 modern curriculum vitae and letter style scheme: oldstyle]
+\ProvidesPackage{moderncvstyleoldstyle}[2012/10/31 v1.2.0 modern curriculum vitae and letter style scheme: oldstyle]
%-------------------------------------------------------------------------------
@@ -65,13 +65,13 @@
\renewcommand*{\hintfont}{\bfseries}
% styles
-\newcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
-\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
-\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
-\newcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
-\newcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
-\newcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
-\newcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
+\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
+\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
+\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
+\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
+\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
+\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
% lengths
\newlength{\quotewidth}