github/moderncv
1
0
Fork 0
mirror of https://github.com/moderncv/moderncv.git synced 2026-02-06 10:05:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge from 'xdanaux/master'

Browse source
This commit is contained in:
Stephan Lachnit 2021-01-21 20:13:43 +01:00
commit 037a79720d
No known key found for this signature in database
GPG key ID: B35B49EA5D563EFE
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
moderncvbodyiii.sty
View file

@ -143,13 +143,13 @@
\renewcommand*{\subsectionrule}{}\fi \renewcommand*{\subsectionrule}{}\fi
\renewcommand*{\cvitem}[3][.25em]{% \renewcommand*{\cvitem}[3][.25em]{%
\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }{#3}% \ifstrempty{#2}{}{\hintstyle{#2}: }{#3}%
\par\addvspace{#1}} \par\addvspace{#1}}
\renewcommand*{\cvdoubleitem}[5][.25em]{% \renewcommand*{\cvdoubleitem}[5][.25em]{%
\begin{minipage}[t]{\doubleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}% \begin{minipage}[t]{\doubleitemcolumnwidth}\hintstyle{#2}: #3\end{minipage}%
\hfill% fill of \separatorcolumnwidth \hfill% fill of \separatorcolumnwidth
\begin{minipage}[t]{\doubleitemcolumnwidth}\ifthenelse{\equal{#4}{}}{}{\hintstyle{#4}: }#5\end{minipage}% \begin{minipage}[t]{\doubleitemcolumnwidth}\ifstrempty{#4}{}{\hintstyle{#4}: }#5\end{minipage}%
\par\addvspace{#1}} \par\addvspace{#1}}
\renewcommand*{\cvlistitem}[2][.25em]{% \renewcommand*{\cvlistitem}[2][.25em]{%
@ -159,14 +159,20 @@
\renewcommand*{\cvlistdoubleitem}[3][.25em]{% \renewcommand*{\cvlistdoubleitem}[3][.25em]{%
\cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}% \cvitem[#1]{}{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#2\end{minipage}%
\hfill% fill of \separatorcolumnwidth \hfill% fill of \separatorcolumnwidth
\ifthenelse{\equal{#3}{}}% \ifstrempty{#3}%
{}% {}%
{\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}} {\listitemsymbol\begin{minipage}[t]{\listdoubleitemcolumnwidth}#3\end{minipage}}}}
\renewcommand*{\cventry}[7][.25em]{ \renewcommand*{\cventry}[7][.25em]{
\begin{tabular*}{\maincolumnwidth}{l@{\extracolsep{\fill}}r}% \begin{tabular*}{\maincolumnwidth}{l@{\extracolsep{\fill}}r}%
{\bfseries #4} & {\bfseries #5}\\% % skip the company name and location line if both are empty, allowing one to show multiple roles within the same company without repeating it
{\itshape #3\ifthenelse{\equal{#6}{}}{}{, #6}} & {\itshape #2}\\% \ifboolexpr{%
test {\ifstrempty{#4}}
and
test {\ifstrempty{#5}}}%
{}%
{{\bfseries #4} & {\bfseries #5}\\}%
{\itshape #3\ifstrempty{#6}{}{, #6}} & {\itshape #2}\\%
\end{tabular*}% \end{tabular*}%
\ifx&#7&% \ifx&#7&%
\else{\\% \else{\\%
@ -179,7 +185,7 @@
\@initializelength{\cvitemwithcommentmainlength} \@initializelength{\cvitemwithcommentmainlength}
\@initializelength{\cvitemwithcommentcommentlength} \@initializelength{\cvitemwithcommentcommentlength}
\renewcommand*{\cvitemwithcomment}[4][.25em]{% \renewcommand*{\cvitemwithcomment}[4][.25em]{%
\savebox{\cvitemwithcommentmainbox}{\ifthenelse{\equal{#2}{}}{}{\hintstyle{#2}: }#3}% \savebox{\cvitemwithcommentmainbox}{\ifstrempty{#2}{}{\hintstyle{#2}: }#3}%
\setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}% \setlength{\cvitemwithcommentmainlength}{\widthof{\usebox{\cvitemwithcommentmainbox}}}%
\setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}% \setlength{\cvitemwithcommentcommentlength}{\maincolumnwidth-\separatorcolumnwidth-\cvitemwithcommentmainlength}%
\begin{minipage}[t]{\cvitemwithcommentmainlength}\usebox{\cvitemwithcommentmainbox}\end{minipage}% \begin{minipage}[t]{\cvitemwithcommentmainlength}\usebox{\cvitemwithcommentmainbox}\end{minipage}%

6
moderncvheadiii.sty
View file

@ -70,10 +70,11 @@
\@firstmakeheaddetailselementfalse\fi} \@firstmakeheaddetailselementfalse\fi}
% internal command to flush the makehead % internal command to flush the makehead
\@initializecommand{\flushmakeheaddetails}{% \@initializecommand{\flushmakeheaddetails}{%
\ifnum\makeheaddetailsboxwidth>0%
\strut\usebox{\makeheaddetailsbox}% \strut\usebox{\makeheaddetailsbox}%
\savebox{\makeheaddetailsbox}{}% \savebox{\makeheaddetailsbox}{}%
\savebox{\makeheaddetailstempbox}{}% \savebox{\makeheaddetailstempbox}{}%
\setlength{\makeheaddetailsboxwidth}{0pt}} \setlength{\makeheaddetailsboxwidth}{0pt}\fi}
\@initializecommand{\makehead}{% \@initializecommand{\makehead}{%
\setlength{\makeheaddetailswidth}{0.8\textwidth}% \setlength{\makeheaddetailswidth}{0.8\textwidth}%
\hfil% \hfil%
@ -81,9 +82,10 @@
\centering% \centering%
% name and title % name and title
\namestyle{\@firstname~\@lastname}% \namestyle{\@firstname~\@lastname}%
\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