diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-06 00:42:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-06 00:42:34 +0000 |
commit | 27d1d1646fa5dc2daba1e09c2d2175c211d93def (patch) | |
tree | e7b644fc1c31207cb69662f4278db7d555a63116 /Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty | |
parent | 4e9750715f219d797d201e091dd0917660b68178 (diff) |
moderncv 0.18 (5feb12)
git-svn-id: svn://tug.org/texlive/trunk@25300 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty index 6ce1bc052c5..29441f8331d 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/25 v0.17 modern curriculum vitae style: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2012/02/05 v0.18 modern curriculum vitae style: oldstyle] %------------------------------------------------------------------------------- @@ -126,7 +126,7 @@ % 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]}}% % optional details \makeinfo{% \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}% @@ -139,26 +139,28 @@ \ifthenelse{\isundefined{\@extrainfo}}{}{\maketitledetailsnewline\@extrainfo}}} \renewcommand*{\section}[1]{% - \vspace*{2.5ex}% + \par\addvspace{2.5ex}% \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{part}{#1}% - \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) + \addcontentsline{toc}{section}{#1}% + \strut\sectionstyle{#1}% + \par\nobreak\addvspace{1ex}\@afterheading}% to avoid a pagebreak after the heading \renewcommand*{\subsection}[1]{% - \subsectionstyle{#1}% - \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...) + \par\addvspace{1ex}% + \phantomsection{}% reset the anchor for hyperrefs + \addcontentsline{toc}{subsection}{#1}% + \strut\subsectionstyle{#1}% + \par\nobreak\addvspace{0.5ex}\@afterheading}% to avoid a pagebreak after the heading \renewcommand*{\cvitem}[3][.25em]{% - \ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }{#3}\\[#1]} + \ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }{#3}% + \par\addvspace{#1}} \renewcommand*{\cvdoubleitem}[5][.25em]{% - \begin{minipage}[t]{\doubleitemcolumnwidth}{\hintfont#2}: #3\end{minipage}% + \begin{minipage}[t]{\doubleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}% \hfill% fill of \separatorcolumnwidth - \begin{minipage}[t]{\doubleitemcolumnwidth}{\hintfont#4}: #5\end{minipage}\\[#1]} + \begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}% + \par\addvspace{#1}} \renewcommand*{\cvlistitem}[2][.25em]{% \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemmaincolumnwidth}#2\end{minipage}}} @@ -175,39 +177,44 @@ \renewcommand*{\cventry}[7][.25em]{% \savebox{\cventryyearbox}{% \hspace*{2\separatorcolumnwidth}% - {\hintfont#2}}% + \hintstyle{#2}}% \setlength{\cventrytitleboxwidth}{\widthof{\usebox{\cventryyearbox}}}% \setlength{\cventrytitleboxwidth}{\maincolumnwidth-\cventrytitleboxwidth}% \begin{minipage}{\maincolumnwidth}% \parbox[t]{\cventrytitleboxwidth}{% + \strut% {\bfseries#3}% \ifthenelse{\equal{#4}{}}{}{, {\slshape#4}}% \ifthenelse{\equal{#5}{}}{}{, #5}% \ifthenelse{\equal{#6}{}}{}{, #6}% - .}% + .\strut}% \usebox{\cventryyearbox}% \end{minipage}% \ifx&% \else{% - \newline{}\begin{minipage}[t]{\maincolumnwidth}\small#7\end{minipage}}\fi% - \\[#1]} - + \newline{}% + \begin{minipage}[t]{\maincolumnwidth}% + \small% + #7% + \end{minipage}}\fi% + \par\addvspace{#1}} \newbox{\cvitemwithcommentmainbox} \newlength{\cvitemwithcommentmainlength} \newlength{\cvitemwithcommentcommentlength} \renewcommand*{\cvitemwithcomment}[4][.25em]{% - \savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }#3}% + \savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3}% \setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}% \setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}% - \begin{minipage}[t]{\cvitemwithcommentmainlength}\ifthenelse{\equal{#2}{}}{}{{\hintfont#2}: }#3\end{minipage}% + \begin{minipage}[t]{\cvitemwithcommentmainlength}\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3\end{minipage}% \hfill% fill of \separatorcolumnwidth - \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}\\[#1]} + \begin{minipage}[t]{\cvitemwithcommentcommentlength}\raggedleft\small\itshape#4\end{minipage}% + \par\addvspace{#1}} \renewenvironment{thebibliography}[1]% {% \bibliographyhead{\refname}% - \small% +% \small% \begin{list}{\bibliographyitemlabel}% {% \setlength{\topsep}{0pt}% |