diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/komacv/komacv.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/komacv/komacv.cls | 144 |
1 files changed, 81 insertions, 63 deletions
diff --git a/Master/texmf-dist/tex/latex/komacv/komacv.cls b/Master/texmf-dist/tex/latex/komacv/komacv.cls index 5e7eade0aa7..5b91605b78a 100644 --- a/Master/texmf-dist/tex/latex/komacv/komacv.cls +++ b/Master/texmf-dist/tex/latex/komacv/komacv.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran@gmx.ch) +%% Copyright (C) 2014-2021 by Salome Södergran (salome.soedergran@gmx.ch) %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,10 +22,9 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{komacv} - [2017/04/17 v1.1.1 komacv class] - + [2021/02/12 v1.1.2 komacv class] \providecommand*\mycolor{blue} -\RequirePackage{ifthen,kvoptions,calc} +\RequirePackage{ifthen,kvoptions,calc,xparse,xstring} \SetupKeyvalOptions{% family=komacv,% prefix=komacv@,% @@ -34,6 +33,7 @@ setkeys=\kvsetkeys% \DeclareStringOption[mycolor]{color}[mycolor] \DeclareStringOption[x11names]{xcolor}[x11names] \DeclareStringOption[classic]{style}[classic] +\DeclareBoolOption[true]{fontawesome} \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessKeyvalOptions{komacv} % evaluate keyval options \LoadClass[a4paper,headings=normal,fontsize=11pt]{scrartcl} @@ -45,15 +45,16 @@ setkeys=\kvsetkeys% ifxetex,% scrlayer-scrpage,% marvosym,% - fontawesome,% array,% graphicx,% microtype,% enumitem, hyperref% } +\ifkomacv@fontawesome +\RequirePackage{fontawesome} +\fi \RequirePackage[raggedrightboxes]{ragged2e} - \AtEndPreamble{% \renewcommand\familydefault{\sfdefault}% without this, pdflatex produces error messages; WHY? } @@ -114,6 +115,7 @@ setkeys=\kvsetkeys% \newkomafont{hintfont}{} \newkomafont{linkfont}{} \newkomafont{httplinkfont}{} +\newkomafont{httpslinkfont}{} \newkomafont{emaillinkfont}{} \newkomafont{commentmainfont}{\bfseries} % in \cvitemwithcomment \newkomafont{commentfont}{\footnotesize\itshape} % in \cvitemwithcomment @@ -197,39 +199,33 @@ setkeys=\kvsetkeys% \newlength\@aftersubsecvspace \newlength\aftersubsecvspace \setlength\aftersubsecvspace{0pt} - \AtEndPreamble{% % infocol (oldstyle) \setlength{\@infocolwidth}{\infocolwidth} \setlength{\@sepinfocolwidth}{\sepinfocolwidth} - \setlength\komacvinfocolextrawidth{\@infocolwidth+\@sepinfocolwidth} +\setlength\komacvinfocolextrawidth{\@infocolwidth+\@sepinfocolwidth} \setlength\@komacvtextwidth{\textwidth-\komacvinfocolextrawidth} - % fboxextra (picture frame) \newlength\@fboxextra \setlength\@fboxextra{\fboxsep+\fboxrule} - % hintscolumn \ifdimequal{\hintscolwidth}{0pt}{% \setlength\@hintscolwidth{.2\@komacvtextwidth} }{% \setlength{\@hintscolwidth}{\hintscolwidth}% } - % separatorcolumn \ifdimequal{\sepcolwidth}{0pt}{% \setlength\@sepcolwidth{2em}% }{% \setlength{\@sepcolwidth}{\sepcolwidth}% } - % maincolumn \ifdimequal{\maincolwidth}{0pt}{% - \setlength{\@maincolwidth}{\@komacvtextwidth-\@sepcolwidth-\@hintscolwidth}% +\setlength{\@maincolwidth}{\@komacvtextwidth-\@sepcolwidth-\@hintscolwidth}% }{% \setlength{\@maincolwidth}{\maincolwidth}% } - % doubleitem \ifdimequal{\dbitemmaincolwidth}{0pt}{% \setlength{\@dbitemmaincolwidth}{% @@ -238,24 +234,21 @@ setkeys=\kvsetkeys% }{% \setlength{\@dbitemmaincolwidth}{\dbitemmaincolwidth}% } - % listitem \ifdimequal{\listitemsymbolwidth}{0pt}{% \settowidth{\@listitemsymbolwidth}{\listitemsymbol{}~}% }{% \setlength{\@listitemsymbolwidth}{\listitemsymbolwidth}% } - \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}% - +\setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}% % listdoubleitem \ifdimequal{\listdbitemmaincolwidth}{0pt}{% - \setlength{\@listdbitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}% - \setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% % +\setlength{\@listdbitemmaincolwidth}{\@maincolwidth-\@sepcolwidth-\@listitemsymbolwidth}% +\setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% % }{% \setlength{\@listdbitemmaincolwidth}{\listdbitemmaincolwidth}% - \setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% % +\setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% % } - % quote \ifdimequal{\quotewidth}{0pt}{% \setlength{\@quotewidth}{0.65\textwidth}% @@ -267,7 +260,6 @@ setkeys=\kvsetkeys% }{% \setlength\@afterquotevspace{\afterquotevspace}% } - % title \ifundef{\@photoname}{% without picture: \setlength\@aftertitlevspace{\aftertitlevspace} @@ -292,21 +284,18 @@ setkeys=\kvsetkeys% \setlength{\@titlesepwidth}{\titlesepwidth} } } - % afterelementsvspace \ifdimequal{\afterelementsvspace}{0pt}{% \setlength{\@afterelementsvspace}{0.25em}% }{% \setlength{\@afterelementsvspace}{\afterelementsvspace}% } - % beforesecvspace \ifdimequal{\beforesecvspace}{0pt}{% \setlength{\@beforesecvspace}{3.5ex \@plus -1ex \@minus -.2ex}% }{% \setlength{\@beforesecvspace}{\beforesecvspace}% } - % aftersecvspace \ifdimequal{\aftersecvspace}{0pt}{% \setlength{\@aftersecvspace}{2.3ex \@plus.2ex}% @@ -319,7 +308,6 @@ setkeys=\kvsetkeys% }{ \setlength{\@beforesubsecvspace}{\beforesubsecvspace}% } - % aftersubsecvspace \ifdimequal{\aftersubsecvspace}{0pt}{% \setlength{\@aftersubsecvspace}{1.5ex \@plus .2ex}% @@ -329,29 +317,35 @@ setkeys=\kvsetkeys% } % end AtEndPreamble \providecommand*\@addresssymbol{} \providecommand*\addresssymbol{} -\providecommand*\@mobilesymbol{\Mobilefone~} +\providecommand*\@mobilesymbol{\upshape{\Mobilefone}~} \providecommand*\mobilesymbol{} -\providecommand*\@phonesymbol{\Telefon~} +\providecommand*\@phonesymbol{\upshape{\Telefon}~} \providecommand*\phonesymbol{} -\providecommand*\@faxsymbol{\FAX~} +\providecommand*\@faxsymbol{\upshape{\FAX}~} \providecommand*\faxsymbol{} -\providecommand*\@emailsymbol{\Letter~} +\providecommand*\@emailsymbol{\upshape{\Letter}~} \providecommand*\emailsymbol{} \providecommand*\@homepagesymbol{} \providecommand*\homepagesymbol{} -\providecommand*\@twittersymbol{\faTwitter~} +\ifkomacv@fontawesome +\providecommand*\@twittersymbol{\upshape{\faTwitter}~} +\providecommand*\@githubsymbol{\upshape{\faGithub}~} +\providecommand*\@facebooksymbol{\upshape{\faFacebook}~} +\providecommand*\@linkedinsymbol{\upshape{\faLinkedin}~} +\else +\providecommand*\@twittersymbol{} +\providecommand*\@githubsymbol{} +\providecommand*\@facebooksymbol{} +\providecommand*\@linkedinsymbol{} +\fi \providecommand*\twittersymbol{} -\providecommand*\@githubsymbol{\faGithub~} \providecommand*\githubsymbol{} -\providecommand*\@facebooksymbol{\faFacebook~} \providecommand*\facebooksymbol{} -\providecommand*\@linkedinsymbol{\faLinkedin~} \providecommand*\linkedinsymbol{} \providecommand*\@fsymbol{~~~\textbullet~~~} \providecommand*\fsymbol{} \providecommand*\@listitemsymbol{\textcolor{colortheme}{\Neutral}~} \providecommand*\listitemsymbol{} - \AtEndPreamble{% \ifdefempty{\addresssymbol}{}{% \renewcommand*\@addresssymbol{\addresssymbol} @@ -389,9 +383,7 @@ setkeys=\kvsetkeys% \ifdefempty{\listitemsymbol}{}{% \renewcommand*\@listitemsymbol{\listitemsymbol} } - } % end \AtEndPreamble - \providecommand*{\firstname}{} \providecommand*{\familyname}{} \providecommand*{\acadtitle}{} @@ -432,26 +424,40 @@ setkeys=\kvsetkeys% \providecommand{\@photoframe}{#1}% \setlength{\@photowidth}{#2}% \providecommand{\@photoname}{#3}} -\providecommand\headlinetype{none} +\providecommand\@headlinealignment{} +\providecommand\@headlinetype{none} \providecommand\@headlinecontent{} -\providecommand\headlinecontent{} -\providecommand\headline[2]{\renewcommand\headlinecontent{#1}\renewcommand\headlinetype{#2}} - -\AtEndPreamble{% - \ifdefstring{\headlinetype}{name}{% - \ifdefempty{\headlinecontent}{% - \renewcommand*\@headlinecontent{\firstnamestyle{\firstname}\ \familynamestyle{\familyname} - \ifdefempty{\acadtitle}{}{% - \par\bigskip\acadtitlestyle{\acadtitle}}% - }}{% - \renewcommand*\@headlinecontent{\headlinecontent} - }}{} - \ifdefstring{\headlinetype}{title}{% - \ifdefempty{\headlinecontent}{% -\renewcommand*\@headlinecontent{\headlinestyle{Curriculum Vitae}} - }{% - \renewcommand*\@headlinecontent{\headlinecontent} - }}{} +\ProvideDocumentCommand{\headline}{O{c} m o} +{ + \renewcommand\@headlinealignment{#1} + \renewcommand\@headlinetype{#2} + \renewcommand\@headlinecontent{ + \IfNoValueTF {#3} + { + \ifstrequal{#2}{title}{\par\headlinestyle{Curriculum Vitae}}{} + \ifstrequal{#2}{name}{\par\firstnamestyle{\firstname}\ \familynamestyle{\familyname}\par\bigskip\acadtitlestyle{\acadtitle}}{} + }{\headlinestyle{#3}} +} +} +\providecommand\setheadlinealignment{% + \ifdefstring{\@headlinealignment}{l}{\RaggedRight}{% + \ifdefstring{\@headlinealignment}{r}{\RaggedLeft}{\Centering}} +} +\providecommand\setheadlinetypename{% +\ifdefstring{\@headlinetype}{name}{% + \setheadlinealignment + \headlinestyle{\@headlinecontent} +}{} +} +\providecommand\setheadlinetypetitle{% + \ifdefstring{\@headlinetype}{title}{% + \setheadlinealignment + \headlinestyle{\@headlinecontent} +}{} +} +\providecommand\setheadline{% + \setheadlinetypename + \setheadlinetypetitle } \newif\if@firstdetailselement\@firstdetailselementtrue \providecommand*{\@titledetailsnewline}{ @@ -498,7 +504,7 @@ setkeys=\kvsetkeys% @{}>{\raggedleft\arraybackslash}p{\@hintscolwidth}% @{\hspace{\@sepcolwidth}}p{\@maincolwidth}@{}% }% - \hintstyle{#2} & {#3}% + \hintstyle{#2} & {\@minipagetrue #3}% \end{tabular}\\[#1]% } \providecommand*{\cvdoubleitem}[5][\@afterelementsvspace]{% @@ -578,17 +584,30 @@ setkeys=\kvsetkeys% \href{#2}{\usefontofkomafont{linkfont}#2}}{% \href{#2}{\usefontofkomafont{linkfont}#1}}% } + \providecommand*\croplink{} \providecommand*{\httplink}[2][]{% + \renewcommand\croplink{\StrDel{#2}{http://}} \ifstrempty{#1}{% - \href{http://#2}{\usefontofkomafont{httplinkfont}#2}}{% - \href{http://#2}{\usefontofkomafont{httplinkfont}#1}}% - } + \IfSubStr{#2}{http:}{\href{#2}}{\href{http://#2}}{% + \usefontofkomafont{httplinkfont}\croplink}% + }{% + \IfSubStr{#2}{http:}{\href{#2}}{\href{http://#2}}{% + \usefontofkomafont{httplinkfont}#1}} + } + \providecommand*{\httpslink}[2][]{% + \renewcommand\croplink{\StrDel{#2}{https://}} + \ifstrempty{#1}{% + \IfSubStr{#2}{https:}{\href{#2}}{\href{https://#2}}{% + \usefontofkomafont{httpslinkfont}\croplink}% + }{% + \IfSubStr{#2}{https:}{\href{#2}}{\href{https://#2}}{% + \usefontofkomafont{httpslinkfont}#1}} + } \providecommand*{\emaillink}[2][]{% \ifstrempty{#1}{% \href{mailto:#2}{\usefontofkomafont{emaillinkfont}#2}}{% \href{mailto:#2}{\usefontofkomafont{emaillinkfont}#1}}% } - \hypersetup{ breaklinks, unicode, @@ -617,7 +636,6 @@ setkeys=\kvsetkeys% \providecommand*\pdfsubject{} \providecommand*\pdftitle{} \providecommand*\pdfkeywords{} - \AtEndPreamble{% \providecommand*\@allbordercolors{colortheme} \ifdefempty{\allbordercolors}{}{\renewcommand*\@allbordercolors{\allbordercolors}} @@ -646,7 +664,7 @@ setkeys=\kvsetkeys% \AtBeginDocument{% \raggedbottom } % End AtBeginDocument -\clearscrheadfoot +\clearpairofpagestyles \RequirePackage{komacv-\komacv@style} \endinput %% |