From 67b16bba03801bffa07aedd6962ddeee8fd42fd6 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 20 Jan 2021 12:54:32 +0100 Subject: [PATCH] code clean up --- moderncvskillmatrix.sty | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/moderncvskillmatrix.sty b/moderncvskillmatrix.sty index 603248c..07e3c3c 100644 --- a/moderncvskillmatrix.sty +++ b/moderncvskillmatrix.sty @@ -520,18 +520,18 @@ \begingroup% % \renewcommand{\arraystretch}{1.0}% \begin{tabular}[t]{@{}p{\hintscolumnwidth}%\skilllegend@hintscolumnwidth - @{\hspace{\separatorcolumnwidth}}|@{\hspace{\separatorcolumnwidth}}% - p{\cvskill@width}@{\hspace{\skilllegend@padding}}% - p{\skilllegend@padding}% - p{\cvskilllegend@leftdescriptorwidth}@{\hspace{2\skillmatrix@padding}}% - p{\cvskill@width}@{\hspace{\skilllegend@padding}}% - p{\skilllegend@padding}% - p{\cvskilllegend@rightdescriptorwidth}@{}}% - \@moderncvstrut{4pt}{16pt} & \cvskill{1}& & {\skillLegend@FontSize #3} & \cvskill{3}& & {\skillLegend@FontSize #5 } \\% + @{\hspace{\separatorcolumnwidth}}|@{\hspace{\separatorcolumnwidth}}% + p{\cvskill@width}@{\hspace{\skilllegend@padding}}% + p{\skilllegend@padding}% + p{\cvskilllegend@leftdescriptorwidth}@{\hspace{2\skillmatrix@padding}}% + p{\cvskill@width}@{\hspace{\skilllegend@padding}}% + p{\skilllegend@padding}% + p{\cvskilllegend@rightdescriptorwidth}@{}}% + \@moderncvstrut{4pt}{16pt} & \cvskill{1}& & {\skillLegend@FontSize #3} & \cvskill{3}& & {\skillLegend@FontSize #5 }\\% % - & \cvskill{2}& & \multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4}& & {\skillLegend@FontSize #6 } \\% + & \cvskill{2}& & \multirow{2}{\cvskilllegend@leftdescriptorwidth}{{\skillLegend@FontSize #4}} & \cvskill{4}& & {\skillLegend@FontSize #6 }\\% % - & & & & \cvskill{5}& & {\skillLegend@FontSize #7 } \\[#2]% the spacing needs to be inside the cell for the vertical rule to extend correctly + & & & & \cvskill{5}& & {\skillLegend@FontSize #7 }\\[#2]% the spacing needs to be inside the cell for the vertical rule to extend correctly \end{tabular}% \endgroup% \par\@aftersectionfalse\ignorespaces% @@ -571,7 +571,7 @@ \NewDocumentCommand\skillMatrix@HeaderDefaultTwo{}{Skill} \NewDocumentCommand\skillMatrix@HeaderDefaultThree{}{Years} \NewDocumentCommand\skillMatrix@HeaderDefaultFour{}{Comment} -% The following definition is valid for moderncvbodyi, moderncvbodyii, moderncvbodyiii, moderncvbodyiv +% Definition of \cvskillhead valid for moderncvbodyi, moderncvbodyii, moderncvbodyiii, moderncvbodyiv \RenewDocumentCommand\cvskillhead{O{.25em} +O{\skillMatrix@HeaderDefaultOne} +O{\skillMatrix@HeaderDefaultTwo} +O{\skillMatrix@HeaderDefaultThree} +O{\skillMatrix@HeaderDefaultFour}}{% \begingroup \renewcommand{\arraystretch}{1.25} @@ -582,12 +582,11 @@ p{\cvskill@experiencewidth}@{\hspace{\skillmatrix@padding}} p{\skillmatrix@commentwidth}@{}}% & \centering{\cvSkillMatrix@HeadFont #2} & \centering{\cvSkillMatrix@HeadFont #3} & \centering{\cvSkillMatrix@HeadFont #4} & {\cvSkillMatrix@HeadFont #5} -% \\\cdashline{2-5}[.6pt/1pt] \end{tabular}% \endgroup \par\addvspace{#1} } -% in case moderncvbodyv is used we need a redefinition of \cvskillhead +% Definition of \cvskillhead valid moderncvbodyv \if@moderncvbodyv% \RenewDocumentCommand\cvskillhead{O{.25em} +O{\skillMatrix@HeaderDefaultOne} +O{\skillMatrix@HeaderDefaultTwo} +O{\skillMatrix@HeaderDefaultThree} +O{\skillMatrix@HeaderDefaultFour}}{% \arrayrulecolor{color1}%