From 44edae68ae5421ecf63bfcc931a9e00fb208aea0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Nov 2011 23:28:40 +0000 Subject: moderncv 0.13 (7nov11) git-svn-id: svn://tug.org/texlive/trunk@24535 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/moderncv/CHANGELOG | 11 +++++++ .../doc/latex/moderncv/examples/template.pdf | Bin 166073 -> 167313 bytes .../doc/latex/moderncv/examples/template.tex | 6 ++-- .../moderncv/examples/template_casual_orange.pdf | Bin 164484 -> 167318 bytes .../moderncv/examples/template_classic_green.pdf | Bin 230582 -> 239378 bytes .../latex/moderncv/examples/template_multibib.pdf | Bin 164681 -> 167639 bytes Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 20 ++++++------- .../tex/latex/moderncv/moderncvcompatibility.sty | 4 +-- .../tex/latex/moderncv/moderncvthemecasual.sty | 32 ++++++++++++++++++--- .../tex/latex/moderncv/moderncvthemeclassic.sty | 29 ++++++++++++++++--- .../tex/latex/moderncv/moderncvthemeempty.sty | 4 +-- 11 files changed, 80 insertions(+), 26 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG index 56f8ee2e236..8ee25648f94 100644 --- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG +++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG @@ -1,3 +1,14 @@ +version 0.13 (06 November 2010) + - 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 + (e.g., dvips, xetex), leftover from the v 0.11 cleanup, as reported by + K. Amaterasu and P. Mavrogiorgos. + - added a "purple" color option, as proposed by B. Ravel. + - added a 3rd optional argument to the \photo command to control the thickness of + the framebox. Setting it to 0pt will disable the frame around the photo, as + requested by T. Krennwallner. + version 0.12 (03 August 2010) - prevents pagebreaks after sections and subsections (launchpad bug #409902), as originally reported by C. Gaspoz and fixed by launchpad user tentotwo). diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf index 52489604e5e..58e8277deea 100644 Binary files a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf and b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf differ diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex index d426fe1766a..6154fb1d791 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex @@ -1,5 +1,5 @@ %% start of file `template.tex'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -9,7 +9,7 @@ \documentclass[11pt,a4paper]{moderncv} % moderncv themes -\moderncvtheme[blue]{casual} % optional argument are 'blue' (default), 'orange', 'red', 'green', 'grey' and 'roman' (for roman fonts, instead of sans serif fonts) +\moderncvtheme[blue]{casual} % optional argument are 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'roman' (for roman fonts, instead of sans serif fonts) %\moderncvtheme[green]{classic} % idem % character encoding @@ -32,7 +32,7 @@ \email{email (optional)} % optional, remove the line if not wanted \homepage{homepage (optional)} % optional, remove the line if not wanted \extrainfo{additional information (optional)} % optional, remove the line if not wanted -\photo[64pt]{picture} % '64pt' is the height the picture must be resized to and 'picture' is the name of the picture file; optional, remove the line if not wanted +\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 % to show numerical labels in the bibliography; only useful if you make citations in your resume 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 80a0c1d0d3d..fac47eeb7d0 100644 Binary files a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf and b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf 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 1d5d2121866..14178f59cb9 100644 Binary files a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf and b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf 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 2d2136101ca..71ae6e4a684 100644 Binary files a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf and b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf differ diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index f83caf1986a..7f66e19ab1a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -1,5 +1,5 @@ %% start of file `moderncv.cls'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{moderncv}[2010/08/03 v0.12 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2011/11/06 v0.13 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -64,10 +64,6 @@ \newif\if@lmodern\@lmoderntrue \DeclareOption{nolmodern}{\@lmodernfalse} -% nocolor option -\newif\if@color\@colortrue -\DeclareOption{nocolor}{\@colorfalse} - % CJK option %\newif\if@CJK\@CJKfalse %\DeclareOption{CJK}{\@CJKtrue} @@ -130,7 +126,7 @@ \AtEndPreamble{ \@ifpackageloaded{CJK} {\RequirePackage[CJKbookmarks]{hyperref}} - {\RequirePackage[pdftex]{hyperref}} + {\RequirePackage{hyperref}} \AtBeginDocument{ \hypersetup{ breaklinks, @@ -160,6 +156,9 @@ \fancyhf{}} \pagestyle{plain} +% advanced command arguments +\RequirePackage{xargs} + % compatibility package with older versions of moderncv \RequirePackageWithOptions{moderncvcompatibility} @@ -175,6 +174,8 @@ \setlength{\parskip}{0pt} \setlength\columnsep{10\p@} \setlength\columnseprule{0\p@} +\setlength\fboxsep{3\p@} +\setlength\fboxrule{.4\p@} % TO BE TESTED %\setlength\arraycolsep{5\p@} @@ -182,8 +183,6 @@ %\setlength\arrayrulewidth{.4\p@} %\setlength\doublerulesep{2\p@} %\setlength\tabbingsep{\labelsep} -%\setlength\fboxsep{3\p@} -%\setlength\fboxrule{.4\p@} \pagestyle{empty} \raggedbottom @@ -254,8 +253,7 @@ \newcommand*{\email}[1]{\def\@email{#1}} \newcommand*{\homepage}[1]{\def\@homepage{#1}} \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} -\def\@photowidth{0pt} -\newcommand*{\photo}[2][64pt]{\def\@photowidth{#1}\def\@photo{#2}} +\newcommandx*{\photo}[3][1=64pt,2=0.4pt,usedefault]{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}% the 1st (optional) argument is the width of the photo, the 2nd (optional) argument is the thickness of the frame around it. \newcommand*{\quote}[1]{\def\@quote{#1}} % length used by the moderncv layout diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index f0e7945581d..f5fd4ea002c 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcompatibility.sty'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcompatibility}[2010/08/03 v0.12 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2011/11/06 v0.13 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty index b4b356246c8..121b6170bb0 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty @@ -1,5 +1,5 @@ %% start of file `moderncvthemecasual.sty'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemecasual}[2010/08/03 v0.12 modern curriculum vitae style: casual] +\ProvidesPackage{moderncvthemecasual}[2011/11/06 v0.13 modern curriculum vitae style: casual] %------------------------------------------------------------------------------- @@ -33,9 +33,15 @@ % red \newif\if@colorred\@colorredfalse \DeclareOption{red}{\@colorredtrue} +% purple +\newif\if@colorpurple\@colorpurplefalse +\DeclareOption{purple}{\@colorpurpletrue} % grey \newif\if@colorgrey\@colorgreyfalse \DeclareOption{grey}{\@colorgreytrue} +% black +\newif\if@colorblack\@colorblackfalse +\DeclareOption{black}{\@colorblacktrue} % roman option \newif\if@roman\@romanfalse @@ -46,7 +52,7 @@ \PackageWarning{moderncvthemecasual}{Unknown option ‘\CurrentOption’}} % execute default options -\ExecuteOptions{color} +\ExecuteOptions{} % process given options \ProcessOptions\relax @@ -82,11 +88,25 @@ \definecolor{sectiontitlecolor}{rgb}{0.95,0.20,0.20} \definecolor{subsectioncolor}{rgb}{0.95,0.20,0.20} \definecolor{footersymbolcolor}{rgb}{0.95,0.20,0.20}\fi +\if@colorpurple + \definecolor{sectionrectanglecolor}{rgb}{0.40,0.23,0.80} + \definecolor{sectiontitlecolor}{rgb}{0.50,0.33,0.80} + \definecolor{subsectioncolor}{rgb}{0.50,0.33,0.80} + \definecolor{addresscolor}{rgb}{0.40,0.23,0.70}\fi \if@colorgrey \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75} \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35} \definecolor{subsectioncolor}{rgb}{0.35,0.35,0.35} \definecolor{footersymbolcolor}{rgb}{0.35,0.35,0.35}\fi +\if@colorblack + \definecolor{firstnamecolor}{rgb}{0,0,0} + \definecolor{familynamecolor}{rgb}{0,0,0} + \definecolor{quotecolor}{rgb}{0,0,0} + \definecolor{addresscolor}{rgb}{0,0,0} + \definecolor{sectionrectanglecolor}{rgb}{0,0,0} + \definecolor{sectiontitlecolor}{rgb}{0,0,0} + \definecolor{subsectioncolor}{rgb}{0,0,0} + \definecolor{footersymbolcolor}{rgb}{0,0,0}\fi % fonts \if@roman @@ -108,7 +128,11 @@ {% \ifthenelse{\isundefined{\@photo}}% {}% - {{\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}% + {% + \setlength\fboxrule{\@photoframewidth}% + \ifdim\@photoframewidth=0pt% + \setlength{\fboxsep}{0pt}\fi% + {\color{firstnamecolor}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}% \hfill% % \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}% \raggedleft{\firstnamestyle{\@firstname}~\familynamestyle{\@familyname}}\\[-.35em]}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty index 666c7241753..8dff0148f6a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty @@ -1,5 +1,5 @@ %% start of file `moderncvthemeclassic.sty'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemeclassic}[2010/08/03 v0.12 modern curriculum vitae style: classic] +\ProvidesPackage{moderncvthemeclassic}[2011/11/06 v0.13 modern curriculum vitae style: classic] %------------------------------------------------------------------------------- @@ -33,9 +33,15 @@ % red \newif\if@colorred\@colorredfalse \DeclareOption{red}{\@colorredtrue} +% purple +\newif\if@colorpurple\@colorpurplefalse +\DeclareOption{purple}{\@colorpurpletrue} % grey \newif\if@colorgrey\@colorgreyfalse \DeclareOption{grey}{\@colorgreytrue} +% black +\newif\if@colorblack\@colorblackfalse +\DeclareOption{black}{\@colorblacktrue} % roman option \newif\if@roman\@romanfalse @@ -46,7 +52,7 @@ \PackageWarning{moderncvthemeclassic}{Unknown option ‘\CurrentOption’}} % execute default options -\ExecuteOptions{color} +\ExecuteOptions{} % process given options \ProcessOptions\relax @@ -82,11 +88,23 @@ \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30} \definecolor{sectiontitlecolor}{rgb}{0.95,0.20,0.20} \definecolor{subsectioncolor}{rgb}{0.95,0.20,0.20}\fi +\if@colorpurple + \definecolor{sectionrectanglecolor}{rgb}{0.40,0.23,0.80} + \definecolor{sectiontitlecolor}{rgb}{0.50,0.33,0.80} + \definecolor{subsectioncolor}{rgb}{0.50,0.33,0.80} + \definecolor{addresscolor}{rgb}{0.40,0.23,0.70}\fi \if@colorgrey \definecolor{addresscolor}{rgb}{0.35,0.35,0.35} \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75} \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35} \definecolor{subsectioncolor}{rgb}{0.35,0.35,0.35}\fi +\if@colorblack + \definecolor{titlecolor}{rgb}{0,0,0} + \definecolor{quotecolor}{rgb}{0,0,0} + \definecolor{addresscolor}{rgb}{0,0,0} + \definecolor{sectionrectanglecolor}{rgb}{0,0,0} + \definecolor{sectiontitlecolor}{rgb}{0,0,0} + \definecolor{subsectioncolor}{rgb}{0,0,0}\fi % fonts \if@roman @@ -157,7 +175,10 @@ {% \hspace*{\separatorcolumnwidth}% \begin{minipage}[b]{\maketitlepicturewidth}% - \raggedleft{}\addressfont\color{addresscolor}% required to correctly align content + \raggedleft{}\addressfont\color{addresscolor}% required to correctly align content + \setlength\fboxrule{\@photoframewidth}% + \ifdim\@photoframewidth=0pt% + \setlength{\fboxsep}{0pt}\fi% \framebox{\includegraphics[width=\maketitlepicturewidth]{\@photo}}% \end{minipage}}\\[3em]% % optional quote diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty index fc4fadfada8..1ccd50dd380 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty @@ -1,5 +1,5 @@ %% start of file `moderncvthemeempty.sty'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemeempty}[2010/08/03 v0.12 modern curriculum vitae style: empty] +\ProvidesPackage{moderncvthemeempty}[2011/11/06 v0.13 modern curriculum vitae style: empty] %------------------------------------------------------------------------------- -- cgit v1.2.3