From 53c91808160a9cd42975cb3e888d5679e831b371 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Sep 2010 22:55:46 +0000 Subject: moderncv 0.12 (5aug10) git-svn-id: svn://tug.org/texlive/trunk@19688 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 45 ++++++++-------------- .../tex/latex/moderncv/moderncvcompatibility.sty | 2 +- .../tex/latex/moderncv/moderncvthemecasual.sty | 2 +- .../tex/latex/moderncv/moderncvthemeclassic.sty | 2 +- .../tex/latex/moderncv/moderncvthemeempty.sty | 2 +- 5 files changed, 21 insertions(+), 32 deletions(-) (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 816527c82e2..f83caf1986a 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}[2010/05/24 v0.8 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2010/08/03 v0.12 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -93,15 +93,11 @@ % if... then... else... constructs \RequirePackage{ifthen} -% pdf vs ps compilation -\RequirePackage{ifpdf} +% latex vs pdflatex vs xelatex vs luatex compilation +%\RequirePackage{ifpdf} % color -\ifpdf - \RequirePackage[pdftex]{color} -\else - \RequirePackage[dvips]{color} -\fi +\RequirePackage{color} % font encoding \RequirePackage[T1]{fontenc} @@ -110,9 +106,8 @@ %\usepackage{type1cm} % latin modern fonts -%\AtEndOfClass{% - \if@lmodern - \RequirePackage{lmodern}\fi%} +\if@lmodern + \RequirePackage{lmodern}\fi % symbols like \Telefon, \Mobilefone, \Letter and \Email \RequirePackage{marvosym} @@ -134,12 +129,8 @@ % load hyperred at the end of the preamble to pass options required by loaded packages (like CJK) \AtEndPreamble{ \@ifpackageloaded{CJK} - { - \ifpdf\RequirePackage[pdftex,CJKbookmarks]{hyperref} - \else\RequirePackage[dvips,CJKbookmarks]{hyperref}\fi} - { - \ifpdf\RequirePackage[pdftex]{hyperref} - \else\RequirePackage[dvips]{hyperref}\fi} + {\RequirePackage[CJKbookmarks]{hyperref}} + {\RequirePackage[pdftex]{hyperref}} \AtBeginDocument{ \hypersetup{ breaklinks, @@ -159,10 +150,7 @@ } % graphics -\ifpdf - \RequirePackage[pdftex]{graphicx} -\else - \RequirePackage[dvips]{graphicx}\fi +\RequirePackage{graphicx} % headers and footers \RequirePackage{fancyhdr} @@ -327,8 +315,8 @@ \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{part}{#1}% \hspace{\separatorcolumnwidth}% - \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}\\[1ex]} -% \cvline[1ex]{\color{sectionrectanglecolor}\rule[0]{\hintscolumnwidth}{1ex}}{\sectionstyle{#1}}}% gives bad alignment of rectangle; too bad m{width} columns seem not to work as a valid column definition for tabular environments + \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}% + \par\nobreak\vskip 1ex\@afterheading}% to avoid a pagebreak after the heading % starred variant, which is identical but defined to allow its use (e.g. for natbib compatibility, who uses \section*{} for the bibliography header) \AtEndPreamble{% \@ifpackageloaded{natbib} @@ -340,11 +328,12 @@ % usage: \subsection{title} \newcommand*{\subsection}[1]{% - \cvline[0.5ex]{}{% - \subsectionstyle{#1}% -% \phantomsection{}% reset the anchor for hyperrefs -% \addcontentsline{toc}{chapter}{#1}% does not work, the bookmark is placed at the same level as sections (placed themselves at part level to be visible, as hyperref does not allow sections without parents...) - }} + \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% + \raggedleft\hintfont{} &{\subsectionstyle{#1}}% + \end{tabular}% + \par\nobreak\vskip 0.5ex\@afterheading}% to avoid a pagebreak after the heading +% \phantomsection{}% reset the anchor for hyperrefs +% \addcontentsline{toc}{chapter}{#1}% does not work, the bookmark is placed at the same level as sections (placed themselves at part level to be visible, as hyperref does not allow sections without parents...) % usage: \cvline{margintext}{linetext} \newcommand*{\cvline}[3][.25em]{% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index 88adfb79819..f0e7945581d 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}[2010/05/24 v0.8 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2010/08/03 v0.12 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 aa3e3e8d97d..b4b356246c8 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemecasual.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemecasual}[2010/05/24 v0.8 modern curriculum vitae style: casual] +\ProvidesPackage{moderncvthemecasual}[2010/08/03 v0.12 modern curriculum vitae style: casual] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty index c0d1e1e894c..666c7241753 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeclassic.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemeclassic}[2010/05/24 v0.8 modern curriculum vitae style: classic] +\ProvidesPackage{moderncvthemeclassic}[2010/08/03 v0.12 modern curriculum vitae style: classic] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty index 9c1aeab8c23..fc4fadfada8 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvthemeempty.sty @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvthemeempty}[2010/05/24 v0.8 modern curriculum vitae style: empty] +\ProvidesPackage{moderncvthemeempty}[2010/08/03 v0.12 modern curriculum vitae style: empty] %------------------------------------------------------------------------------- -- cgit v1.2.3