mirror of
https://github.com/moderncv/moderncv.git
synced 2026-02-06 10:05:19 +01:00
Merge febe25906b into 876d7884f2
This commit is contained in:
commit
5b3892e7a0
5 changed files with 12 additions and 12 deletions
|
|
@ -48,8 +48,8 @@
|
||||||
\renewcommand*{\quotefont}{\large\slshape}
|
\renewcommand*{\quotefont}{\large\slshape}
|
||||||
|
|
||||||
% styles
|
% styles
|
||||||
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
|
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}\par}}
|
||||||
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
|
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}\par}}
|
||||||
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
||||||
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
||||||
|
|
||||||
|
|
@ -119,7 +119,7 @@
|
||||||
\if@left\raggedright\fi%
|
\if@left\raggedright\fi%
|
||||||
\if@right\raggedleft\fi%
|
\if@right\raggedleft\fi%
|
||||||
\namestyle{\@firstname\ \@lastname}%
|
\namestyle{\@firstname\ \@lastname}%
|
||||||
\ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
|
\ifthenelse{\equal{\@title}{}}{}{\vspace{1.25em}\titlestyle{\@title}}%
|
||||||
\end{minipage}}%
|
\end{minipage}}%
|
||||||
% raise boxes if top option is set
|
% raise boxes if top option is set
|
||||||
\if@top%
|
\if@top%
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
% styles
|
% styles
|
||||||
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
|
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
|
||||||
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
|
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}\par}}
|
||||||
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
||||||
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
||||||
|
|
||||||
|
|
@ -158,7 +158,7 @@
|
||||||
\titlestyle{\MakeLowercase\@title}%
|
\titlestyle{\MakeLowercase\@title}%
|
||||||
\else%
|
\else%
|
||||||
\titlestyle{\@title}\fi%
|
\titlestyle{\@title}\fi%
|
||||||
}\\[2.5em]%
|
}\vspace{2.5ex}%
|
||||||
% optional quote
|
% optional quote
|
||||||
\ifthenelse{\isundefined{\@quote}}%
|
\ifthenelse{\isundefined{\@quote}}%
|
||||||
{}%
|
{}%
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
% styles
|
% styles
|
||||||
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
|
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
|
||||||
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
|
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}\par}}
|
||||||
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
||||||
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
||||||
|
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
\ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title)
|
\ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title)
|
||||||
% optional detailed information
|
% optional detailed information
|
||||||
\if@details{%
|
\if@details{%
|
||||||
\\%
|
%\\%
|
||||||
\addressfont\color{color2}%
|
\addressfont\color{color2}%
|
||||||
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtomakeheaddetails{\addresssymbol\@addressstreet}%
|
\ifthenelse{\isundefined{\@addressstreet}}{}{\addtomakeheaddetails{\addresssymbol\@addressstreet}%
|
||||||
\ifthenelse{\equal{\@addresscity}{}}{}{\addtomakeheaddetails[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
|
\ifthenelse{\equal{\@addresscity}{}}{}{\addtomakeheaddetails[~--~]{\@addresscity}}% if \addresstreet is defined, \addresscity and \addresscountry will always be defined but could be empty
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,8 @@
|
||||||
\renewcommand*{\quotefont}{\large\itshape}
|
\renewcommand*{\quotefont}{\large\itshape}
|
||||||
|
|
||||||
% styles
|
% styles
|
||||||
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}}}
|
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color0}{#1}\par}}
|
||||||
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}}}
|
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2}{#1}\par}}
|
||||||
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
||||||
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
||||||
|
|
||||||
|
|
@ -92,7 +92,7 @@
|
||||||
{}%
|
{}%
|
||||||
\begin{minipage}[b]{\makecvheadnamewidth}%
|
\begin{minipage}[b]{\makecvheadnamewidth}%
|
||||||
\namestyle{\@firstname\ \@lastname}%
|
\namestyle{\@firstname\ \@lastname}%
|
||||||
\ifthenelse{\equal{\@title}{}}{}{\\[1.25em]\titlestyle{\@title}}%
|
\ifthenelse{\equal{\@title}{}}{}{\vspace{1.25em}\titlestyle{\@title}}%
|
||||||
\end{minipage}%
|
\end{minipage}%
|
||||||
% optional photo
|
% optional photo
|
||||||
\usebox{\makecvheadpicturebox}\\[2.5em]%
|
\usebox{\makecvheadpicturebox}\\[2.5em]%
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
% styles
|
% styles
|
||||||
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
|
\renewcommand*{\namestyle}[1]{{\namefont\textcolor{color1}{#1}}}
|
||||||
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}}}
|
\renewcommand*{\titlestyle}[1]{{\titlefont\textcolor{color2!85}{#1}\par}}
|
||||||
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
\renewcommand*{\addressstyle}[1]{{\addressfont\textcolor{color2}{#1}}}
|
||||||
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
\renewcommand*{\quotestyle}[1]{{\quotefont\textcolor{color1}{#1}}}
|
||||||
|
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
% name and title
|
% name and title
|
||||||
\if@left\hfill\fi%
|
\if@left\hfill\fi%
|
||||||
\namestyle{\@firstname~\@lastname}%
|
\namestyle{\@firstname~\@lastname}%
|
||||||
\ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}\\[-.35em]% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title)
|
\ifthenelse{\equal{\@title}{}}{}{\titlestyle{~|~\@title}}\vspace{-.35em}% \isundefined doesn't work on \@title, as LaTeX itself defines \@title (before it possibly gets redefined by \title)
|
||||||
% rule
|
% rule
|
||||||
{\color{color1}\rule{\textwidth}{.25ex}}}
|
{\color{color1}\rule{\textwidth}{.25ex}}}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue