fix conditional subentries, no lengths fixed

This commit is contained in:
Johannes Böttcher 2016-05-15 11:03:12 +02:00
parent 3c75d45948
commit 7e0eff1e8c

View file

@ -77,6 +77,8 @@
\RequirePackage{fontawesome}
% Needed to deal a paragraphs
\RequirePackage{parskip}
% Needed to test if stuff is empty or not
\RequirePackage{xparse}
% Needed to deal hyperlink
\RequirePackage[hidelinks]{hyperref}
\hypersetup{%
@ -400,6 +402,11 @@
\newcommand*{\ifempty}[3]{\ifthenelse{\isempty{#1}}{#2}{#3}}
%traceme
\def\@jbtestme{}
%-------------------------------------------------------------------------------
% Commands for elements of CV structure
%-------------------------------------------------------------------------------
@ -407,7 +414,7 @@
% Usage: \makecvheader
\newcommand*{\makecvheader}{%
\begin{center}
\headerfirstnamestyle{\@firstname}\headerlastnamestyle{{}\acvHeaderNameDelim\@lastname}%
\headerfirstnamestyle{\@jbtestme\ \@firstname}\headerlastnamestyle{{}\acvHeaderNameDelim\@lastname}%
\\[\acvHeaderAfterNameSkip]%
\ifthenelse{\isundefined{\@position}}{}{\headerpositionstyle{\@position\\[\acvHeaderAfterPositionSkip]}}%
\ifthenelse{\isundefined{\@address}}{}{\headeraddressstyle{\@address\\[\acvHeaderAfterAddressSkip]}}%
@ -558,15 +565,12 @@
\setlength\tabcolsep{0pt}
\setlength{\extrarowheight}{0pt}
\begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}}
\setlength\leftskip{0.2cm}
\subentrytitlestyle{#2} & \ifthenelse{\equal{#1}{}}
{\subentrydatestyle{#3}}{}
\ifthenelse{\equal{#1}{}}
{}
{\subentrypositionstyle{#1} & \subentrydatestyle{#3} \\}
\ifthenelse{\equal{#4}{}}
{}
\setlength\leftskip{0.2cm}%
\subentrytitlestyle{#2} & %
\IfNoValueTF{#1}{\subentrydatestyle #3}{\subentrypositionstyle{#1} \quad \subentrydatestyle{#3}}\\
\IfValueTF{#4}
{\multicolumn{2}{L{17.0cm}}{\subdescriptionstyle{#4}} \\}
{}
\end{tabular*}
}