summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/europasscv/europasscv.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/europasscv/europasscv.cls')
-rw-r--r--Master/texmf-dist/tex/latex/europasscv/europasscv.cls109
1 files changed, 68 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/europasscv/europasscv.cls b/Master/texmf-dist/tex/latex/europasscv/europasscv.cls
index 33731402fff..c0687d6b665 100644
--- a/Master/texmf-dist/tex/latex/europasscv/europasscv.cls
+++ b/Master/texmf-dist/tex/latex/europasscv/europasscv.cls
@@ -8,7 +8,7 @@
% See http://www.latex-project.org/lppl.txt
% for the details of that license
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{europasscv}[2017/11/19 The new Europass curriculum vitae class]
+\ProvidesClass{europasscv}[2019/01/14 The new Europass curriculum vitae class]
\newcommand\ecv@utf[1]{#1}
@@ -81,10 +81,10 @@
\ClassWarningNoLine{europasscv}{Swedish definition file 'europasscv_sv.def' not found}}%
}%
}
-\DeclareOption{norwegian}{%
+\DeclareOption{norsk}{%
\AtEndOfPackage{%
- \InputIfFileExists{europasscv_no.def}{}{%
- \ClassWarningNoLine{europasscv}{Norwegian definition file 'europasscv_no.def' not found}}%
+ \InputIfFileExists{europasscv_nb.def}{}{%
+ \ClassWarningNoLine{europasscv}{Norwegian (Bokmål) definition file 'europasscv_nb.def' not found}}%
}%
}
\DeclareOption{dutch}{%
@@ -220,8 +220,8 @@
\DeclareOption{notitle}{\def\ecv@notitle{}}
% Page numbering
-\AtEndOfPackage{\RequirePackage{totpages}}
-\def\ecv@totpages{~/~\ref{TotPages}}
+\AtEndOfPackage{\RequirePackage{lastpage}}
+\def\ecv@totpages{~/~\pageref{LastPage}}
\DeclareOption{nototpages}{
\def\ecv@totpages{}
}
@@ -268,6 +268,7 @@
\RequirePackage{graphicx}
\RequirePackage{xparse}
\RequirePackage{substr}
+\RequirePackage{keyval}
\if@ecvdebug \RequirePackage{showframe} \fi
@@ -376,7 +377,15 @@
\newcommand*{\ecvemail}[1]{\def\ecv@email{#1}}
\newcommand*{\ecvhomepage}[1]{\def\ecv@homepage{#1}}
\newcommand*{\ecvgithubpage}[1]{\def\ecv@githubpage{#1}}
+\newcommand*{\ecvgitlabpage}[1]{\def\ecv@gitlabpage{#1}}
\newcommand*{\ecvlinkedinpage}[1]{\def\ecv@linkedinpage{#1}}
+
+\newif\if@ecvorcidlink\@ecvorcidlinkfalse
+\define@key{ecvorcid}{link}[true]{\@ecvorcidlinktrue}
+\newif\if@ecvorcidlabel\@ecvorcidlabelfalse
+\define@key{ecvorcid}{label}[true]{\@ecvorcidlabeltrue}
+\newcommand*{\ecvorcid}[2][]{\setkeys{ecvorcid}{#1}\def\ecv@orcid{#2}}
+
\def\ecv@im{}
\newif\if@ecvIMalreadyprovided\@ecvIMalreadyprovidedfalse
\newcommand*{\ecvim}[2]{\if@ecvIMalreadyprovided \g@addto@macro\ecv@im{\quad} \fi \g@addto@macro\ecv@im{\ecvhighlight{#1} #2} \@ecvIMalreadyprovidedtrue}
@@ -413,7 +422,9 @@
\ecvemail{}
\ecvhomepage{}
\ecvgithubpage{}
+\ecvgitlabpage{}
\ecvlinkedinpage{}
+\ecvorcid{}
\ecvnationality{}
\ecvdateofbirth{}
\ecvgender{}
@@ -447,6 +458,8 @@
\newif\if@ecvpineedspipe\@ecvpineedspipefalse
\newif\if@ecvphoneispresent\@ecvphoneispresentfalse
+\newlength{\ecv@pileftcolwidth}
+\newlength{\ecv@pirightcolwidth}
\providecommand{\ecvpersonalinfo}[1][0pt]{%
\ecvitem[#1]{ % left column
\ecvsectionstyle{\ecv@infosectionkey}
@@ -457,68 +470,83 @@
\fi
}
{ % right column
+ \if@ecvpicture
+ \if@ecvpictureright
+ \setlength{\ecv@pileftcolwidth}{0.7\ecv@rightcolwidth}
+ \else
+ \setlength{\ecv@pileftcolwidth}{\ecv@rightcolwidth}
+ \fi
+ \else
+ \setlength{\ecv@pileftcolwidth}{\ecv@rightcolwidth}
+ \fi
+ \if@ecvpictureright
+ \setlength{\ecv@pirightcolwidth}{0.3\ecv@rightcolwidth}
+ \else
+ \setlength{\ecv@pirightcolwidth}{0pt}
+ \fi
\begin{doublespacing}
- \begin{tabular}[t]{@{}p{\if@ecvpicture \if@ecvpictureright 0.7\ecv@rightcolwidth \else \ecv@rightcolwidth \fi \else \ecv@rightcolwidth\fi}@{}p{\if@ecvpictureright 0.3\ecv@rightcolwidth \else 0pt\fi}@{}}
+ \begin{tabular}[t]{@{}p{\ecv@pileftcolwidth}@{}p{\ecv@pirightcolwidth}@{}}
\if@ecvdebug\cellcolor{green!25}\fi
\raggedright
{\ecvLargenormalstyle{\ecv@name}} \newline
\ifx\@empty\ecv@address\else
- \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{address_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@address} \newline
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{address_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@address} \newline
\fi
- \ifx\@empty\ecv@mobile
- \else\@ecvphoneispresenttrue
+ \ifx\@empty\ecv@mobile\else
+ \@ecvphoneispresenttrue
\raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mobile_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@mobile} \quad
\fi
- \ifx\@empty\ecv@telephone
- \else\@ecvphoneispresenttrue
+ \ifx\@empty\ecv@telephone\else
+ \@ecvphoneispresenttrue
\raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{telephone_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@telephone} \quad
\fi
- \ifx\@empty\ecv@workphone
- \else
- \@ecvphoneispresenttrue
- \ifx\@empty\ecv@mobile
- \else
- \ifx\@empty\ecv@telephone
- \else
- \if@ecvpicture
- \if@ecvpictureright
- \newline
- \fi
- \fi
- \fi
- \fi
+ \ifx\@empty\ecv@workphone\else
+ \@ecvphoneispresenttrue
+ \ifx\@empty\ecv@mobile\else
+ \ifx\@empty\ecv@telephone\else
+ \if@ecvpicture
+ \if@ecvpictureright
+ \newline
+ \fi
+ \fi
+ \fi
+ \fi
\raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{work_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@workphone}
\fi
\if@ecvphoneispresent
\newline
\fi
\ifx\@empty\ecv@fax\else
- \ecv@faxkey \ecv@fax
+ \ecv@faxkey \ecv@fax
\fi
\ifx\@empty\ecv@email\else
- \@processlinks@converttoemailtrue
- \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mail_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@email}} \newline
- \@processlinks@converttoemailfalse
+ \@processlinks@converttoemailtrue
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mail_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@email}} \newline
+ \@processlinks@converttoemailfalse
\fi
- \ifx\@empty\ecv@homepage\else
- \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{website_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@homepage}} \newline
+ \ifx\@empty\ecv@homepage\else
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{website_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@homepage}} \newline
\fi
\ifx\@empty\ecv@githubpage\else
- \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{github_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@githubpage}} \newline
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{github_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@githubpage}} \newline
+ \fi
+ \ifx\@empty\ecv@gitlabpage\else
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{gitlab_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@gitlabpage}} \newline
\fi
\ifx\@empty\ecv@linkedinpage\else
- \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{linkedin_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@linkedinpage}} \newline
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{linkedin_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@linkedinpage}} \newline
+ \fi
+ \ifx\@empty\ecv@orcid\else
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{orcid_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont\if@ecvorcidlabel\ecvhighlight{ORCID}~\fi\if@ecvorcidlink\setulcolor{\ecv@textcolor}\setul{.5pt}{.4pt}\href{https://orcid.org/\ecv@orcid}{\ul{\mbox{\ecv@orcid}}}\else\ecv@orcid\fi} \newline
\fi
\ifx\@empty\ecv@im\else
- \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{im_europass_icon.pdf}} \hspace{0.2mm}{\fontseries{m}\selectfont \ecv@im} \newline
+ \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{im_europass_icon.pdf}} \hspace{0.2mm}{\fontseries{m}\selectfont \ecv@im} \newline
\fi
\ifx\@empty\ecv@gender\else
- \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi
- \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi \ecv@genderkey} \ecv@gender \@ecvpineedspipetrue
+ \fontseries{m}\selectfont \ecvhighlight{\if@ecvpineedspipe ~| \fi \ecv@genderkey} \ecv@gender \@ecvpineedspipetrue
\fi
\ifx\@empty\ecv@birth\else
- \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi
- \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi\ecv@birthkey} \ecv@birth \@ecvpineedspipetrue
+ \fontseries{m}\selectfont \ecvhighlight{\if@ecvpineedspipe ~| \fi\ecv@birthkey} \ecv@birth \@ecvpineedspipetrue
\fi
\if@ecvpictureright
\if@ecvpicture
@@ -533,8 +561,7 @@
\fi
\fi
\ifx\@empty\ecv@nationality\else
- \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi
- \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi \ecv@nationalitykey}~\ecv@nationality \@ecvpineedspipetrue
+ \fontseries{m}\selectfont \ecvhighlight{\if@ecvpineedspipe ~| \fi \ecv@nationalitykey}~\ecv@nationality \@ecvpineedspipetrue
\fi
&
\if@ecvpictureright