mirror of
https://github.com/moderncv/moderncv.git
synced 2026-02-06 10:05:19 +01:00
Merge branch 'master' into multiline-sub-sections-fancy
This commit is contained in:
commit
f1614d9827
36 changed files with 2425 additions and 872 deletions
|
|
@ -34,9 +34,9 @@
|
|||
\renewcommand*{\hintfont}{\bfseries}
|
||||
|
||||
% styles
|
||||
\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{color1}{#1}}}
|
||||
\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{color1}{#1}}}
|
||||
\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{color0}{#1}}}
|
||||
\renewcommand*{\sectionstyle}[1]{{\sectionfont\textcolor{sectioncolor}{#1}}}
|
||||
\renewcommand*{\subsectionstyle}[1]{{\subsectionfont\textcolor{subsectioncolor}{#1}}}
|
||||
\renewcommand*{\hintstyle}[1]{{\hintfont\textcolor{hintstylecolor}{#1}}}
|
||||
|
||||
% lengths
|
||||
% used by \cvitem (and all children command)
|
||||
|
|
@ -46,6 +46,8 @@
|
|||
\@initializelength{\maincolumnwidth}
|
||||
% used by \cvdoubleitem
|
||||
\@initializelength{\doubleitemcolumnwidth}
|
||||
% used by \cvtripleitem
|
||||
\@initializelength{\tripleitemcolumnwidth}
|
||||
% used by \cvlistitem
|
||||
\@initializelength{\listitemsymbolwidth} \settowidth{\listitemsymbolwidth}{\listitemsymbol}
|
||||
\@initializelength{\listitemcolumnwidth}
|
||||
|
|
@ -53,6 +55,7 @@
|
|||
% used by \cvlistdoubleitem
|
||||
\@initializelength{\listdoubleitemcolumnwidth}
|
||||
%\@initializelength{\listdoubleitemmaincolumnwidth}
|
||||
\@initializelength{\listitemsymbolspace} \setlength{\listitemsymbolspace}{0pt}
|
||||
|
||||
% commands
|
||||
\@initializecommand{\recomputecvbodylengths}{%
|
||||
|
|
@ -61,6 +64,8 @@
|
|||
\setlength{\listitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth}%
|
||||
\setlength{\doubleitemcolumnwidth}{\maincolumnwidth-\separatorcolumnwidth}%
|
||||
\setlength{\doubleitemcolumnwidth}{0.5\doubleitemcolumnwidth}%
|
||||
\setlength{\tripleitemcolumnwidth}{\maincolumnwidth-2\separatorcolumnwidth}%
|
||||
\setlength{\tripleitemcolumnwidth}{0.33\tripleitemcolumnwidth}%
|
||||
\setlength{\listdoubleitemcolumnwidth}{\maincolumnwidth-\listitemsymbolwidth-\separatorcolumnwidth-\listitemsymbolwidth}%
|
||||
\setlength{\listdoubleitemcolumnwidth}{0.5\listdoubleitemcolumnwidth}%
|
||||
\recompute@cvskillmatrix@lengths
|
||||
|
|
@ -101,7 +106,7 @@
|
|||
|
||||
% underlying command to implement \cvitem, \subsection and \section
|
||||
\newcommand*{\@cvitem}[3][.5ex]{%
|
||||
\arrayrulecolor{color1}%
|
||||
\arrayrulecolor{bodyrulecolor}%
|
||||
\setlength\arrayrulewidth{\separatorrulewidth}%
|
||||
\if@aftersection\else%
|
||||
\vspace*{-\separatorrulewidth}\fi% HACK; I don't understand where the space is coming from, nor what it's exact value is :(
|
||||
|
|
@ -119,15 +124,23 @@
|
|||
\hfill% fill of \separatorcolumnwidth
|
||||
\begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}}}
|
||||
|
||||
\renewcommand*{\cvtripleitem}[7][.1ex]{%
|
||||
\@cvitem[#1]{}{%
|
||||
\begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
|
||||
\hfill% fill of \separatorcolumnwidth
|
||||
\begin{minipage}[t]{\tripleitemcolumnwidth}\hintstyle{#4}: #5\end{minipage}%
|
||||
\hfill% fill of \separatorcolumnwidth
|
||||
\begin{minipage}[t]{\tripleitemcolumnwidth}\ifthenelse{\equal{#6}{}}{}{\hintstyle{#6}: }#7\end{minipage}}}
|
||||
|
||||
\renewcommand*{\cvlistitem}[2][.5ex]{%
|
||||
\@cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listitemcolumnwidth}#2\end{minipage}}}
|
||||
\@cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}}}
|
||||
|
||||
\renewcommand*{\cvlistdoubleitem}[3][.5ex]{%
|
||||
\@cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
|
||||
\@cvitem[#1]{}{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#2\end{minipage}%
|
||||
\hfill% fill of \separatorcolumnwidth
|
||||
\ifthenelse{\equal{#3}{}}%
|
||||
{}%
|
||||
{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
|
||||
{\listitemsymbol\hspace{\listitemsymbolspace}\begin{minipage}[t]{\listdoubleitemcolumnwidth-\listitemsymbolspace}#3\end{minipage}}}}
|
||||
|
||||
\@initializebox{\cventryyearbox}
|
||||
\@initializelength{\cventrytitleboxwidth}
|
||||
|
|
@ -167,7 +180,7 @@
|
|||
{%
|
||||
\bibliographyhead{\refname}%
|
||||
% \small%
|
||||
\arrayrulecolor{color1}%
|
||||
\arrayrulecolor{bodyrulecolor}%
|
||||
\setlength\arrayrulewidth{\separatorrulewidth}%
|
||||
\noindent%
|
||||
\begin{tabular}[t]{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}|@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}%
|
||||
|
|
@ -215,7 +228,7 @@
|
|||
\ifthenelse{\isundefined{\@enclosure}}{}{%
|
||||
\\%
|
||||
\vfill%
|
||||
{\color{color2}\itshape\enclname: \@enclosure}}}
|
||||
{\color{letterclosingcolor}\itshape\enclname: \@enclosure}}}
|
||||
|
||||
|
||||
\endinput
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue