From ebcdd9921ff34291f79453030c0357c9bf4f9802 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Oct 2011 23:16:29 +0000 Subject: koma-moderncvclassic (6oct11) git-svn-id: svn://tug.org/texlive/trunk@24224 c570f23f-e606-0410-a88d-b1316a301751 --- .../koma-moderncvclassic/koma-moderncvclassic.sty | 56 ++++++++++------------ 1 file changed, 24 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-moderncvclassic') diff --git a/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty b/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty index 8fba1e8ca22..705dc49b70b 100644 --- a/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty +++ b/Master/texmf-dist/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty @@ -1,7 +1,5 @@ -%% start of file `koma-moderncvclassic.sty'. -%% Copyright 2010 Salome Södergran (salome.soedergran@gmx.ch) -%% -%% Thanks to Dominik Wassenhoven and Simon Dreher for helpful suggestions! +%% start of file `koma-moderncvclassic.sty' v0.4 +%% Copyright 2010--2011 Salome Södergran (salome.soedergran@gmx.ch) %% %% Adaption of moderncv, theme classic %% (Copyright 2006-2008 Xavier Danaux (xdanaux@gmail.com)) @@ -15,7 +13,7 @@ % IDENTIFICATION % ============================== -\ProvidesPackage{koma-moderncvclassic}[2011/04/16 v0.3] +\ProvidesPackage{koma-moderncvclassic}[2011/10/06 v0.4] \NeedsTeXFormat{LaTeX2e} % ============================== @@ -45,7 +43,7 @@ ifpdf,% xcolor,% lmodern,% -marvosym,% for symbols like \Telefon, \Letter, \Email +marvosym,% symbols like \Telefon, \Letter, \Email url,% graphicx,% hyperref% @@ -267,29 +265,23 @@ hyperref% %\newcommand*{\colorrule}[2][1ex]{{\color{sectionrectanglecolor}{\rule{#2}{#1}}}} % usage: \cvline{margintext}{linetext} -% aus moderncv.cls-Datei +% from moderncv.cls \newcommand*{\cvline}[3][.25em]{% \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% \raggedleft\hintfont{#2} &{#3}% \end{tabular}\\[#1]} -% aus modercvclassic.sty-Datei: -% \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 - -% % usage: \cvlistdoubleitem[symbol]{point1}{point2} -% \newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{% -% \cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}% -% \hfill% -% \ifthenelse{\equal{#3}{}}% -% {}% -% {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}} - -% usage: \cvlistdoubleitem[symbol]{point1}{point2} -\newcommand*{\cvlistdoubleitem}[3][\listitemsymbol{}]{% -\cvline[0pt]{}{#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#2\end{minipage}% - \hfill% - \ifthenelse{\equal{#3}{}}% - {}% - {#1~\begin{minipage}[t]{\listdoubleitemmaincolumnwidth}#3\end{minipage}}}} +% + +% usage: \cvdoubleitem{head 1}{description 1}{head 2}{description 2}: +\newcommand*{\cvdoubleitem}[4]{% + \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: \cventry{years}{degree/job title}{institution/employer}{localization}{optionnal: grade/...}{optional: comment/job description} \newcommand*{\cventry}[6]{% @@ -307,14 +299,14 @@ hyperref% \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]{% +\newcommand*{\cvcomputer}[4]{\cvdoubleitem{#1}{\small#2}{#3}{\small#4}} + % \cvlistdoubleitem{#1}{\small#2}{#3}{\small#4}} -% = ursrüngliche Definition in moderncv; ergibt hier merkwürdige Resultat; -% deshalb Neuansatz: -\begin{tabular*}{\textwidth}[t]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\cvcompcolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\cvcompcolumnwidth} -} -\raggedleft{#1} &\raggedright{#2} &\raggedleft{#3} &\raggedright{#4} -\end{tabular*}} +% = original definition from moderncv.cls, result looks odd; new try: +%\begin{tabular*}{\textwidth}[t]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\cvcompcolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\cvcompcolumnwidth} +%} +%\raggedleft{#1} &\raggedright{#2} &\raggedleft{#3} &\raggedright{#4} +%\end{tabular*}} % usage: \link[optional text]{link} \newcommand*{\link}[2][]{% -- cgit v1.2.3