From 10c7e139be6254b0f72ebca2ea54a8a5281fd6bc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Sep 2006 18:42:46 +0000 Subject: moderncv update (10sep06) git-svn-id: svn://tug.org/texlive/trunk@2113 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 61 ++++++++++++++++++++-- .../tex/latex/moderncv/moderncvcompatibility.sty | 11 +++- .../tex/latex/moderncv/moderncvstylecasual.sty | 23 ++++++-- .../tex/latex/moderncv/moderncvstyleclassic.sty | 19 +++++-- .../tex/latex/moderncv/moderncvstyleempty.sty | 9 +++- 5 files changed, 110 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/moderncv') diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index 87ee95ef4fb..a790680fe55 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -1,10 +1,16 @@ %% start of file `moderncv.cls'. +%% 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} -\ProvidesClass{moderncv}[2006/05/02 v0.4 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2006/09/09 v0.5 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -222,6 +228,7 @@ \newcommand*{\phone}[1]{\def\@phone{#1}} \newcommand*{\email}[1]{\def\@email{#1}} \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} +\newcommand*{\photo}[2][84pt]{\def\@photoheight{#1}\def\@photo{#2}} \newcommand*{\quote}[1]{\def\@quote{#1}} \firstname{} \familyname{} @@ -230,6 +237,7 @@ \phone{} \email{} \extrainfo{} +\photo{}{} \quote{} % length used by the moderncv layout @@ -285,16 +293,17 @@ % usage: \colorrule[optional height]{width} %\newcommand*{\colorrule}[2][1ex]{{\color{sectionrectanglecolor}{\rule{#2}{#1}}}} -% usage: \section{}, or \emptysection{} \newif\if@sectionopen\@sectionopenfalse \newif\if@firstcvline\@firstcvlinefalse % 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{}} +% usage: \section{<title>}, or \emptysection{} \newcommand*{\section}[1]{% \closesection{}% \@sectionopentrue% @@ -391,7 +400,53 @@ {\def\@linktext{#1}}% \href{mailto:#2}{\@linktext{}}} +% thebibliography environment, for use with BibTeX +\newcommand{\refname}{Publications} +\newlength{\bibindent} +\setlength{\bibindent}{1.5em} +% trick to force the previous section to close before the thebibliography environment +\let\oldbibliography\bibliography +\renewcommand*{\bibliography}[1]{% + \closesection{}% + \oldbibliography{#1}} +% bibliography item label +\newcommand*{\bibliographyitemlabel}{}% use \@biblabel{\arabic{enumiv}} for BibTeX labels +\newenvironment{thebibliography}[1]% + {% + \section{\refname}% + \closesection{}% + \vspace*{-1.65em}% + \small% + \begin{list}{\bibliographyitemlabel}% + {% + \setlength{\topsep}{0pt}% + \setlength{\labelwidth}{\hintscolumnwidth}% + \setlength{\labelsep}{\separatorcolumnwidth}% + \leftmargin\labelwidth% + \advance\leftmargin\labelsep% + \@openbib@code% + \usecounter{enumiv}% + \let\p@enumiv\@empty% + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy\clubpenalty4000\widowpenalty4000% +% \sfcode`\.\@m% +% \sfcode `\=1000\relax% + }% + {% + \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}% + \end{list}% + } +\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em} +\let\@openbib@code\@empty + +% the classical \today definition +\def\today{\ifcase\month\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or December\fi + \space\number\day, \number\year} + \endinput + %% end of file `moderncv.cls'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index 49dfe80a8c1..6f5a4e1e882 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty @@ -1,10 +1,16 @@ %% start of file `moderncvcompatibility.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{moderncvcompatibility}[2006/05/02 v0.4 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2006/09/09 v0.5 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- @@ -48,4 +54,5 @@ \endinput -%% end of file `moderncvstylethemecasual.sty'. + +%% end of file `moderncvcompatibility.sty'. diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty index 822e36a5566..5fffa579ce4 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty @@ -1,10 +1,16 @@ %% 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/05/02 v0.4 modern curriculum vitae style: casual] +\ProvidesPackage{moderncvstylecasual}[2006/09/09 v0.5 modern curriculum vitae style: casual] %------------------------------------------------------------------------------- @@ -71,7 +77,12 @@ % maketitle \renewcommand*{\maketitle}{% - {\raggedleft{\firstnamestyle{\MakeLowercase{\@firstname}}\familynamestyle{\MakeLowercase{\@familyname}}}\\[-.35em]}% + {% + \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 @@ -94,11 +105,17 @@ ~~\color{footersymbolcolor}\footersymbol~~% \color{footertextcolor}\Telefon~\@phone% ~~\color{footersymbolcolor}\footersymbol~~% - \color{footertextcolor}\Letter~\emaillink{\@email}}}% + \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 index 4250e96684f..82f0e4e656f 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty @@ -1,10 +1,16 @@ %% 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/05/02 v0.4 modern curriculum vitae style: casual] +\ProvidesPackage{moderncvstyleclassic}[2006/09/09 v0.5 modern curriculum vitae style: classic] %------------------------------------------------------------------------------- @@ -76,22 +82,27 @@ % maketitle \renewcommand*{\maketitle}{% - \begin{minipage}[t]{.6\textwidth}% + \begin{minipage}[b]{.5\textwidth}% \firstnamestyle{\@firstname~}\familynamestyle{\@familyname}% \ifthenelse{\equal{\@title}{}}% {}% {\\[1.25em]\titlestyle{\@title}}% \end{minipage}% - \begin{minipage}[t]{.4\textwidth}% + \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}\\[3em]} + \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 index a96a371c5cf..aa797675275 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty @@ -1,10 +1,16 @@ %% 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/05/02 v0.4 modern curriculum vitae style: empty] +\ProvidesPackage{moderncvstyleempty}[2006/09/09 v0.5 modern curriculum vitae style: empty] %------------------------------------------------------------------------------- @@ -33,4 +39,5 @@ \endinput + %% end of file `moderncvstyleempty.sty'. -- cgit v1.2.3