summaryrefslogtreecommitdiff
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
parentc8840db08daf67f916ca0e0613031351add227dc (diff)
moderncv (30jul12)
git-svn-id: svn://tug.org/texlive/trunk@27250 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/CHANGELOG68
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/publications.bib6
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdfbin33258 -> 171907 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdfbin245908 -> 241625 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template.pdfbin36512 -> 233761 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template.tex12
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdfbin25307 -> 199139 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_banking_red.pdfbin25411 -> 167154 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdfbin36512 -> 233641 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdfbin44670 -> 280737 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdfbin33125 -> 171468 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdfbin30169 -> 68523 bytes
-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
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check6
27 files changed, 246 insertions, 109 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index a55383ddc03..a893c0e60fa 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,4 +1,30 @@
-version 1.0 (26 Mar 2012)
+version 1.1.1 (30 Jul 2012)
+ - fixed a compatibility issue introduced in version 1.0.0 when
+ \maketitlenamewidth was renamed to \makecvtitlenamewidth, as reported by Peppe
+ on launchpad (launchpad bug #1030802). The template now correctly uses
+ \makecvtitlenamewidth, and \maketitlenamewidth was created as an alias for
+ backward compatibility.
+
+version 1.1.0 (29 Jul 2012)
+ - fixed the switching from letter to resume, correcting spacing errors when a
+ letter is typeset before the resume, as noticed by U. Gabor.
+ - fixed the vertical alignment of the footers, as reported by T. Homa.
+ Footers are now aligned to the bottom and the letter and cv footers are
+ perfectly aligned in the "casual" style.
+ - prepared moderncv for fontspec font loading (still commented in code).
+ - changed the handling of the "sans" and "roman" class options, to be reflected
+ at the beginning of the document and override style font choices.
+ - turned unicode support in hyperref on by default.
+ - tweaked the usage of \textbullet to avoid the fall-back to Computer Modern
+ fonts and prepared the usage of symbols from the MarVoSym font for fontspec
+ (LauLaTeX or XeLaTeX).
+ - tweaked the \subsectionfill of the "banking" style to distribute extra space
+ evenly between leaders.
+ - added two options to change the "Enclosure" string used for the letter
+ enclosure: either specify another string as optional argument to \enclosure,
+ or redefine \enclname, as suggested by D. Wille.
+
+version 1.0.0 (26 Mar 2012)
- added commands to generate letters for every resume style: \recipient, \date,
\opening, \closing, \enclosure, \makelettertitle and \makeletterclosing. The
old \maketitle and \makefooter commands are now deprecated and replaced by
@@ -6,16 +32,16 @@ version 1.0 (26 Mar 2012)
- changed the alignment algorithm for the personal data display in the oldstyle
style, as to align on the baseline of the first line with the surrounding text.
-version 0.19 (06 Feb 2012)
+version 0.19.0 (06 Feb 2012)
- reintroduced the ability to force the width reserved to display the name
in the resume header for the classic style (\maketitlenamewidth).
- improved the pdf metadata, as reported by S. Wunsch (launchpad bug #922476).
- fixed a footersymbol bug in the casual style when no mobile number was given,
as reported by S. Wunsch (launchpad bug #922470).
- fixed a display bug when an address was given without postcode/city, as
- reported by O.Shaneh (launchpad bug #670263).
+ reported by O. Shaneh (launchpad bug #670263).
-version 0.18 (05 Feb 2012)
+version 0.18.0 (05 Feb 2012)
- corrected the handling of pdf bookmarks, as suggested on stackexchange by
U. Fischer.
- improved the spacing between sections and subsections by using \addvspace
@@ -26,7 +52,7 @@ version 0.18 (05 Feb 2012)
\cvdoubleitem definition, to avoid printing a colon without preceding label.
- added a new style on top of classic, casual and oldstyle: banking.
-version 0.17 (25 Jan 2012)
+version 0.17.0 (25 Jan 2012)
- changed the footer algorithm of style casual to avoid starting lines with
the footer symbol.
- aligned the space before and after the title across styles.
@@ -36,7 +62,7 @@ version 0.17 (25 Jan 2012)
- corrected the vertical misalignment between the page number and the center
footer in the casual style.
-version 0.16 (15 Jan 2012)
+version 0.16.0 (15 Jan 2012)
- added starred versions of \section and \subsection (that are identical to
their non-starred version, to e.g. enable biblatex support as requested by
S. Verberkt (launchpad bug #913102).
@@ -48,7 +74,7 @@ version 0.15.1 (23 December 2011)
- corrected a bug in the classic style causing the address font and color not
being carried over newlines, as reported by J. Smith.
-version 0.15 (19 December 2011)
+version 0.15.0 (19 December 2011)
- corrected list spacing.
- corrected inconsistent use of sans serif fonts in roman layout option.
- the lmodern fonts are now automatically loaded only if installed on the
@@ -67,7 +93,7 @@ version 0.15 (19 December 2011)
- added a new style on top of classic and casual: oldstyle.
- loaded the microtype package to improve typography.
-version 0.14 (04 December 2011)
+version 0.14.0 (04 December 2011)
- added support for CJK, thanks to the help of P. D'Apice.
- the use of \recomputelengths after modifying any length in the preamble is
now unnecessary; \recomputelength is automatically called at the start of the
@@ -77,7 +103,7 @@ version 0.13.1 (11 November 2011)
- corrected a bug introduced by v0.13 in the classic style when no \photo is
used, as reported by S. Gislais (launchpad bug #888702).
-version 0.13 (06 November 2011)
+version 0.13.0 (06 November 2011)
- added a "black" color option to render the resume in black & white, as
suggested by F. Bicarri.
- removed the pdflatex option when loading hyperref to enable other engines
@@ -88,18 +114,18 @@ version 0.13 (06 November 2011)
of the framebox. Setting it to 0pt will disable the frame around the photo, as
requested by T. Krennwallner (launchpad bug #664568).
-version 0.12 (03 August 2010)
+version 0.12.0 (03 August 2010)
- prevented pagebreaks after sections and subsections (launchpad bug #409902),
as originally reported by C. Gaspoz and fixed by launchpad user tentotwo).
-version 0.11 (20 July 2010)
+version 0.11.0 (20 July 2010)
- removed the \ifpdf check when loading the graphicx package, as graphicx does
does check internally and this was preventing proper functionning with xelatex
and luatex, as reported by A. Trautmann. The same check was also removed
everywhere else in the document (i.e. when loading the color and hyperref
packages).
-version 0.10 (13 June 2010)
+version 0.10.0 (13 June 2010)
- fixed a compatibility issue with the natbib package (natbib uses \section*
to format the bibliography title, while only \section was defined by
moderncv), as reported on launchpad (launchpad bug #393920).
@@ -107,10 +133,10 @@ version 0.10 (13 June 2010)
package, due to the double definition of \AtEndPreamble, as reported by
D. Becker.
-version 0.9 (31 May 2010)
+version 0.9.0 (31 May 2010)
- added support for the itemize, enumerate and description environments.
-version 0.8 (24 May 2010)
+version 0.8.0 (24 May 2010)
- added support for multibib. Also modified the template to illustrate how to
show labels in the bibliography, as requested by Tom D. R. and Stefan K.
- added a command to indicate your personal homepage (\homepage{url}), as
@@ -126,7 +152,7 @@ version 0.8 (24 May 2010)
in \cventry, as reported by B. Ekran (launchpad bug #268768), L. Păncescu and
E. Gregorio.
-version 0.7 (17 June 2008)
+version 0.7.0 (17 June 2008)
- corrected an outstanding spacing bug (space between cvlines longer
than 1 line).
- removed the need to use \closesection and \emptysection as internal
@@ -144,7 +170,7 @@ version 0.7 (17 June 2008)
classic theme, by setting the length \maketitlenamewidth. Again, don't forget
to call \recomputelengths afterward.
-version 0.6 (28 May 2007)
+version 0.6.0 (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.
@@ -159,7 +185,7 @@ version 0.6 (28 May 2007)
C. Knuepfer.
- rewrote the examples.
-version 0.5 (9 September 2006)
+version 0.5.0 (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
argument.
@@ -178,11 +204,11 @@ version 0.5 (9 September 2006)
\vfill{\hfill{\scriptsize Produced \today.}}
at the end of your CV, as suggested by F. Hammann.
-version 0.4 (2 May 2006)
+version 0.4.0 (2 May 2006)
- removed the dependency on the geometry package, so that users can now invoke
it themselve, and easily change the geometry of the page.
-version 0.3 (10 April 2006)
+version 0.3.0 (10 April 2006)
- moderncv now uses the 'longtable' class, allowing cv sections to split
across multiple pages.
- the different lengths used by moderncv are now customizable! In particular,
@@ -203,7 +229,7 @@ version 0.3 (10 April 2006)
- corrected a spacing problem in the cventry command, as pointed out and
solved by B. Eßmann.
-version 0.2 (6 March 2006)
+version 0.2.0 (6 March 2006)
- rewrite of the code to have the styles (fonts, colours, headers and footers)
be defined in different files than the class. The styles are now defined in a
separate file per style, named moderncvstyle<style_name>. It should now be
@@ -223,5 +249,5 @@ version 0.2 (6 March 2006)
consistency purpose. For compatibility reasons, the command \cvresume still
works, but should be avoided.
-version 0.1 (1 March 2006)
+version 0.1.0 (1 March 2006)
- first release.
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib b/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib
index dc1f22c9f1e..0081c7b1a2c 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/publications.bib
@@ -1,5 +1,5 @@
-%% start of file `jdoe_publications.bib'.
-%% Copyright 2006 Xavier Danaux (xdanaux<AT>gmail.com).
+%% start of file `publications.bib'.
+%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -41,4 +41,4 @@
}
-%% end of file `jdoe_publications.bib'.
+%% end of file `publications.bib'.
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 4a81cdb082e..89c7e2fcac2 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 56bc23d6ff6..4f0d8129eb5 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 2867349cf48..3fb4fcba25c 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 0eb81b76fde..dd170b5481a 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex
@@ -21,7 +21,7 @@
% adjust the page margins
\usepackage[scale=0.75]{geometry}
%\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates
-%\setlength{\maketitlenamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks...
+%\setlength{\makecvtitlenamewidth}{10cm} % for the 'classic' style, if you want to force the width allocated to your name and avoid line breaks. be careful though, the length is normally calculated to avoid any overlap with your personal info; use this at your own typographical risks...
% personal data
\firstname{John}
@@ -112,7 +112,9 @@ Detailed achievements:%
\cvlistdoubleitem{Item 2}{Item 5\cite{book1}}
\cvlistdoubleitem{Item 3}{}
-% Publications from a BibTeX file without multibib\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}% for BibTeX numerical labels
+% Publications from a BibTeX file without multibib
+% for numerical labels: \renewcommand{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}}
+% to redefine the heading string ("Publications"): \renewcommand{\refname}{Articles}
\nocite{*}
\bibliographystyle{plain}
\bibliography{publications} % 'publications' is the name of a BibTeX file
@@ -133,7 +135,7 @@ Detailed achievements:%
\date{January 01, 1984}
\opening{Dear Sir or Madam,}
\closing{Yours faithfully,}
-\enclosure{curriculum vit\ae{}}
+\enclosure[Attached]{curriculum vit\ae{}} % use an optional argument to use a string other than "Enclosure", or redefine \enclname
\makelettertitle
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ullamcorper neque sit amet lectus facilisis sed luctus nisl iaculis. Vivamus at neque arcu, sed tempor quam. Curabitur pharetra tincidunt tincidunt. Morbi volutpat feugiat mauris, quis tempor neque vehicula volutpat. Duis tristique justo vel massa fermentum accumsan. Mauris ante elit, feugiat vestibulum tempor eget, eleifend ac ipsum. Donec scelerisque lobortis ipsum eu vestibulum. Pellentesque vel massa at felis accumsan rhoncus.
@@ -142,6 +144,10 @@ Suspendisse commodo, massa eu congue tincidunt, elit mauris pellentesque orci, c
Duis sit amet magna ante, at sodales diam. Aenean consectetur porta risus et sagittis. Ut interdum, enim varius pellentesque tincidunt, magna libero sodales tortor, ut fermentum nunc metus a ante. Vivamus odio leo, tincidunt eu luctus ut, sollicitudin sit amet metus. Nunc sed orci lectus. Ut sodales magna sed velit volutpat sit amet pulvinar diam venenatis.
+Albert Einstein discovered that $e=mc^2$ in 1905.
+
+\[ e=\lim_{n \to \infty} \left(1+\frac{1}{n}\right)^n \]
+
\makeletterclosing
%\clearpage\end{CJK*} % if you are typesetting your resume in Chinese using CJK; the \clearpage is required for fancyhdr to work correctly with CJK, though it kills the page numbering by making \lastpage undefined
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
index ff39e67656d..99a55c3454f 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_banking_black.pdf
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 689bb3e0e1f..858eaeb2956 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 dffc01f90d0..9d4de6db3ba 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 fbb80d42877..b1a665bf54b 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 1a93bb2253e..8142e74a9be 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 c4ae4892880..d732f79f62b 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 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
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index e460c3ff43c..7936e38f20e 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -191,7 +191,7 @@ my @TLP_working = qw(
gfsporson gfssolomos ghab
gillcm gincltex ginpenc gitinfo
gloss glossaries gmdoc gmdoc-enhance gmeometric
- gmiflink gmp gmutils gmverb gmverse gnu-freefont gnuplottex gost
+ gmiflink gmp gmutils gmverb gmverse gnuplottex gost
gradientframe grafcet graphics graphics-pln
graphicx-psmin greek-inputenc greekdates greenpoint grfpaste
grid gridset grverb gtrcrd gu guitar guitlogo
@@ -491,6 +491,7 @@ my @TLP_no_check = (
"fontname", # tl-update-auto
"fontware", # binary
"garuda-c90", # part of cjk
+ "gnu-freefont", # no files to compare, distributed as tarballs
"groff", # binary
"gsftopk", # binary
"ifluatex", # part of oberdiek
@@ -641,6 +642,9 @@ sub do_tlp {
# Lowercase readme wrongly matched against uppercase README in musixtex.
next if $basefile eq "readme";
+ # Wrong README gets compared.
+ next if $basefile eq "README" && $file =~ m,/pmx/,;
+
my $tl_file = "$Master/$file";
if (! -e $tl_file) {
warn "$tl_file: TL file missing\n";