summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-30 22:38:11 +0000
committerKarl Berry <karl@freefriends.org>2012-07-30 22:38:11 +0000
commitbcf694a0835cc008732c04f517813ab94f02963e (patch)
tree242e42751669b0d411e969f6c2678502e3218033 /Master/texmf-dist/tex/latex
parentc8840db08daf67f916ca0e0613031351add227dc (diff)
moderncv (30jul12)
git-svn-id: svn://tug.org/texlive/trunk@27250 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls125
-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.sty3
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty39
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty24
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty27
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty29
14 files changed, 182 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index 55fff7b754b..f3afd48de33 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/03/26 v1.0 modern curriculum vitae and letter document class]
+\ProvidesClass{moderncv}[2012/07/30 v1.1.1 modern curriculum vitae and letter document class]
%-------------------------------------------------------------------------------
@@ -51,15 +51,15 @@
\DeclareOption{12pt}{\renewcommand\@ptsize{2}}
% font type options
-\DeclareOption{sans}{\renewcommand{\familydefault}{\sfdefault}}
-\DeclareOption{roman}{\renewcommand{\familydefault}{\rmdefault}}
+\DeclareOption{sans}{\AtBeginDocument{\renewcommand{\familydefault}{\sfdefault}}}
+\DeclareOption{roman}{\AtBeginDocument{\renewcommand{\familydefault}{\rmdefault}}}
% draft/final option
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
% execute default options
-\ExecuteOptions{a4paper,11pt,sans,final}
+\ExecuteOptions{a4paper,11pt,final}
% process given options
\ProcessOptions\relax
@@ -78,40 +78,69 @@
% 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}
-% automatic loading of latin modern fonts if present on the system
-\IfFileExists{lmodern.sty}
- {\RequirePackage[T1]{fontenc}\RequirePackage{lmodern}}
- {}
-
-% symbols like \Telefon, \Mobilefone, \Letter and \Email
-\RequirePackage{marvosym}
+% font loading
+%\usepackage{ifxetex,ifluatex}
+%\newif\ifxetexorluatex
+%\ifxetex
+% \xetexorluatextrue
+%\else
+% \ifluatex
+% \xetexorluatextrue
+% \else
+% \xetexorluatexfalse
+% \fi
+%\fi
+% automatic loading of latin modern fonts
+%\ifxetexorluatex
+% \RequirePackage{fontspec}
+% \defaultfontfeatures{Ligatures=TeX}
+% \RequirePackage{unicode-math}
+% \setmainfont{Latin Modern}
+% \setsansfont{Latin Modern Sans}
+% \setmathfont{Latin Modern Math}
+%\else
+ \RequirePackage[T1]{fontenc}
+ \IfFileExists{lmodern.sty}%
+ {\RequirePackage{lmodern}}%
+ {}
+%\fi
+
+% MarVoSym font for symbols
+%\RequirePackage{marvosym}
+\newcommand*{\marvosymbol}[1]{}
+%\ifxetexorluatex
+% \renewcommand*{\marvosymbol}[1]{{\fontspec{MarVoSym}\char#1}}
+%\else
+ \renewcommand*{\marvosymbol}[1]{{\fontfamily{mvs}\fontencoding{U}\fontseries{m}\fontshape{n}\selectfont\char#1}}
+%\fi
% hyper links (hyperref is loaded at the end of the preamble to pass options required by loaded packages such as CJK)
\RequirePackage{url}
\urlstyle{tt}
\AtEndPreamble{
- \@ifpackageloaded{CJK}
- {\RequirePackage[unicode]{hyperref}}
- {\RequirePackage{hyperref}}
- \hypersetup{
- breaklinks,
- baseurl = http://,
- pdfborder = 0 0 0,
- pdfpagemode = UseNone,% do not show thumbnails or bookmarks on opening
- pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
- pdfstartpage = 1,
- pdfcreator = {\LaTeX{} with `moderncv' package},
-% pdfproducer = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used
- bookmarksopen = true,
- bookmarksdepth= 2,% to show sections and subsections
- pdfauthor = {\@firstname{}~\@familyname{}},
- pdftitle = {\@firstname{}~\@familyname{} -- \@title{}},
- pdfsubject = {Resum\'{e} of \@firstname{}~\@familyname{}},
- pdfkeywords = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}
+ \RequirePackage[unicode]{hyperref}
+ \hypersetup{
+ breaklinks,
+ baseurl = http://,
+ pdfborder = 0 0 0,
+ pdfpagemode = UseNone,% do not show thumbnails or bookmarks on opening
+ pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
+ pdfstartpage = 1,
+ pdfcreator = {\LaTeX{} with 'moderncv' package},
+% pdfproducer = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used
+ bookmarksopen = true,
+ bookmarksdepth= 2,% to show sections and subsections
+ 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
}
@@ -135,7 +164,7 @@
\newlength{\pagenumberwidth}%
\settowidth{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}%
\fancypagestyle{plain}{%
- \fancyfoot[r]{\parbox{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}}}% the parbox is required to ensure alignment with a possible center footer (e.g., as in the casual style)
+ \fancyfoot[r]{\parbox[b]{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}}}% the parbox is required to ensure alignment with a possible center footer (e.g., as in the casual style)
\pagestyle{plain}}{}}%
\AtEndDocument{\label{lastpage}}\else\fi}}
\pagestyle{plain}
@@ -167,7 +196,7 @@
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
-% Not required
+% not required
%\setlength\arraycolsep{5\p@}
%\setlength\tabcolsep{6\p@}
%\setlength\arrayrulewidth{.4\p@}
@@ -188,7 +217,7 @@
\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*{\fax}[1]{\def\@fax{#1}}
\newcommand*{\email}[1]{\def\@email{#1}}
\newcommand*{\homepage}[1]{\def\@homepage{#1}}
@@ -200,10 +229,10 @@
% symbols
% itemize labels (the struts were added to correct inter-item spacing (works for single line items, until a solution is found for multi-line ones...)
-\newcommand*{\labelitemi}{\strut\textcolor{color1}{\Neutral}}% alternative" \fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}
+\newcommand*{\labelitemi}{\strut\textcolor{color1}{\marvosymbol{123}}}% equivalent to \Neutral from marvosym package; alternative: \fontencoding{U}\fontfamily{ding}\selectfont\tiny\symbol{'102}
\newcommand*{\labelitemii}{\strut\textcolor{color1}{\large\bfseries-}}
-\newcommand*{\labelitemiii}{\strut\textcolor{color1}{\textperiodcentered}}% alternative: \textasteriskcentered; both force the use of the CMSY font, even when lmodern fonts are used :(
-\newcommand*{\labelitemiv}{\strut\textcolor{color1}{\textperiodcentered}}
+\newcommand*{\labelitemiii}{\strut\textcolor{color1}{\rmfamily\textperiodcentered}}% alternative: \textasteriskcentered; the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
+\newcommand*{\labelitemiv}{\labelitemiii}
% enumerate labels
\renewcommand{\theenumi}{\@arabic\c@enumi}
\renewcommand{\theenumii}{\@alph\c@enumii}
@@ -212,15 +241,19 @@
% other symbols
\newcommand*{\listitemsymbol}{\labelitemi~}
\newcommand*{\addresssymbol}{}
-\newcommand*{\mobilesymbol}{\Mobilefone~}
-\newcommand*{\phonesymbol}{\Telefon~}
-\newcommand*{\faxsymbol}{\FAX~}
-\newcommand*{\emailsymbol}{\Letter~}
-\newcommand*{\homepagesymbol}{{\Large\ComputerMouse}~}
+\newcommand*{\mobilesymbol}{}
+\newcommand*{\phonesymbol}{}
+\newcommand*{\faxsymbol}{}
+\newcommand*{\emailsymbol}{}
+\newcommand*{\homepagesymbol}{}
% fonts
\AtBeginDocument{\normalfont\color{color0}}
+% strings for internationalisation
+\newcommand*{\refname}{Publications}
+\newcommand*{\enclname}{Enclosure}
+
% makes the footer (normally used both for the resume and the letter)
% usage: \makefooter
\newcommand*{\makefooter}{}%
@@ -337,7 +370,6 @@
{\href{mailto:#2}{#1}}}
% thebibliography environment, for use with BibTeX and possibly multibib
-\newcommand*{\refname}{Publications}
\newlength{\bibindent}
\setlength{\bibindent}{1.5em}
% bibliography item label
@@ -405,22 +437,25 @@
\renewcommand*{\date}[1]{\def\@date{#1}}
\newcommand*{\opening}[1]{\def\@opening{#1}}
\newcommand*{\closing}[1]{\def\@closing{#1}}
-\newcommand*{\enclosure}[1]{\def\@enclosure{#1}}
+\newcommand*{\enclosure}[2][]{%
+ % if an optional argument is provided, use it to redefine \enclname
+ \ifthenelse{\equal{#1}{}}{}{\renewcommand*{\enclname}{#1}}%
+ \def\@enclosure{#2}}
% recompute all letter lengths
\newcommand*{\recomputeletterlengths}{}
% makes the letter title
% usage: \makelettertitle
-\newcommand*{\makelettertitle}{}%
+\newcommand*{\makelettertitle}{}
% makes the letter footer
% usage: \makeletterfooter
-\newcommand*{\makeletterfooter}{\makefooter}%
+\newcommand*{\makeletterfooter}{\makefooter}
% makes the letter closing
% usage: \makeletterclosing
-\newcommand*{\makeletterclosing}{}%
+\newcommand*{\makeletterclosing}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
index 762b9b7f6c2..9c241fd8a88 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/03/26 v1.0 modern curriculum vitae and letter color scheme: black]
+\ProvidesPackage{moderncvcolorblack}[2012/07/30 v1.1.1 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 8bd2f9d2c58..9b000a2bd00 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/03/26 v1.0 modern curriculum vitae and letter color scheme: blue]
+\ProvidesPackage{moderncvcolorblue}[2012/07/30 v1.1.1 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 6f64ac84bc5..570c9dd090f 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/03/26 v1.0 modern curriculum vitae and letter color scheme: green]
+\ProvidesPackage{moderncvcolorgreen}[2012/07/30 v1.1.1 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 4b85eb3a67b..cf892a2e6cc 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/03/26 v1.0 modern curriculum vitae and letter color scheme: grey]
+\ProvidesPackage{moderncvcolorgrey}[2012/07/30 v1.1.1 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 8e26eae3e04..9dc3d4a149e 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/03/26 v1.0 modern curriculum vitae and letter color scheme: orange]
+\ProvidesPackage{moderncvcolororange}[2012/07/30 v1.1.1 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 ed0e3988960..754ddb83a22 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/03/26 v1.0 modern curriculum vitae and letter color scheme: purple]
+\ProvidesPackage{moderncvcolorpurple}[2012/07/30 v1.1.1 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 e3d8203c014..3086aac8184 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/03/26 v1.0 modern curriculum vitae and letter color scheme: red]
+\ProvidesPackage{moderncvcolorred}[2012/07/30 v1.1.1 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 3997bcf49bf..551f8977a75 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/03/26 v1.0 modern curriculum vitae and letter compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2012/07/30 v1.1.1 modern curriculum vitae and letter compatibility patches]
%-------------------------------------------------------------------------------
@@ -77,6 +77,7 @@
% compatibility with versions <= 0.19
\newcommand*{\maketitle}{\makecvtitle}%
\title{}% to avoid LaTeX complaining that \maketitle is a called without first a call to \title
+\newcommand*{\maketitlenamewidth}{\makecvtitlenamewidth}
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
index a8ca0e9eb89..2d82c579fc6 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/03/26 v1.0 modern curriculum vitae and letter style scheme: banking]
+\ProvidesPackage{moderncvstylebanking}[2012/07/30 v1.1.1 modern curriculum vitae and letter style scheme: banking]
%-------------------------------------------------------------------------------
@@ -21,16 +21,37 @@
%-------------------------------------------------------------------------------
% package options
%-------------------------------------------------------------------------------
-\RequirePackage{tgpagella}
-\renewcommand*{\familydefault}{\rmdefault}
%-------------------------------------------------------------------------------
% overall style definition
%-------------------------------------------------------------------------------
+% fonts
+%\ifxetexorluatex
+% \setmainfont{Tex-Gyre Pagella}
+% \setsansfont{Tex-Gyre Pagella}
+% \setmathfont{Tex-Gyre Pagella}
+% \setmathfont[range=\mathit,\mathsfit]{Tex-Gyre Pagella Italic}
+% \setmathfont[range=\mathbfup,\mathbfsfup]{Tex-Gyre Pagella Bold}
+% \setmathfont[range=\mathbfit,\mathbfsfit]{Tex-Gyre Pagella Bold Italic}
+%\else
+ \IfFileExists{tgpagella.sty}%
+ {%
+ \RequirePackage{tgpagella}%
+ \renewcommand*{\familydefault}{\rmdefault}}%
+ {}
+%\fi
+
+% symbols
+\renewcommand*{\mobilesymbol}{\marvosymbol{72}~}
+\renewcommand*{\phonesymbol}{\marvosymbol{84}~}
+\renewcommand*{\faxsymbol}{\marvosymbol{117}~}
+\renewcommand*{\emailsymbol}{\marvosymbol{66}~}
+\renewcommand*{\homepagesymbol}{{\Large\marvosymbol{205}}~}
+
% commands
\newcommand*{\maketitlesymbol}{%
- {~~~\textbullet~~~}}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :(
+ {~~~{\rmfamily\textbullet}~~~}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
% internal command to add an element to the footer
% it collects the elements in a temporary box, and checks when to flush the box
\newsavebox{\maketitlebox}%
@@ -108,7 +129,7 @@
\newlength{\listdoubleitemmaincolumnwidth}
% commands
-\renewcommand*{\recomputelengths}{%
+\renewcommand*{\recomputecvlengths}{%
\setlength{\quotewidth}{0.65\textwidth}%
% main lenghts
\setlength{\maincolumnwidth}{\textwidth}%
@@ -121,7 +142,9 @@
\setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemmaincolumnwidth}{0.5\listdoubleitemmaincolumnwidth}%
% fancyhdr lengths
- \renewcommand{\headwidth}{\textwidth}}
+ \renewcommand{\headwidth}{\textwidth}%
+ % regular lengths
+ \setlength{\parskip}{0\p@}}
\renewcommand*{\makecvtitle}{%
% recompute lengths (in case we are switching from letter to resume, or vice versa)
@@ -141,7 +164,7 @@
{\color{color1}\hrule}%
\par\nobreak\addvspace{1ex}\@afterheading}
-\newcommand{\subsectionfill}{\cleaders\hbox to 0.35em{\scriptsize.}\hfill}% for a dashed fill
+\newcommand{\subsectionfill}{\xleaders\hbox to 0.35em{\scriptsize.}\hfill}% different subsectionfills will not be perfectly aligned, but remaining space at the end of the fill will be distributed evenly between leaders, so it will be barely visible
\renewcommand*{\subsection}[1]{%
\par\addvspace{1ex}%
\phantomsection{}%
@@ -254,7 +277,7 @@
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfill%
- {\color{color2}\itshape Enclosure: \@enclosure}}}
+ {\color{color2}\itshape\enclname: \@enclosure}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
index 861ecccbe36..81e420f6254 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/03/26 v1.0 modern curriculum vitae and letter style scheme: casual]
+\ProvidesPackage{moderncvstylecasual}[2012/07/30 v1.1.1 modern curriculum vitae and letter style scheme: casual]
%-------------------------------------------------------------------------------
@@ -30,7 +30,7 @@
% commands
% footer symbol used to separate footer elements
\newcommand*{\footersymbol}{%
- {~~~\textbullet~~~}}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :(
+ {~~~{\rmfamily\textbullet}~~~}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
% internal command to add an element to the footer
% it collects the elements in a temporary box, and checks when to flush the box
\newsavebox{\footerbox}%
@@ -58,7 +58,8 @@
\newcommand*{\flushfooter}{%
\strut\usebox{\footerbox}%
\savebox{\footerbox}{}%
- \savebox{\footertempbox}{}}
+ \savebox{\footertempbox}{}
+ \setlength{\footerboxwidth}{0pt}}
%-------------------------------------------------------------------------------
@@ -70,6 +71,8 @@
% commands
\renewcommand*{\makecvtitle}{%
+ % recompute lengths (in case we are switching from letter to resume, or vice versa)
+ \recomputecvlengths%
% ensure footer with personal information
\makecvfooter%
% optional picture
@@ -101,7 +104,7 @@
\setlength{\footerwidth}{0.8\textwidth}%
\fancypagestyle{plain}{%
\fancyfoot[c]{%
- \parbox{\footerwidth}{%
+ \parbox[b]{\footerwidth}{%
\centering%
\color{color2}\addressfont%
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
@@ -112,7 +115,8 @@
\ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}%
\ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}%
- \flushfooter}}}%
+ \ifthenelse{\lengthtest{\footerboxwidth=0pt}}{}{\flushfooter}% the lengthtest is required to avoid flushing an empty footer, which could cause a blank line due to the \\ after the address, if no other personal info is used
+ }}}%
\pagestyle{plain}}
@@ -146,10 +150,11 @@
\setlength{\footerwidth}{0.8\textwidth}%
\fancypagestyle{plain}{%
\fancyfoot[c]{%
- \parbox{\footerwidth}{%
+ \parbox[b]{\footerwidth}{%
\centering%
\addressfont\color{color2}%
- {\bfseries\upshape\@firstname~\@familyname}\\
+ \vspace{-\baselineskip}% to cancel out the extra vertical space taken by the name (below) and ensure perfect alignment of letter and cv footers
+ \strut{\bfseries\upshape\@firstname~\@familyname}\\% the \strut is required to ensure the line is exactly \baselineskip tall
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
\ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
\ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}%
@@ -158,7 +163,8 @@
\ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}%
\ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}%
\ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}%
- \flushfooter}}}%
+ \ifthenelse{\lengthtest{\footerboxwidth=0pt}}{}{\flushfooter}% the lengthtest is required to avoid flushing an empty footer, which could cause a blank line due to the \\ after the address, if no other personal info is used
+ }}}%
\pagestyle{plain}}
\renewcommand*{\makeletterclosing}{
@@ -167,7 +173,7 @@
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfil%
- {\color{color2}\itshape Enclosure: \@enclosure}}%
+ {\color{color2}\itshape\enclname: \@enclosure}}%
\vfil}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
index bb9d6c13f47..f8d2d0ce4bf 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/03/26 v1.0 modern curriculum vitae and letter style scheme: classic]
+\ProvidesPackage{moderncvstyleclassic}[2012/07/30 v1.1.1 modern curriculum vitae and letter style scheme: classic]
%-------------------------------------------------------------------------------
@@ -26,6 +26,23 @@
%-------------------------------------------------------------------------------
% overall style definition
%-------------------------------------------------------------------------------
+% fonts
+%\ifxetexorluatex
+% \setmainfont{Latin Modern Roman}
+% \setsansfont{Latin Modern Sans}
+% \setmathfont{Latin Modern Math}
+%\else
+ \IfFileExists{lmodern.sty}%
+ {\RequirePackage{lmodern}}%
+ {}
+%\fi
+
+% symbols
+\renewcommand*{\mobilesymbol}{\marvosymbol{72}~}
+\renewcommand*{\phonesymbol}{\marvosymbol{84}~}
+\renewcommand*{\faxsymbol}{\marvosymbol{117}~}
+\renewcommand*{\emailsymbol}{\marvosymbol{66}~}
+\renewcommand*{\homepagesymbol}{{\Large\marvosymbol{205}}~}
%-------------------------------------------------------------------------------
@@ -76,7 +93,9 @@
\setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
\setlength{\listdoubleitemmaincolumnwidth}{0.5\listdoubleitemmaincolumnwidth}%
% fancyhdr lengths
- \renewcommand{\headwidth}{\textwidth}}
+ \renewcommand{\headwidth}{\textwidth}%
+ % regular lengths
+ \setlength{\parskip}{0\p@}}
% optional maketitle width to force a certain width (if set to 0pt, the width is calculated automatically)
\newlength{\makecvtitlenamewidth}
@@ -228,7 +247,7 @@
% letter style definition
%-------------------------------------------------------------------------------
% commands
-\renewcommand*{\recomputeletterlengths}{
+\renewcommand*{\recomputeletterlengths}{%
\recomputecvlengths%
\setlength{\parskip}{6\p@}}
@@ -274,7 +293,7 @@
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfill%
- {\color{color2}\itshape Enclosure: \@enclosure}}}
+ {\color{color2}\itshape\enclname: \@enclosure}}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
index c11dc6188d0..131eb5530d7 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/03/26 v1.0 modern curriculum vitae scheme: empty]
+\ProvidesPackage{moderncvstyleempty}[2012/07/30 v1.1.1 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 3718c48c116..1ca2e576f7c 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/03/26 v1.0 modern curriculum vitae and letter style scheme: oldstyle]
+\ProvidesPackage{moderncvstyleoldstyle}[2012/07/30 v1.1.1 modern curriculum vitae and letter style scheme: oldstyle]
%-------------------------------------------------------------------------------
@@ -29,9 +29,18 @@
% overall style definition
%-------------------------------------------------------------------------------
% fonts
-\IfFileExists{kurier.sty}
- {\RequirePackage[light,math]{kurier}}
- {}
+%\ifxetexorluatex
+% \setmainfont[Numbers={OldStyle,Proportional}, BoldFont={Kurier Bold}, ItalicFont={Kurier Light Italic}, BoldItalicFont={Kurier Bold Italic}]{Kurier Light}
+% \setsansfont[Numbers={OldStyle,Proportional}, BoldFont={Kurier Bold}, ItalicFont={Kurier Light Italic}, BoldItalicFont={Kurier Bold Italic}]{Kurier Light}
+% \setmathfont{Kurier Light}
+% \setmathfont[range=\mathit,\mathsfit]{Kurier Light Italic}
+% \setmathfont[range=\mathbfup,\mathbfsfup]{Kurier Bold}
+% \setmathfont[range=\mathbfit,\mathbfsfit]{Kurier Bold Italic}
+%\else
+ \IfFileExists{kurier.sty}%
+ {\RequirePackage[light,math]{kurier}}%
+ {}
+%\fi
% symbols
\renewcommand*{\listitemsymbol}{\labelitemi~}
@@ -78,7 +87,15 @@
\newlength{\listdoubleitemmaincolumnwidth}
% commands
+\setlength{\marginparwidth}{0\p@}%
+\setlength{\marginparsep}{0\p@}
\renewcommand*{\recomputecvlengths}{%
+ % regular lengths
+ \changepage{}{+\marginparwidth+\marginparsep}{}{}{}{}{}{}{}% if a letter was typeset before the resume, \marginparwidth and \marginparsep will be non-zero; otherwise, this has no effect
+ \setlength{\marginparwidth}{0\p@}%
+ \setlength{\marginparsep}{0\p@}
+ \setlength{\parskip}{0\p@}%
+ % maketitle lengths
\setlength{\quotewidth}{0.65\textwidth}%
% main lenghts
\setlength{\maincolumnwidth}{\textwidth-\hintscolumnwidth-\separatorcolumnwidth}%
@@ -246,7 +263,7 @@
% commands
%\newlength{\textwidthdelta}%
\renewcommand*{\recomputeletterlengths}{%
- \recomputecvlengths{}%
+ \recomputecvlengths%
\setlength{\parskip}{6\p@}%
\leftskip=0pt%
% \setlength{\textwidthdelta}{+\marginparwidth+\marginparsep}%
@@ -291,7 +308,7 @@
\ifthenelse{\isundefined{\@enclosure}}{}{%
\\%
\vfill%
- {\color{color2}\itshape{}Enclosure: \@enclosure}}}
+ {\color{color2}\itshape\enclname: \@enclosure}}}
\endinput