From bcf694a0835cc008732c04f517813ab94f02963e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Jul 2012 22:38:11 +0000 Subject: moderncv (30jul12) git-svn-id: svn://tug.org/texlive/trunk@27250 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/moderncv/moderncvstyleoldstyle.sty | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty') diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty index 3718c48c116..1ca2e576f7c 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/03/26 v1.0 modern curriculum vitae and letter style scheme: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2012/07/30 v1.1.1 modern curriculum vitae and letter style scheme: oldstyle] %------------------------------------------------------------------------------- @@ -29,9 +29,18 @@ % overall style definition %------------------------------------------------------------------------------- % fonts -\IfFileExists{kurier.sty} - {\RequirePackage[light,math]{kurier}} - {} +%\ifxetexorluatex +% \setmainfont[Numbers={OldStyle,Proportional}, BoldFont={Kurier Bold}, ItalicFont={Kurier Light Italic}, BoldItalicFont={Kurier Bold Italic}]{Kurier Light} +% \setsansfont[Numbers={OldStyle,Proportional}, BoldFont={Kurier Bold}, ItalicFont={Kurier Light Italic}, BoldItalicFont={Kurier Bold Italic}]{Kurier Light} +% \setmathfont{Kurier Light} +% \setmathfont[range=\mathit,\mathsfit]{Kurier Light Italic} +% \setmathfont[range=\mathbfup,\mathbfsfup]{Kurier Bold} +% \setmathfont[range=\mathbfit,\mathbfsfit]{Kurier Bold Italic} +%\else + \IfFileExists{kurier.sty}% + {\RequirePackage[light,math]{kurier}}% + {} +%\fi % symbols \renewcommand*{\listitemsymbol}{\labelitemi~} @@ -78,7 +87,15 @@ \newlength{\listdoubleitemmaincolumnwidth} % commands +\setlength{\marginparwidth}{0\p@}% +\setlength{\marginparsep}{0\p@} \renewcommand*{\recomputecvlengths}{% + % regular lengths + \changepage{}{+\marginparwidth+\marginparsep}{}{}{}{}{}{}{}% if a letter was typeset before the resume, \marginparwidth and \marginparsep will be non-zero; otherwise, this has no effect + \setlength{\marginparwidth}{0\p@}% + \setlength{\marginparsep}{0\p@} + \setlength{\parskip}{0\p@}% + % maketitle lengths \setlength{\quotewidth}{0.65\textwidth}% % main lenghts \setlength{\maincolumnwidth}{\textwidth-\hintscolumnwidth-\separatorcolumnwidth}% @@ -246,7 +263,7 @@ % commands %\newlength{\textwidthdelta}% \renewcommand*{\recomputeletterlengths}{% - \recomputecvlengths{}% + \recomputecvlengths% \setlength{\parskip}{6\p@}% \leftskip=0pt% % \setlength{\textwidthdelta}{+\marginparwidth+\marginparsep}% @@ -291,7 +308,7 @@ \ifthenelse{\isundefined{\@enclosure}}{}{% \\% \vfill% - {\color{color2}\itshape{}Enclosure: \@enclosure}}} + {\color{color2}\itshape\enclname: \@enclosure}}} \endinput -- cgit v1.2.3