From c6dd4805eb3789701aed68b6ba8f2d05bf4e4a7d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 Jan 2012 00:06:31 +0000 Subject: moderncv 0.17 (25jan12) git-svn-id: svn://tug.org/texlive/trunk@25203 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/moderncv/CHANGELOG | 10 ++ .../doc/latex/moderncv/examples/letter.tex | 2 +- .../doc/latex/moderncv/examples/template-es.pdf | Bin 0 -> 176013 bytes .../doc/latex/moderncv/examples/template-es.tex | 132 +++++++++++++++++++++ .../doc/latex/moderncv/examples/template-zh.pdf | Bin 243468 -> 245887 bytes .../doc/latex/moderncv/examples/template.pdf | Bin 169603 -> 174654 bytes .../moderncv/examples/template_casual_orange.pdf | Bin 169602 -> 174654 bytes .../moderncv/examples/template_classic_green.pdf | Bin 236918 -> 237654 bytes .../latex/moderncv/examples/template_multibib.pdf | Bin 169971 -> 174996 bytes .../moderncv/examples/template_oldstyle_grey.2.pdf | Bin 0 -> 26075 bytes .../moderncv/examples/template_oldstyle_grey.pdf | Bin 26075 -> 26196 bytes Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 10 +- .../tex/latex/moderncv/moderncvcolorblack.sty | 2 +- .../tex/latex/moderncv/moderncvcolorblue.sty | 2 +- .../tex/latex/moderncv/moderncvcolorgreen.sty | 2 +- .../tex/latex/moderncv/moderncvcolorgrey.sty | 2 +- .../tex/latex/moderncv/moderncvcolororange.sty | 2 +- .../tex/latex/moderncv/moderncvcolorpurple.sty | 2 +- .../tex/latex/moderncv/moderncvcolorred.sty | 2 +- .../tex/latex/moderncv/moderncvcompatibility.sty | 2 +- .../tex/latex/moderncv/moderncvstylecasual.sty | 64 ++++++---- .../tex/latex/moderncv/moderncvstyleclassic.sty | 18 +-- .../tex/latex/moderncv/moderncvstyleempty.sty | 2 +- .../tex/latex/moderncv/moderncvstyleoldstyle.sty | 25 ++-- 24 files changed, 223 insertions(+), 56 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf create mode 100644 Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex create mode 100644 Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.2.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG index 411f0f4cd6c..776d4d1b107 100644 --- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG +++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG @@ -1,3 +1,13 @@ +version 0.17 (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. + - added an optional title to the casual style. + - changed the definition of the font styles to avoid undesired extra spacing. + - added a Spanish template, kindly provided by I. Buitrón. + - corrected the vertical misalignment between the page number and the center + footer in the casual style. + version 0.16 (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 diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex b/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex index 92c9926fe68..cd332e62b86 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex @@ -1,5 +1,5 @@ %% start of file `letter.tex'. -%% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com). +%% 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, diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf new file mode 100644 index 00000000000..95340826122 Binary files /dev/null and b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.pdf differ diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex new file mode 100644 index 00000000000..8b0f83346a6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-es.tex @@ -0,0 +1,132 @@ +%% Inicio del archivo `template-es.tex'. +%% 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, +% available at http://www.latex-project.org/lppl/. + + +\documentclass[11pt,a4paper,sans]{moderncv} % opciones posibles incluyen tamaño de fuente ('10pt', '11pt' and '12pt'), tamaño de papel ('a4paper', 'letterpaper', 'a5paper', 'legalpaper', 'executivepaper' y 'landscape') y familia de fuentes ('sans' y 'roman') + +% temas de moderncv +\moderncvstyle{casual} % las opciones de estilo son 'casual' (por omision) y 'classic' +\moderncvcolor{blue} % opciones de color 'blue' (por omision), 'orange', 'green', 'red', 'purple', 'grey' y 'black' +%\renewcommand{\familydefault}{\sfdefault} % para seleccionar la fuente por omision, use '\sfdefault' para la fuente sans serif, '\rmdefault' para la fuente roman, o cualquier nombre de fuente +%\nopagenumbers{} % elimine el comentario para suprimir la numeracion automatica de las paginas para CVs mayores a una pagina + +% codificacion de caracteres +\usepackage[utf8]{inputenc} % reemplace con su codificacion +%\usepackage{CJKutf8} % si necesita usa CJK para redactar su CV en chino, japones o coreano + +% ajustes para los margenes de pagina +\usepackage[scale=0.75]{geometry} +%\setlength{\hintscolumnwidth}{3cm} % si desea cambiar el ando de la columna para las fechas + +% datos personales +\firstname{John} +\familyname{Doe} +\title{T\'itulo del CV (opcional)} % dato opcional, elimine la linea si no desea el dato +\address{calle y n\'umero}{c\'odigo postal y ciudad} % dato opcional, elimine la linea si no desea el dato +\mobile{+1~(234)~567~890} % dato opcional, elimine la linea si no desea el dato +\phone{+2~(345)~678~901} % dato opcional, elimine la linea si no desea el dato +\fax{+3~(456)~789~012} % dato opcional, elimine la linea si no desea el dato +\email{john@doe.org} % dato opcional, elimine la linea si no desea el dato +\homepage{www.johndoe.com} % dato opcional, elimine la linea si no desea el dato +\extrainfo{informacion adicional} % dato opcional, elimine la linea si no desea el dato +\photo[64pt][0.4pt]{picture} % '64pt' es la altura a la que la imagen debe ser ajustada, 0.4pt es grosor del marco que lo contiene (eliga 0pt para eliminar el marco) y 'picture' es el nombre del archivo; dato opcional, elimine la linea si no desea el dato +\quote{Alguna cita (opcional)} % dato opcional, elimine la linea si no desea el dato + +% para mostrar etiquetas numericas en la bibliografia (por omision no se muestran etiquetas), solo es util si desea incluir citas en en CV +%\makeatletter +%\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}} +%\makeatother + +% bibliografia con varias fuentes +%\usepackage{multibib} +%\newcites{book,misc}{{Libros},{Otros}} +%---------------------------------------------------------------------------------- +% contenido +%---------------------------------------------------------------------------------- +\begin{document} +%\begin{CJK*}{UTF8}{gbsn} % para redactar el CV en chino usando CJK +\maketitle + +\section{Formaci\'on acad\'emica} +\cventry{a\~no--a\~no}{Grado}{Instituci\'on}{Ciudad}{\textit{Grade}}{Descripci\'on} % Los argumentos del 3 al 6 pueden permanecer vacios +\cventry{a\~no--a\~no}{Grado}{Instituci\'on}{Ciudad}{\textit{Grade}}{Descripci\'on} + +\section{Tesis de maestr\'ia} +\cvitem{t\'itulo}{\emph{T\'itulo}} +\cvitem{sinodares}{Sinodales} +\cvitem{descripci\'on}{Una breve descripci\'on de la tesis} + +\section{Experiencia} +\subsection{Vocacional} +\cventry{a\~no--a\~no}{t\'itulo del puesto}{Empleador}{Ciudad}{}{Descripci\'on general, no m\'as de 1 \'o 2 l\'ineas.\newline{}% +Detalle de logros:% +\begin{itemize}% +\item Logro 1; +\item Logro 2, con sub-logros: + \begin{itemize}% + \item Sub-logro (a); + \item Sub-logro (b), con sub-sub-logros (¡evite hacer esto!); + \begin{itemize} + \item Sub-sub-logro i; + \item Sub-sub-logro ii; + \item Sub-sub-logro iii; + \end{itemize} + \item Sub-logro (c); + \end{itemize} +\item Logro 3. +\end{itemize}} +\cventry{a\~no--a\~no}{t\'itulo del puesto}{Empleador}{Ciudad}{}{Descripci\'on l\'inea 1\newline{}Descripci\'on l\'inea 2} +\subsection{Miscel\'aneo} +\cventry{a\~no--a\~no}{t\'itulo del puesto}{Empleador}{Ciudad}{}{Descripci\'on} + +\section{Idiomas} +\cvitemwithcomment{Idioma 1}{nivel}{Comentario} +\cvitemwithcomment{Idioma 2}{nivel}{Comentario} +\cvitemwithcomment{Idioma 3}{nivel}{Comentario} + +\section{Conocimientos de computaci\'on} +\cvdoubleitem{categor\'ia 1}{XXX, YYY, ZZZ}{categor\'ia 4}{XXX, YYY, ZZZ} +\cvdoubleitem{categor\'ia 2}{XXX, YYY, ZZZ}{categor\'ia 5}{XXX, YYY, ZZZ} +\cvdoubleitem{categor\'ia 3}{XXX, YYY, ZZZ}{categor\'ia 6}{XXX, YYY, ZZZ} + +\section{Interests} +\cvitem{hobby 1}{Descripci\'on} +\cvitem{hobby 2}{Descripci\'on} +\cvitem{hobby 3}{Descripci\'on} + +\section{Extra 1} +\cvlistitem{Tema 1} +\cvlistitem{Tema 2} +\cvlistitem{Tema 3} + +\renewcommand{\listitemsymbol}{-~} % para cambiar el simbolo para las listas + +\section{Extra 2} +\cvlistdoubleitem{Tema 1}{Tema 4} +\cvlistdoubleitem{Tema 2}{Tema 5\cite{book1}} +\cvlistdoubleitem{Tema 3}{} + +% Las publicaciones tomadas de un archivo de BibTeX sin usar multibib\renewcommand*{\bibliographyitemlabel}{\@biblabel{\arabic{enumiv}}} + +\nocite{*} +\bibliographystyle{plain} +\bibliography{publications} % 'publications' es el nombre del archivo BibTeX + +% Las publicaciones tomadas de un archivo BibTeX usando el paquete multibib +%\section{Publicaciones} +%\nocitebook{book1,book2} +%\bibliographystylebook{plain} +%\bibliographybook{publications} % 'publications' es el nombre del archivo BibTeX +%\nocitemisc{misc1,misc2,misc3} +%\bibliographystylemisc{plain} +%\bibliographymisc{publications} % 'publications' es el nombre del archivo BibTeX + +%\clearpage\end{CJK*} % si esta redactando su CV en chino usando CJK, \clearpage es requerido por fancyhdr para que funcione correctamente con CJK, aunque esto eliminara la numeracion de pagina al dejar \lastpage como no definido +\end{document} + + +%% fin del archivo `template-es.tex'. 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 dc357a6e62c..591b37090b9 100644 Binary files a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf and b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf differ diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf index 9e6d00c9935..2c79e2ef0e2 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_casual_orange.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf index 304f587cd7f..b4b68f086e1 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 ea4b7ba8296..50751c700c8 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 58a67959dc7..9e8e1e44006 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/doc/latex/moderncv/examples/template_oldstyle_grey.2.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.2.pdf new file mode 100644 index 00000000000..c2f5b8cd2d0 Binary files /dev/null and b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.2.pdf 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 c2f5b8cd2d0..ad4d10d1f8c 100644 Binary files a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf and b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf differ diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index cbdcfc04606..cf19a0457a9 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/01/15 v0.16 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2012/01/25 v0.17 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -99,7 +99,7 @@ % hyper links \RequirePackage{url} \urlstyle{tt} -% load hyperred at the end of the preamble to pass options required by loaded packages (like CJK) +% load hyperref at the end of the preamble to pass options required by loaded packages (like CJK) \AtEndPreamble{ \@ifpackageloaded{CJK} {\RequirePackage[unicode]{hyperref}} @@ -313,9 +313,11 @@ \AtBeginDocument{% \if@displaypagenumbers% \@ifundefined{r@lastpage}{}{% - \ifthenelse{\pageref{lastpage} > 1}{% + \ifthenelse{\pageref{lastpage}>1}{% + \newlength{\pagenumberwidth}% + \settowidth{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}% \fancypagestyle{plain}{% - \fancyfoot[r]{\addressfont\color{color2}\footnotesize\thepage/\pageref{lastpage}}}% + \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) \pagestyle{plain}}{}}% \AtEndDocument{\label{lastpage}}\else\fi}} diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty index 2fd270605bb..3ea0481f9e2 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/01/15 v0.16 modern curriculum vitae color scheme: black] +\ProvidesPackage{moderncvcolorblack}[2012/01/25 v0.17 modern curriculum vitae color scheme: black] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty index c7107f066ba..2f5e62a41ac 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/01/15 v0.16 modern curriculum vitae color scheme: blue] +\ProvidesPackage{moderncvcolorblue}[2012/01/25 v0.17 modern curriculum vitae color scheme: blue] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty index a33c4a9d837..0dce84a1ded 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/01/15 v0.16 modern curriculum vitae color scheme: green] +\ProvidesPackage{moderncvcolorgreen}[2012/01/25 v0.17 modern curriculum vitae color scheme: green] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty index 8403d457ba5..a079fc66c02 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/01/15 v0.16 modern curriculum vitae color scheme: grey] +\ProvidesPackage{moderncvcolorgrey}[2012/01/25 v0.17 modern curriculum vitae color scheme: grey] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty index 181af4419ce..3fa87323507 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/01/15 v0.16 modern curriculum vitae color scheme: orange] +\ProvidesPackage{moderncvcolororange}[2012/01/25 v0.17 modern curriculum vitae color scheme: orange] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty index 65fb8290eeb..cfbdc212e8c 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/01/15 v0.16 modern curriculum vitae color scheme: purple] +\ProvidesPackage{moderncvcolorpurple}[2012/01/25 v0.17 modern curriculum vitae color scheme: purple] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty index 2874efbc6c4..5edc0f9714a 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/01/15 v0.16 modern curriculum vitae color scheme: red] +\ProvidesPackage{moderncvcolorred}[2012/01/25 v0.17 modern curriculum vitae color scheme: red] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index c05d480b6ce..62bba4bb64f 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/01/15 v0.16 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2012/01/25 v0.17 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty index 09d33f199b6..aa4dc60a994 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/01/15 v0.16 modern curriculum vitae style scheme: casual] +\ProvidesPackage{moderncvstylecasual}[2012/01/25 v0.17 modern curriculum vitae style scheme: casual] %------------------------------------------------------------------------------- @@ -32,28 +32,47 @@ \renewcommand*{\addressfont}{\small\mdseries\slshape} % cv footer -\newif\if@firstfooterelement\@firstfooterelementtrue +% footer symbol used to separate footer elements \newcommand*{\footersymbol}{% - \if@firstfooterelement% + {~~~\textbullet~~~}}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :( +% 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{\footertempabox}% +\newsavebox{\footertempbbox}% +\newlength{\footerwidth}% +\newlength{\footerboxwidth}% +% adds an element to the footer, separated by footersymbol +% usage: \addtofooter[footersymbol]{element} +\newcommand*{\addtofooter}[2][\footersymbol]{% + \savebox{\footertempbbox}{\usebox{\footertempabox}#1#2}% + \settowidth{\footerboxwidth}{\usebox{\footertempbbox}}% + \ifnum\footerboxwidth<\footerwidth% + \savebox{\footertempabox}{\usebox{\footertempbbox}} \else% - { ~~\color{color2}\textbullet~~~}\fi\@firstfooterelementfalse}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :( + \flushfooter{}\\% + \savebox{\footertempabox}{#2}% + \savebox{\footertempbbox}{#2}\fi} +% internal command to flush the footer +\newcommand*{\flushfooter}{% + \strut\usebox{\footertempabox}% + \savebox{\footertempabox}{}% + \savebox{\footertempbbox}{}} \renewcommand*{\makefooter}{% + \setlength{\footerwidth}{0.8\textwidth}% \fancypagestyle{plain}{% \fancyfoot[c]{% - \parbox{0.8\textwidth}{% - \centering% - \addressfont\color{color2}% - \ifthenelse{\isundefined{\@addressstreet}}{}{% - \addresssymbol\@addressstreet% - \@firstfooterelementfalse% - \ifthenelse{\isundefined{\@addresscity}}{}{~--~\@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{\@homepage}}{}{\footersymbol\homepagesymbol\httplink{\@homepage}\@firstfooterelementfalse}% - \ifthenelse{\isundefined{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}% - }% + \parbox{\footerwidth}{% + \centering% + \color{color2}\addressfont% + \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}% + \ifthenelse{\isundefined{\@addresscity}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter}% + \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter[]{\mobilesymbol\@mobile}}% + \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}% + \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}% + \ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}% + \ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}% + \ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}% + \flushfooter}}}% \pagestyle{plain}} % maketitle @@ -70,12 +89,15 @@ {\color{color1}\framebox{\includegraphics[width=\@photowidth]{\@photo}}}}}% \usebox{\maketitlepicturebox}% \newlength{\maketitlepicturewidth}\settowidth{\maketitlepicturewidth}{\usebox{\maketitlepicturebox}}% - \parbox[b]{\textwidth-\maketitlepicturewidth}{\raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@familyname}}\\[-.35em]% alternate design: \MakeLowercase and no space - {\color{color2!50}\rule{\textwidth}{.25ex}\\[2.5em]}% + \parbox[b]{\textwidth-\maketitlepicturewidth}{% + \raggedleft\namefont{\color{color2!50}\@firstname} {\color{color2}\@familyname}}\\[-.35em]% alternate design: \MakeLowercase and no space + {\color{color2!50}\rule{\textwidth}{.25ex}}% +% optional title + \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\raggedleft\titlestyle{\@title}}\\[2.5em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% - {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}% + {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}% \par}% to avoid weird spacing bug at the first section if no blank line is left after \maketitle diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty index 7317ef032d8..359f9904d8a 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/01/15 v0.16 modern curriculum vitae style scheme: classic] +\ProvidesPackage{moderncvstyleclassic}[2012/01/25 v0.17 modern curriculum vitae style scheme: classic] %------------------------------------------------------------------------------- @@ -36,13 +36,13 @@ \renewcommand*{\hintfont}{} % styles -\newcommand*{\namestyle}[1]{{\namefont\color{color0}#1}} -\newcommand*{\titlestyle}[1]{{\titlefont\color{color2}#1}} -\newcommand*{\addressstyle}[1]{{\addressfont\color{color1}#1}} -\newcommand*{\quotestyle}[1]{{\quotefont\color{color1}#1}} -\newcommand*{\sectionstyle}[1]{{\sectionfont\color{color1}#1}} -\newcommand*{\subsectionstyle}[1]{{\subsectionfont\color{color1}#1}} -\newcommand*{\hintstyle}[1]{{\hintfont\color{color0}#1}} +\newcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}} +\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}} +\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color1}{#1}}} +\newcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}} +\newcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}} +\newcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}} +\newcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}} % length used \newlength{\quotewidth} @@ -118,7 +118,7 @@ % detailed information \usebox{\maketitledetailsbox}% % optional photo - \usebox{\maketitlepicturebox}\\[3em]% + \usebox{\maketitlepicturebox}\\[2.5em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty index 8c7a35ad306..84bfb70e767 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/01/15 v0.16 modern curriculum vitae scheme: empty] +\ProvidesPackage{moderncvstyleempty}[2012/01/25 v0.17 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 8b374e07a62..6ce1bc052c5 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/01/15 v0.16 modern curriculum vitae style: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2012/01/25 v0.17 modern curriculum vitae style: oldstyle] %------------------------------------------------------------------------------- @@ -39,13 +39,13 @@ \renewcommand*{\hintfont}{\bfseries} % styles -\newcommand*{\namestyle}[1]{{\namefont\color{color0}#1}} -\newcommand*{\titlestyle}[1]{{\titlefont\color{color2}#1}} -\newcommand*{\addressstyle}[1]{{\addressfont\color{color2}#1}} -\newcommand*{\quotestyle}[1]{{\quotefont\color{color1}#1}} -\newcommand*{\sectionstyle}[1]{{\sectionfont\color{color1}#1}} -\newcommand*{\subsectionstyle}[1]{{\subsectionfont\color{color1}#1}} -\newcommand*{\hintstyle}[1]{{\hintfont\color{color0}#1}} +\newcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}} +\newcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}} +\newcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}} +\newcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}} +\newcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}} +\newcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}} +\newcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}} % symbols \renewcommand*{\listitemsymbol}{\labelitemi~} @@ -122,7 +122,7 @@ \ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}% \end{minipage}% % optional photo - \usebox{\maketitlepicturebox}\\[3em]% + \usebox{\maketitlepicturebox}\\[2.5em]% % optional quote \ifthenelse{\isundefined{\@quote}}% {}% @@ -174,7 +174,7 @@ \newlength{\cventrytitleboxwidth} \renewcommand*{\cventry}[7][.25em]{% \savebox{\cventryyearbox}{% - \hspace*{\separatorcolumnwidth}% + \hspace*{2\separatorcolumnwidth}% {\hintfont#2}}% \setlength{\cventrytitleboxwidth}{\widthof{\usebox{\cventryyearbox}}}% \setlength{\cventrytitleboxwidth}{\maincolumnwidth-\cventrytitleboxwidth}% @@ -186,10 +186,11 @@ \ifthenelse{\equal{#6}{}}{}{, #6}% .}% \usebox{\cventryyearbox}% - \ifx&% + \end{minipage}% + \ifx&% \else{% \newline{}\begin{minipage}[t]{\maincolumnwidth}\small#7\end{minipage}}\fi% - \end{minipage}\\[#1]} + \\[#1]} \newbox{\cvitemwithcommentmainbox} -- cgit v1.2.3