From 6a512f2924f99e66adb4103f84b3d6a9b0b3ceed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 May 2007 18:37:26 +0000 Subject: moderncv update (28may07) git-svn-id: svn://tug.org/texlive/trunk@4383 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 159 +++++++++++---------- .../tex/latex/moderncv/moderncvcompatibility.sty | 10 +- .../tex/latex/moderncv/moderncvstylecasual.sty | 121 ---------------- .../tex/latex/moderncv/moderncvstyleclassic.sty | 108 -------------- .../tex/latex/moderncv/moderncvstyleempty.sty | 43 ------ .../tex/latex/moderncv/moderncvthemecasual.sty | 153 ++++++++++++++++++++ .../tex/latex/moderncv/moderncvthemeclassic.sty | 149 +++++++++++++++++++ .../tex/latex/moderncv/moderncvthemeempty.sty | 43 ++++++ 8 files changed, 436 insertions(+), 350 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty delete mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty delete mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty create mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty create mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty create mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index a790680fe55..44c4877b94a 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -1,5 +1,5 @@ %% start of file `moderncv.cls'. -%% Copyright 2006 Xavier Danaux. +%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,13 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{moderncv}[2006/09/09 v0.5 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2007/05/28 v0.6 modern curriculum vitae document class] + + +%------------------------------------------------------------------------------- +% debugging +%------------------------------------------------------------------------------- +\newif\if@DEBUG\@DEBUGfalse %------------------------------------------------------------------------------- @@ -114,25 +120,31 @@ % hyperrefs \RequirePackage{url} \ifpdf - \RequirePackage[pdftex,pdfborder=0,breaklinks,baseurl=http://,pdfpagemode=None,pdfstartview=FitH,pdfpagelayout=SinglePage,pdfstartpage=1]{hyperref} - \AtEndOfClass{% - \AtBeginDocument{% - \hypersetup{% - pdfauthor = \@firstname~\@familyname,% - pdftitle = \@title,% - pdfsubject = \@firstname~\@familyname,% - pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{},% - pdfcreator = \LaTeX{} with `moderncv' package,% - pdfproducer = \LaTeX}}} + \RequirePackage[pdftex]{hyperref} \else \RequirePackage[dvips]{hyperref}\fi +\AtEndOfClass{% + \AtBeginDocument{% + \hypersetup{% + breaklinks, + baseurl = http://, + pdfborder = 0 0 0, + pdfpagemode = None, + pdfstartview = XYZ, + pdfstartpage = 1, + pdfauthor = \@firstname~\@familyname,% + pdftitle = \@title,% + pdfsubject = \@firstname~\@familyname,% + pdfkeywords = \@firstname~\@familyname{} curriculum vit\ae{},% + pdfcreator = \LaTeX{} with `moderncv' package,% + pdfproducer = \LaTeX}}} \urlstyle{tt} % tables that split across multiple pages \RequirePackage[]{longtable} % spacing between sections -\setlength{\LTpre}{\medskipamount} -\setlength{\LTpost}{\medskipamount} +\setlength{\LTpre}{\smallskipamount} +\setlength{\LTpost}{\smallskipamount} \setlength{\LTleft}{0pt} \setlength{\LTright}{0pt} @@ -176,6 +188,11 @@ %------------------------------------------------------------------------------- % symbols used \providecommand*{\listitemsymbol}{\textbullet} +\providecommand*{\addresssymbol}{} +\providecommand*{\mobilesymbol}{\Mobilefone} +\providecommand*{\phonesymbol}{\Telefon} +\providecommand*{\faxsymbol}{\FAX} +\providecommand*{\emailsymbol}{\Letter} % colors \definecolor{firstnamecolor}{rgb}{0,0,0} @@ -208,14 +225,12 @@ \providecommand*{\subsectionstyle}[1]{{\subsectionfont\color{subsectioncolor}#1}} \providecommand*{\hintstyle}[1]{{\hintfont\color{hintcolor}#1}} -% styles: casual (default), classic, ... -\newcommand*{\moderncvstyle}[2][]{ - \def\@moderncvstyle{#2} - \def\@moderncvstyleoptions{#1}} -\AtBeginDocument{\RequirePackage[\@moderncvstyleoptions]{moderncvstyle\@moderncvstyle}} - -% load default style -\moderncvstyle{casual} +% themes: casual (default), classic, ... +\newcommand*{\moderncvtheme}[2][]{ + \def\@moderncvtheme{#2} + \def\@moderncvthemeoptions{#1}} +\moderncvtheme{casual} % default theme +\AtBeginDocument{\RequirePackage[\@moderncvthemeoptions]{moderncvtheme\@moderncvtheme}} %------------------------------------------------------------------------------- @@ -224,21 +239,14 @@ \newcommand*{\firstname}[1]{\def\@firstname{#1}} \newcommand*{\familyname}[1]{\def\@familyname{#1}} \renewcommand*{\title}[1]{\def\@title{#1}} -\newcommand*{\address}[1]{\def\@address{#1}} +\newcommand*{\address}[2]{\def\@addressstreet{#1}\def\@addresscity{#2}} +\newcommand*{\mobile}[1]{\def\@mobile{#1}} \newcommand*{\phone}[1]{\def\@phone{#1}} +\renewcommand*{\fax}[1]{\def\@fax{#1}} \newcommand*{\email}[1]{\def\@email{#1}} \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} -\newcommand*{\photo}[2][84pt]{\def\@photoheight{#1}\def\@photo{#2}} +\newcommand*{\photo}[2][64pt]{\def\@photoheight{#1}\def\@photo{#2}} \newcommand*{\quote}[1]{\def\@quote{#1}} -\firstname{} -\familyname{} -\title{} -\address{} -\phone{} -\email{} -\extrainfo{} -\photo{}{} -\quote{} % length used by the moderncv layout % quote length @@ -277,29 +285,26 @@ % listdoubleitem lengths \setlength{\listdoubleitemmaincolumnwidth}{\maincolumnwidth}% \addtolength{\listdoubleitemmaincolumnwidth}{-\listitemsymbolwidth}% - \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}} + \setlength{\listdoubleitemmaincolumnwidth}{0.475\listdoubleitemmaincolumnwidth}% + % fancyhdr lengths + \renewcommand{\headwidth}{\textwidth}} \sethintscolumnlength{0.15\textwidth} \recomputelengths % makes the cv title \renewcommand*{\maketitle}{}% -% make a quote -\newcommand*{\makequote}{% - {\centering{% - \begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}} - % draws a colored rectangle % usage: \colorrule[optional height]{width} %\newcommand*{\colorrule}[2][1ex]{{\color{sectionrectanglecolor}{\rule{#2}{#1}}}} \newif\if@sectionopen\@sectionopenfalse -\newif\if@firstcvline\@firstcvlinefalse % bug if initially set to true... +\newif\if@firstcvlineofsection\@firstcvlineofsectionfalse % bug if initially set to true... % usage: \closesection{} to force a section to be closed (and the tabular layout it generates) \newcommand*{\closesection}{% \if@sectionopen% \end{longtable}% - \phantomsection% reset the anchor for hyperrefs +% \phantomsection% reset the anchor for hyperrefs % \par\null% \@sectionopenfalse\fi} \AtEndDocument{\closesection{}} @@ -307,73 +312,64 @@ \newcommand*{\section}[1]{% \closesection{}% \@sectionopentrue% - \phantomsection{}% + \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{part}{#1}% -% \ignorespacesafterend% NOT WORKING - \begin{longtable}[l]{@{}l@{\hspace{\separatorcolumnwidth}}@{}p{\maincolumnwidth}@{}}% -% \colorrule{\hintscolumnwidth}&\mbox{\sectionstyle{#1}}\\[1ex]}% + \begin{longtable}[l]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% {\color{sectionrectanglecolor}\rule{\hintscolumnwidth}{1ex}} &\sectionstyle{#1}\\[1ex]% - \@firstcvlinetrue} + \@firstcvlineofsectiontrue% + } \newcommand*{\emptysection}{% \closesection{}% \@sectionopentrue% -% \ignorespacesafterend% NOT WORKING - \begin{longtable}[l]{@{}l@{\hspace{\separatorcolumnwidth}}@{}p{\maincolumnwidth}@{}}% - \@firstcvlinetrue} + \begin{longtable}[l]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% + \@firstcvlineofsectiontrue% + } % usage (inside section): \subsection{title} \newcommand*{\subsection}[1]{% - &\subsectionstyle{#1}\\[1ex]} + \cvline[0.65em]{}{\subsectionstyle{#1}}} % usage (inside section): \cvline{leftmark}{text} -\newcommand*{\cvline}[2]{% - \if@firstcvline% - \@firstcvlinefalse% - \\[-1em]% ugly hack to remove spaces before the first line +\newcommand*{\cvline}[3][.25em]{% + \if@firstcvlineofsection% + \@firstcvlineofsectionfalse% \else% - \\\fi% - \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#1}\end{minipage}&\begin{minipage}[t]{\maincolumnwidth}#2\end{minipage}} -% #1&\framebox{\begin{minipage}[t]{\maincolumnwidth}#2\end{minipage}}} -% \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintstyle{#1}\end{minipage}&\begin{minipage}[t]{\maincolumnwidth}#2\end{minipage}} - -% usage (inside section): \cvitem{leftmark}{text} -\newcommand*{\cvitem}[2]{% - \if@firstcvline - \else - \\[-0.75em]\fi - \cvline{#1}{#2}} + \\[#1]\fi% + \raggedleft\hintfont{#2} } % usage (inside section}: \cvdoubleitem{subtitle}{text}{subtitle}{text} \newcommand*{\cvdoubleitem}[4]{% - \cvitem{#1}{\begin{minipage}[t]{\doubleitemmaincolumnwidth}#2\end{minipage}% + \cvline{#1}{\begin{minipage}[t]{\doubleitemmaincolumnwidth}#2\end{minipage}% \hfill% \begin{minipage}[t]{\hintscolumnwidth}\raggedleft\hintfont{#3}\end{minipage}\hspace*{\separatorcolumnwidth}\begin{minipage}[t]{\doubleitemmaincolumnwidth}#4\end{minipage}}} % usage (inside section): \cvlistitem{point1} -\newcommand*{\cvlistitem}[1]{% - \cvline{}{\listitemsymbol{}~#1}} +\newcommand*{\cvlistitem}[2][\listitemsymbol{}]{% + \cvline[0pt]{}{#1~#2}} % usage (inside section): \cvlistdoubleitem{point1}{point2} -\newcommand*{\cvlistdoubleitem}[2]{% - \cvline{}{\listitemsymbol{}~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#1\end{minipage}% +\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{% + \cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}% \hfill% - \ifthenelse{\equal{#2}{}}% + \ifthenelse{\equal{#3}{}}% {}% - {\listitemsymbol{}~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}}}} + {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}} % usage : \cventry{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description} \newcommand*{\cventry}[6]{% - \cvitem{#1}{% + \cvline{#1}{% {\bfseries#2}% \ifthenelse{\equal{#3}{}}{}{, {\slshape#3}}% \ifthenelse{\equal{#4}{}}{}{, #4}% \ifthenelse{\equal{#5}{}}{}{, #5}% .% - \ifthenelse{\equal{#6}{}}{}{\\\begin{minipage}[t]{\textwidth}\small#6\end{minipage}}}} + \ifthenelse{\equal{#6}{}}{}{\newline{}\small#6} + }}% +% \ifthenelse{\equal{#6}{}}{}{\cvline[0pt]{}{\small#6}}} % usage (inside 'language' cvsection environment): \cvlanguage{name}{level}{comment} \newcommand*{\cvlanguage}[3]{% - \cvitem{#1}{\begin{minipage}[t]{.225\maincolumnwidth}\textbf{#2}\end{minipage}\hfill\begin{minipage}[t]{0.725\maincolumnwidth}\raggedleft\footnotesize\itshape #3\end{minipage}}} + \cvline{#1}{\begin{minipage}[t]{.225\maincolumnwidth}\textbf{#2}\end{minipage}\hfill\begin{minipage}[t]{0.725\maincolumnwidth}\raggedleft\footnotesize\itshape #3\end{minipage}}} % usage (inside 'computer skills' cvsection environment): \cvcomputer{category}{programs}{category}{programs} \newcommand*{\cvcomputer}[4]{% @@ -400,6 +396,19 @@ {\def\@linktext{#1}}% \href{mailto:#2}{\@linktext{}}} +% usage: \nopagenumbers{} +\newif\if@displaypagenumbers\@displaypagenumberstrue +\newcommand*{\nopagenumbers}{\@displaypagenumbersfalse} +\AtBeginDocument{% + \if@displaypagenumbers% + \@ifundefined{r@lastpage}{}{% + \ifthenelse{\pageref{lastpage} > 1}{% + \fancypagestyle{plain}{% + \fancyfoot[r]{\addressfont\color{quotecolor}\footnotesize\thepage/\pageref{lastpage}}}% + \pagestyle{plain}}{}}% + \AtEndDocument{\label{lastpage}}% + \fi} + % thebibliography environment, for use with BibTeX \newcommand{\refname}{Publications} \newlength{\bibindent} diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index 6f5a4e1e882..04f95016236 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcompatibility.sty'. -%% Copyright 2006 Xavier Danaux. +%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcompatibility}[2006/09/09 v0.5 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2007/05/28 v0.6 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- @@ -38,7 +38,7 @@ % compatibility with version 0.1 \newcommand*{\cvresume}[2]{\cvlistdoubleitem{#1}{#2}} -% compatibility with version 0.2 +% compatibility with versions <= 0.2 % section, cvline, ... with width argument... %\newcommand*{\section}[2][0.825]{% % \closesection{}% @@ -52,6 +52,10 @@ %\newcommand*{\cvitem}[3][.825]{% % \cvline[#1]{#2}{#3\vspace*{.75em}}} % the \vspace*{} inside the cvline environment is a hack... (should conceptually be outside the environment) +% compatibility with versions <= 0.5 +\newcommand*{\cvitem}[2]{\cvline{#1}{#2}} +\newcommand*{\moderncvstyle}[1]{\moderncvtheme{#1}} + \endinput diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty deleted file mode 100644 index 5fffa579ce4..00000000000 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty +++ /dev/null @@ -1,121 +0,0 @@ -%% start of file `moderncvstylecasual.sty'. -%% Copyright 2006 Xavier Danaux. -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License version 1.3c, -% available at http://www.latex-project.org/lppl/. - - -%------------------------------------------------------------------------------- -% identification -%------------------------------------------------------------------------------- -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstylecasual}[2006/09/09 v0.5 modern curriculum vitae style: casual] - - -%------------------------------------------------------------------------------- -% required packages -%------------------------------------------------------------------------------- - - -%------------------------------------------------------------------------------- -% package options -%------------------------------------------------------------------------------- -% nocolor option -\newif\if@color\@colortrue -\DeclareOption{nocolor}{\@colorfalse} - -% roman option -\newif\if@roman\@romanfalse -\DeclareOption{roman}{\@romantrue} - -% unused options -\DeclareOption*{ - \PackageWarning{moderncvstylecasual}{Unknown option ‘\CurrentOption’}} - -% execute default options -\ExecuteOptions{color} - -% process given options -\ProcessOptions\relax - - -%------------------------------------------------------------------------------- -% style definition -%------------------------------------------------------------------------------- -% symbols used -\renewcommand*{\listitemsymbol}{\textbullet} - -% colors -\if@color - \definecolor{firstnamecolor}{rgb}{0.65,0.65,0.65} - \definecolor{familynamecolor}{rgb}{0.45,0.45,0.45} - \definecolor{quotecolor}{rgb}{0.35,0.35,0.35} - \definecolor{sectionrectanglecolor}{rgb}{0.25,0.5,0.75} - \definecolor{sectiontitlecolor}{rgb}{0.2,0.4,0.65} -\else - \definecolor{firstnamecolor}{rgb}{0.5,0.5,0.5} - \definecolor{familynamecolor}{rgb}{0,0,0} - \definecolor{quotecolor}{rgb}{0.35,0.35,0.35} - \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75} - \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35}\fi - -% fonts -\if@roman - \AtBeginDocument{\rmfamily} -\else - \AtBeginDocument{\sffamily}\fi -\renewcommand*{\ttdefault}{pcr} -\renewcommand*{\firstnamefont}{\fontsize{38}{40}\sffamily\mdseries\upshape} -\renewcommand*{\familynamefont}{\firstnamefont} -\renewcommand*{\addressfont}{\normalsize\sffamily\mdseries\slshape} -\renewcommand*{\quotefont}{\large\slshape} -\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape} -\renewcommand*{\subsectionfont}{\normalsize\sffamily\mdseries\upshape} - -% styles - -% maketitle -\renewcommand*{\maketitle}{% - {% - \ifthenelse{\equal{\@photo}{}}% - {}% - {{\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}}% - \hfill% - \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}% - {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}}% - -% cv footer -\providecommand*{\footersymbol}{} -\renewcommand*{\footersymbol}{\textbullet} -\providecommand*{\footerfont}{} -\renewcommand*{\footerfont}{\addressfont} -\if@color - \definecolor{footertextcolor}{rgb}{0.35,0.35,0.35} - \definecolor{footersymbolcolor}{rgb}{0.25,0.5,0.75} -\else - \definecolor{footertextcolor}{rgb}{0.35,0.35,0.35} - \definecolor{footersymbolcolor}{rgb}{0.75,0.75,0.75}\fi -\providecommand*{\makefooter}{} -\renewcommand*{\makefooter}{% - \fancypagestyle{plain}{% - \fancyfoot[c]{% - \footerfont% - \color{footertextcolor}\@address% - ~~\color{footersymbolcolor}\footersymbol~~% - \color{footertextcolor}\Telefon~\@phone% - ~~\color{footersymbolcolor}\footersymbol~~% - \color{footertextcolor}\Letter~\emaillink{\@email}% - \ifthenelse{\equal{\@extrainfo}{}}% - {}% - {% - ~~\color{footersymbolcolor}\footersymbol~~% - \color{footertextcolor}{\@extrainfo}}}}% - \pagestyle{plain}} -\AtBeginDocument{\makefooter} - - -\endinput - - -%% end of file `moderncvstylecasual.sty'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty deleted file mode 100644 index 82f0e4e656f..00000000000 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ /dev/null @@ -1,108 +0,0 @@ -%% start of file `moderncvstyleclassic.sty'. -%% Copyright 2006 Xavier Danaux. -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License version 1.3c, -% available at http://www.latex-project.org/lppl/. - - -%------------------------------------------------------------------------------- -% identification -%------------------------------------------------------------------------------- -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleclassic}[2006/09/09 v0.5 modern curriculum vitae style: classic] - - -%------------------------------------------------------------------------------- -% required packages -%------------------------------------------------------------------------------- - - -%------------------------------------------------------------------------------- -% package options -%------------------------------------------------------------------------------- -% nocolor option -\newif\if@color\@colortrue -\DeclareOption{nocolor}{\@colorfalse} - -% roman option -\newif\if@roman\@romanfalse -\DeclareOption{roman}{\@romantrue} - -% unused options -\DeclareOption*{ - \PackageWarning{moderncvstyleclassic}{Unknown option ‘\CurrentOption’}} - -% execute default options -\ExecuteOptions{color} - -% process given options -\ProcessOptions\relax - - -%------------------------------------------------------------------------------- -% style definition -%------------------------------------------------------------------------------- -% symbols used -\renewcommand*{\listitemsymbol}{\textbullet} - -% colors -\if@color - \definecolor{firstnamecolor}{rgb}{0,0,0} - \definecolor{familynamecolor}{rgb}{0,0,0} - \definecolor{titlecolor}{rgb}{0.35,0.35,0.35} - \definecolor{addresscolor}{rgb}{0.25,0.5,0.75} - \definecolor{quotecolor}{rgb}{0.35,0.35,0.35} - \definecolor{sectionrectanglecolor}{rgb}{0.25,0.5,0.75} - \definecolor{sectiontitlecolor}{rgb}{0.2,0.4,0.65} -\else - \definecolor{firstnamecolor}{rgb}{0,0,0} - \definecolor{familynamecolor}{rgb}{0,0,0} - \definecolor{titlecolor}{rgb}{0.35,0.35,0.35} - \definecolor{addresscolor}{rgb}{0.35,0.35,0.35} - \definecolor{quotecolor}{rgb}{0.35,0.35,0.35} - \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75} - \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35}\fi - -% fonts -\if@roman - \AtBeginDocument{\rmfamily} -\else - \AtBeginDocument{\sffamily}\fi -\renewcommand*{\ttdefault}{pcr} -\renewcommand*{\firstnamefont}{\fontsize{34}{36}\sffamily\mdseries\upshape} -\renewcommand*{\titlefont}{\LARGE\sffamily\mdseries\slshape} -\renewcommand*{\addressfont}{\rmfamily\mdseries\slshape} -\renewcommand*{\familynamefont}{\firstnamefont} -\renewcommand*{\quotefont}{\large\slshape} -\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape} -\renewcommand*{\subsectionfont}{\normalsize\sffamily\mdseries\upshape} - -% styles - -% maketitle -\renewcommand*{\maketitle}{% - \begin{minipage}[b]{.5\textwidth}% - \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}% - \ifthenelse{\equal{\@title}{}}% - {}% - {\\[1.25em]\titlestyle{\@title}}% - \end{minipage}% - \hfill% - \begin{minipage}[b]{.35\textwidth}% - \raggedleft\addressfont\color{addresscolor}\@address\\[0.2em]% - \Telefon~\@phone\\[.2em]% - \Letter~\emaillink{\@email}% - \ifthenelse{\equal{\@extrainfo}{}}% - {}% - {\\[0.2em]\@extrainfo} - \end{minipage}% - \ifthenelse{\equal{\@photo}{}}% - {}% - {\hspace*{1em}\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}\\[3em]} - - -\endinput - - -%% end of file `moderncvstyleclassic.sty'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty deleted file mode 100644 index aa797675275..00000000000 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty +++ /dev/null @@ -1,43 +0,0 @@ -%% start of file `moderncvstyleempty.sty'. -%% Copyright 2006 Xavier Danaux. -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License version 1.3c, -% available at http://www.latex-project.org/lppl/. - - -%------------------------------------------------------------------------------- -% identification -%------------------------------------------------------------------------------- -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleempty}[2006/09/09 v0.5 modern curriculum vitae style: empty] - - -%------------------------------------------------------------------------------- -% required packages -%------------------------------------------------------------------------------- - - -%------------------------------------------------------------------------------- -% package options -%------------------------------------------------------------------------------- -% unused options -\DeclareOption*{ - \PackageWarning{moderncvstyleempty}{Unknown option ‘\CurrentOption’}} - -% execute default options -\ExecuteOptions{} - -% process given options -\ProcessOptions\relax - - -%------------------------------------------------------------------------------- -% style definition -%------------------------------------------------------------------------------- - - -\endinput - - -%% end of file `moderncvstyleempty.sty'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty new file mode 100644 index 00000000000..58f25c710a4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty @@ -0,0 +1,153 @@ +%% start of file `moderncvthemecasual.sty'. +%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License version 1.3c, +% available at http://www.latex-project.org/lppl/. + + +%------------------------------------------------------------------------------- +% identification +%------------------------------------------------------------------------------- +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{moderncvthemecasual}[2007/05/28 v0.6 modern curriculum vitae style: casual] + + +%------------------------------------------------------------------------------- +% required packages +%------------------------------------------------------------------------------- + + +%------------------------------------------------------------------------------- +% package options +%------------------------------------------------------------------------------- +% color options +% blue (default option) +\DeclareOption{blue}{} +% orange +\newif\if@colororange\@colororangefalse +\DeclareOption{orange}{\@colororangetrue} +% green +\newif\if@colorgreen\@colorgreenfalse +\DeclareOption{green}{\@colorgreentrue} +% red +\newif\if@colorred\@colorredfalse +\DeclareOption{red}{\@colorredtrue} +% grey +\newif\if@colorgrey\@colorgreyfalse +\DeclareOption{grey}{\@colorgreytrue} + +% roman option +\newif\if@roman\@romanfalse +\DeclareOption{roman}{\@romantrue} + +% unused options +\DeclareOption*{ + \PackageWarning{moderncvthemecasual}{Unknown option ‘\CurrentOption’}} + +% execute default options +\ExecuteOptions{color} + +% process given options +\ProcessOptions\relax + + +%------------------------------------------------------------------------------- +% style definition +%------------------------------------------------------------------------------- +% symbols used +\renewcommand*{\listitemsymbol}{\textbullet} + +% colors +\definecolor{firstnamecolor}{rgb}{0.65,0.65,0.65} +\definecolor{familynamecolor}{rgb}{0.45,0.45,0.45} +\definecolor{quotecolor}{rgb}{0.35,0.35,0.35} +\definecolor{addresscolor}{rgb}{0.35,0.35,0.35} +% default blue color + \definecolor{sectionrectanglecolor}{rgb}{0.25,0.50,0.75} + \definecolor{sectiontitlecolor}{rgb}{0.20,0.40,0.65} + \definecolor{subsectioncolor}{rgb}{0.20,0.40,0.65} + \definecolor{footersymbolcolor}{rgb}{0.25,0.50,0.75} +\if@colororange + \definecolor{sectionrectanglecolor}{rgb}{1.00,0.65,0.20} + \definecolor{sectiontitlecolor}{rgb}{0.95,0.55,0.15} + \definecolor{subsectioncolor}{rgb}{0.95,0.55,0.15} + \definecolor{footersymbolcolor}{rgb}{0.95,0.55,0.15}\fi +\if@colorgreen + \definecolor{sectionrectanglecolor}{rgb}{0.55,0.85,0.35} + \definecolor{sectiontitlecolor}{rgb}{0.30,0.65,0.15} + \definecolor{subsectioncolor}{rgb}{0.30,0.65,0.15} + \definecolor{footersymbolcolor}{rgb}{0.30,0.65,0.15}\fi +\if@colorred + \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30} + \definecolor{sectiontitlecolor}{rgb}{0.95,0.20,0.20} + \definecolor{subsectioncolor}{rgb}{0.95,0.20,0.20} + \definecolor{footersymbolcolor}{rgb}{0.95,0.20,0.20}\fi +\if@colorgrey + \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75} + \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35} + \definecolor{subsectioncolor}{rgb}{0.35,0.35,0.35} + \definecolor{footersymbolcolor}{rgb}{0.35,0.35,0.35}\fi + +% fonts +\if@roman + \AtBeginDocument{\rmfamily} +\else + \AtBeginDocument{\sffamily}\fi +\renewcommand*{\ttdefault}{pcr} +\renewcommand*{\firstnamefont}{\fontsize{38}{40}\sffamily\mdseries\upshape} +\renewcommand*{\familynamefont}{\firstnamefont} +\renewcommand*{\addressfont}{\normalsize\sffamily\mdseries\slshape} +\renewcommand*{\quotefont}{\large\slshape} +\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape} +\renewcommand*{\subsectionfont}{\large\sffamily\mdseries\upshape} + +% styles + +% maketitle +\renewcommand*{\maketitle}{% + {% + \ifthenelse{\isundefined{\@photo}}% + {}% + {{\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}}% + \hfill% + \raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}% + {\color{firstnamecolor}\rule{\textwidth}{.25ex}\\[2.5em]}% +% optional quote + \ifthenelse{\isundefined{\@quote}}% + {}% + {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}% + }% + +% cv footer +\newif\if@firstfooterelement\@firstfooterelementtrue +\providecommand*{\footersymbol}{} +\renewcommand*{\footersymbol}{% + \if@firstfooterelement% + \else% + { ~~\color{footersymbolcolor}\textbullet~~~}\fi} +\providecommand*{\makefooter}{} +\renewcommand*{\makefooter}{% + \fancypagestyle{plain}{% + \fancyfoot[c]{% + \parbox{0.8\textwidth}{% + \centering% + \addressfont\color{addresscolor}% + \ifthenelse{\isundefined{\@addressstreet}}{}{% + \addresssymbol~\@addressstreet% + \@firstfooterelementfalse% + \ifthenelse{\isundefined{\@addresscity}}{}{\footersymbol\@addresscity}\\\@firstfooterelementtrue}% + \ifthenelse{\isundefined{\@mobile}}{}{\footersymbol\mobilesymbol~\@mobile\@firstfooterelementfalse}% + \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\phonesymbol~\@phone\@firstfooterelementfalse}% + \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\faxsymbol~\@fax\@firstfooterelementfalse}% + \ifthenelse{\isundefined{\@email}}{}{\footersymbol\emailsymbol~\emaillink{\@email}\@firstfooterelementfalse}% + \ifthenelse{\isundefined{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}% + }% + \pagestyle{plain}} +\AtBeginDocument{\makefooter} + + +\endinput + + +%% end of file `moderncvthemecasual.sty'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty new file mode 100644 index 00000000000..a9c44f3904b --- /dev/null +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty @@ -0,0 +1,149 @@ +%% start of file `moderncvthemeclassic.sty'. +%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License version 1.3c, +% available at http://www.latex-project.org/lppl/. + + +%------------------------------------------------------------------------------- +% identification +%------------------------------------------------------------------------------- +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{moderncvthemeclassic}[2007/05/28 v0.6 modern curriculum vitae style: classic] + + +%------------------------------------------------------------------------------- +% required packages +%------------------------------------------------------------------------------- + + +%------------------------------------------------------------------------------- +% package options +%------------------------------------------------------------------------------- +% color options +% blue (default option) +\DeclareOption{blue}{} +% orange +\newif\if@colororange\@colororangefalse +\DeclareOption{orange}{\@colororangetrue} +% green +\newif\if@colorgreen\@colorgreenfalse +\DeclareOption{green}{\@colorgreentrue} +% red +\newif\if@colorred\@colorredfalse +\DeclareOption{red}{\@colorredtrue} +% grey +\newif\if@colorgrey\@colorgreyfalse +\DeclareOption{grey}{\@colorgreytrue} + +% roman option +\newif\if@roman\@romanfalse +\DeclareOption{roman}{\@romantrue} + +% unused options +\DeclareOption*{ + \PackageWarning{moderncvthemeclassic}{Unknown option ‘\CurrentOption’}} + +% execute default options +\ExecuteOptions{color} + +% process given options +\ProcessOptions\relax + + +%------------------------------------------------------------------------------- +% style definition +%------------------------------------------------------------------------------- +% symbols used +\renewcommand*{\listitemsymbol}{\textbullet} + +% colors +\definecolor{firstnamecolor}{rgb}{0,0,0} +\definecolor{familynamecolor}{rgb}{0,0,0} +\definecolor{titlecolor}{rgb}{0.35,0.35,0.35} +\definecolor{quotecolor}{rgb}{0.35,0.35,0.35} +% default blue color + \definecolor{addresscolor}{rgb}{0.25,0.5,0.75} + \definecolor{sectionrectanglecolor}{rgb}{0.25,0.5,0.75} + \definecolor{sectiontitlecolor}{rgb}{0.2,0.4,0.65} + \definecolor{subsectioncolor}{rgb}{0.2,0.4,0.65} +\if@colororange + \definecolor{addresscolor}{rgb}{0.95,0.55,0.15} + \definecolor{sectionrectanglecolor}{rgb}{1,0.65,0.20} + \definecolor{sectiontitlecolor}{rgb}{0.95,0.55,0.15} + \definecolor{subsectioncolor}{rgb}{0.95,0.55,0.15}\fi +\if@colorgreen + \definecolor{addresscolor}{rgb}{0.30,0.65,0.15} + \definecolor{sectionrectanglecolor}{rgb}{0.55,0.85,0.35} + \definecolor{sectiontitlecolor}{rgb}{0.30,0.65,0.15} + \definecolor{subsectioncolor}{rgb}{0.30,0.65,0.15}\fi +\if@colorred + \definecolor{addresscolor}{rgb}{0.95,0.20,0.20} + \definecolor{sectionrectanglecolor}{rgb}{1.00,0.30,0.30} + \definecolor{sectiontitlecolor}{rgb}{0.95,0.20,0.20} + \definecolor{subsectioncolor}{rgb}{0.95,0.20,0.20}\fi +\if@colorgrey + \definecolor{addresscolor}{rgb}{0.35,0.35,0.35} + \definecolor{sectionrectanglecolor}{rgb}{0.75,0.75,0.75} + \definecolor{sectiontitlecolor}{rgb}{0.35,0.35,0.35} + \definecolor{subsectioncolor}{rgb}{0.35,0.35,0.35}\fi + +% fonts +\if@roman + \AtBeginDocument{\rmfamily} +\else + \AtBeginDocument{\sffamily}\fi +\renewcommand*{\ttdefault}{pcr} +\renewcommand*{\firstnamefont}{\fontsize{34}{36}\sffamily\mdseries\upshape} +\renewcommand*{\titlefont}{\LARGE\sffamily\mdseries\slshape} +\renewcommand*{\addressfont}{\normalsize\rmfamily\mdseries\slshape} +\renewcommand*{\familynamefont}{\firstnamefont} +\renewcommand*{\quotefont}{\large\slshape} +\renewcommand*{\sectionfont}{\Large\sffamily\mdseries\upshape} +\renewcommand*{\subsectionfont}{\large\sffamily\mdseries\upshape} + +% styles + +% maketitle +\renewcommand*{\maketitle}{% + % name and title + \if@DEBUG\framebox{\fi + \begin{minipage}[b]{.525\textwidth}% + \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}% + \ifthenelse{\isundefined{\@title}}% + {}% + {\\[1.25em]\titlestyle{\@title}}% + \end{minipage}% + \if@DEBUG}\fi + \hfill% + \if@DEBUG\framebox{\fi% + % optional data + \begin{minipage}[b]{.225\textwidth}% + \raggedleft\addressfont\color{addresscolor}% + \ifthenelse{\isundefined{\@addressstreet}}{}{% + \addresssymbol~\@addressstreet% + \ifthenelse{\isundefined{\@addresscity}}{}{\\\@addresscity}% + \\[.2em]}% + \ifthenelse{\isundefined{\@mobile}}{}{\mobilesymbol~\@mobile\\[.2em]}% + \ifthenelse{\isundefined{\@phone}}{}{\phonesymbol~\@phone\\[.2em]}% + \ifthenelse{\isundefined{\@fax}}{}{\faxsymbol~\@fax\\[.2em]}% + \ifthenelse{\isundefined{\@email}}{}{\emailsymbol~\emaillink{\@email}\\[.2em]}% + \ifthenelse{\isundefined{\@extrainfo}}{}{\@extrainfo\\[.2em]}% + \end{minipage}% + % optional photo + \ifthenelse{\isundefined{\@photo}}% + {}% + {\hspace*{0.75em}\color{firstnamecolor}\framebox{\includegraphics[height=\@photoheight]{\@photo}}}\\[3em]% + \if@DEBUG}\fi% + % optional quote + \ifthenelse{\isundefined{\@quote}}% + {}% + {\centering{\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}}\\[2.5em]}% + } + + +\endinput + + +%% end of file `moderncvthemeclassic.sty'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty new file mode 100644 index 00000000000..5c823af8e24 --- /dev/null +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty @@ -0,0 +1,43 @@ +%% start of file `moderncvthemeempty.sty'. +%% Copyright 2007 Xavier Danaux (xdanaux@gmail.com). +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License version 1.3c, +% available at http://www.latex-project.org/lppl/. + + +%------------------------------------------------------------------------------- +% identification +%------------------------------------------------------------------------------- +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{moderncvthemeempty}[2007/05/28 v0.6 modern curriculum vitae style: empty] + + +%------------------------------------------------------------------------------- +% required packages +%------------------------------------------------------------------------------- + + +%------------------------------------------------------------------------------- +% package options +%------------------------------------------------------------------------------- +% unused options +\DeclareOption*{ + \PackageWarning{moderncvthemeempty}{Unknown option ‘\CurrentOption’}} + +% execute default options +\ExecuteOptions{} + +% process given options +\ProcessOptions\relax + + +%------------------------------------------------------------------------------- +% style definition +%------------------------------------------------------------------------------- + + +\endinput + + +%% end of file `moderncvthemeempty.sty'. -- cgit v1.2.3