diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/komacv/komacv-casual.sty | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/komacv/komacv-classic.sty | 26 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty | 24 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/komacv/komacv.cls | 79 |
4 files changed, 93 insertions, 59 deletions
diff --git a/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty b/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty index 78e9e35da94..4cb7f603807 100644 --- a/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty +++ b/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty @@ -22,8 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{komacv-casual} - [2017/04/12 v1.1 style package for komacv class] -\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont} + [2017/04/17 v1.1.1 style package for komacv class] \addtokomafont{firstnamefont}{\sffamily\fontsize{38}{40}} \addtokomafont{acadtitlefont}{\sffamily} @@ -56,7 +55,7 @@ \hspace*{\fill}% \parbox{\@footerwidth}{% \centering% - \color{@addresscolor}\usefonttokomafont{addressfont}% + \color{@addresscolor}\usefontofkomafont{addressfont}% \ifdefempty{\addressstreet}{}{% \addtofooter[]{\@addresssymbol\addressstreet}% \ifdefempty{\addresscity}{}{% @@ -71,6 +70,14 @@ \addtofooter{\@emailsymbol\emaillink{\email}}} \ifdefempty{\homepage}{}{% \addtofooter{\@homepagesymbol\httplink{\homepage}}}% + \ifdefempty{\twitter}{}{% + \addtofooter{\@twittersymbol\twitter}}% + \ifdefempty{\github}{}{% + \addtofooter{\@githubsymbol\github}}% + \ifdefempty{\facebook}{}{% + \addtofooter{\@facebooksymbol\facebook}}% + \ifdefempty{\linkedin}{}{% + \addtofooter{\@linkedinsymbol\linkedin}}% \ifdefempty{\extrainfo}{}{% \addtofooter{\extrainfo}}\@flushf% }% Ende parbox @@ -100,14 +107,14 @@ \usebox{\@picbox}% \hspace*{\@titlesepwidth}% \parbox[b]{\@titlenamewidth}{% - \RaggedLeft{\firstnamestyle\firstname}% + \raggedleft{\firstnamestyle\firstname}% ~{\familynamestyle\familyname}\\ - \RaggedLeft\color{@firstnamecolor}\rule{\@titlenamewidth}{.25ex}\par + \raggedleft\color{@firstnamecolor}\rule{\@titlenamewidth}{.25ex}\par }% end parbox \vspace{\@aftertitlevspace} %% optional acadtitle \ifdefempty{\acadtitle}{}{% - \RaggedLeft\acadtitlestyle{\acadtitle}}\\[2.5em]% + \raggedleft\acadtitlestyle{\acadtitle}}\\[2.5em]% %% optional quote \ifdefempty{\cvquote}{}{% {\centering @@ -127,7 +134,7 @@ [ beforeskip=\@beforesecvspace, afterskip=\@aftersecvspace, - font=\color{@seccolor} + font=\color{@seccolor}\sectionfont ]{section} \renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}} @@ -136,7 +143,7 @@ beforeskip=\@beforesecvspace, afterskip=\@aftersecvspace, indent=\dimexpr\@sepcolwidth+\@hintscolwidth, - font={\normalfont\color{@subseccolor}} + font=\color{@subseccolor}\subsectionfont ]{subsection} \endinput %% diff --git a/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty b/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty index e6b4498e450..da066d66084 100644 --- a/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty +++ b/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty @@ -22,8 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{komacv-classic} - [2017/04/12 v1.1 style package for komacv class] -\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont} + [2017/04/17 v1.1.1 style package for komacv class] \addtokomafont{firstnamefont}{\sffamily} \addtokomafont{acadtitlefont}{\sffamily} @@ -58,11 +57,16 @@ \ifundef{\@photoname}{}{% else \ifdefstring{\@photoframe}{frame}{% \setlength{\@titledetailswidth}{\@titledetailswidth-\@photowidth-2\@fboxextra} + \setlength{\@titledetailswidth}{.99\@titledetailswidth} % avoid overfullbox warning }{% else \ifdefstring{\@photoframe}{mframe}{% \setlength{\@titledetailswidth}{\@titledetailswidth-\@mframepicshift}% - }{}% -}% + \setlength{\@titledetailswidth}{.99\@titledetailswidth} % avoid overfullbox warning + }{% picture but no frame + \setlength{\@titledetailswidth}{\@titledetailswidth-\@photowidth} + \setlength{\@titledetailswidth}{.99\@titledetailswidth} % avoid overfullbox warning + } +} }% % name and title \ifdefstring{\headlinetype}{none}{% @@ -82,7 +86,7 @@ \end{minipage}% % optional data \begin{minipage}[b]{\@titledetailswidth}% - \RaggedLeft\addressstyle{% + \raggedleft\addressstyle{% \ifdefempty{\addressstreet}{}{% \@titledetailsnewline% \@addresssymbol\addressstreet% @@ -98,6 +102,14 @@ \@titledetailsnewline\@emailsymbol\emaillink{\email}}% \ifdefempty{\homepage}{}{% \@titledetailsnewline\@homepagesymbol\httplink{\homepage}}% + \ifdefempty{\twitter}{}{% + \@titledetailsnewline\@twittersymbol~\twitter}% + \ifdefempty{\github}{}{% + \@titledetailsnewline\@githubsymbol~\github}% + \ifdefempty{\facebook}{}{% + \@titledetailsnewline\@facebooksymbol~\facebook}% + \ifdefempty{\linkedin}{}{% + \@titledetailsnewline\@linkedinsymbol~\linkedin}% \ifdefempty{\extrainfo}{}{% \@titledetailsnewline\extrainfo}% }% @@ -131,7 +143,7 @@ [ beforeskip=\@beforesecvspace, afterskip=\@aftersecvspace, - font=\color{@seccolor} + font=\color{@seccolor}\sectionfont ]{section} \renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}} @@ -140,7 +152,7 @@ beforeskip=\@beforesecvspace, afterskip=\@aftersecvspace, indent=\dimexpr\@sepcolwidth+\@hintscolwidth, - font={\normalfont\color{@subseccolor}} + font=\color{@subseccolor}\subsectionfont ]{subsection} \endinput %% diff --git a/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty b/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty index ea85fbeeed8..c3159b4ecbd 100644 --- a/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty +++ b/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty @@ -22,15 +22,12 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{komacv-oldstyle} - [2017/04/12 v1.1 style package for komacv class] -\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont} + [2017/04/17 v1.1.1 style package for komacv class] \KOMAoptions{DIV=15} \setlength{\hintscolwidth}{3cm} \addtokomafont{addressfont}{\small} \addtokomafont{hintfont}{\bfseries} -\setkomafont{section}{\Large\bfseries\upshape} -\setkomafont{subsection}{\large\bfseries\itshape} \colorlet{addresscolor}{gray} \renewcommand*{\listitemsymbol}{\labelitemi~} \renewcommand*{\addresssymbol}{} @@ -58,6 +55,14 @@ \@titledetailsnewline\@emailsymbol\emaillink{\email}}% \ifdefempty{\homepage}{}{% \@titledetailsnewline\@homepagesymbol\httplink{\homepage}}% + \ifdefempty{\twitter}{}{% + \@titledetailsnewline\@twittersymbol~\twitter}% + \ifdefempty{\github}{}{% + \@titledetailsnewline\@githubsymbol~\github}% + \ifdefempty{\facebook}{}{% + \@titledetailsnewline\@facebooksymbol~\facebook}% + \ifdefempty{\linkedin}{}{% + \@titledetailsnewline\@linkedinsymbol~\linkedin}% \ifdefempty{\extrainfo}{}{% \@titledetailsnewline\extrainfo}% } % end \@infocontent @@ -67,10 +72,10 @@ \savebox{\@infobox}{% \parbox[b]{\@infocolwidth}{% % put the first line on the same baseline as the first sectiontitle: - {\usefonttokomafont{section} + {\usefontofkomafont{section} \vspace*{1.6ex} } - \RaggedLeft\addressstyle{% + \raggedleft\addressstyle{% \@infocontent% } }% end parbox @@ -136,15 +141,14 @@ [ beforeskip=\@beforesecvspace, afterskip=\@aftersecvspace, - indent=\dimexpr\@sepcolwidth+\@hintscolwidth, - font=\color{@seccolor} + font=\color{@seccolor}\sectionfont ]{section} \RedeclareSectionCommand [ beforeskip=\@beforesecvspace, afterskip=\@aftersecvspace, - font=\color{@subseccolor} + font=\color{@subseccolor}\subsectionfont ]{subsection} \renewcommand*{\cvitem}[3][\@afterelementsvspace]{% \begin{tabular}{% @@ -160,7 +164,7 @@ \begin{minipage}[t]{\@dbitemmaincolwidth}#3\end{minipage}% \hspace*{\@sepcolwidth}% \begin{minipage}[t]{\@hintscolwidth}% - \noindent\RaggedLeft\hintstyle{#2} + \noindent\raggedleft\hintstyle{#2} \end{minipage}% \hspace*{\@sepcolwidth}% \begin{minipage}[t]{\@dbitemmaincolwidth}% diff --git a/Master/texmf-dist/tex/latex/komacv/komacv.cls b/Master/texmf-dist/tex/latex/komacv/komacv.cls index 0fa92a0dbdc..5e7eade0aa7 100644 --- a/Master/texmf-dist/tex/latex/komacv/komacv.cls +++ b/Master/texmf-dist/tex/latex/komacv/komacv.cls @@ -22,8 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{komacv} - [2017/04/12 v1.1 komacv class] -\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont} + [2017/04/17 v1.1.1 komacv class] \providecommand*\mycolor{blue} \RequirePackage{ifthen,kvoptions,calc} @@ -35,10 +34,9 @@ setkeys=\kvsetkeys% \DeclareStringOption[mycolor]{color}[mycolor] \DeclareStringOption[x11names]{xcolor}[x11names] \DeclareStringOption[classic]{style}[classic] -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} +\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessKeyvalOptions{komacv} % evaluate keyval options -\ProcessOptions\relax % execute given options -\LoadClass[a4paper,headings=normal,fontsize=11pt,headinclude,footinclude]{scrartcl} +\LoadClass[a4paper,headings=normal,fontsize=11pt]{scrartcl} \RequirePackage[\komacv@xcolor]{xcolor} \RequirePackage{% etoolbox,% @@ -47,6 +45,7 @@ setkeys=\kvsetkeys% ifxetex,% scrlayer-scrpage,% marvosym,% + fontawesome,% array,% graphicx,% microtype,% @@ -54,6 +53,10 @@ setkeys=\kvsetkeys% hyperref% } \RequirePackage[raggedrightboxes]{ragged2e} + +\AtEndPreamble{% + \renewcommand\familydefault{\sfdefault}% without this, pdflatex produces error messages; WHY? +} \definecolor{myblue}{rgb}{0.2,0.3,0.65} \colorlet{mycolor}{myblue} \AtEndPreamble{% @@ -104,7 +107,7 @@ setkeys=\kvsetkeys% } \newkomafont{headlinefont}{\fontsize{30}{32}\mdseries\upshape} \newkomafont{firstnamefont}{\Huge\mdseries\upshape} -\newkomafont{familynamefont}{\usefonttokomafont{firstnamefont}} +\newkomafont{familynamefont}{\usefontofkomafont{firstnamefont}} \newkomafont{acadtitlefont}{\LARGE\mdseries\itshape} \newkomafont{addressfont}{\normalsize\mdseries\itshape} \newkomafont{quotefont}{\large\itshape} @@ -114,8 +117,10 @@ setkeys=\kvsetkeys% \newkomafont{emaillinkfont}{} \newkomafont{commentmainfont}{\bfseries} % in \cvitemwithcomment \newkomafont{commentfont}{\footnotesize\itshape} % in \cvitemwithcomment -\setkomafont{section}{\Large\sffamily\mdseries\upshape} -\setkomafont{subsection}{\large\sffamily\mdseries\upshape} +\providecommand\sectionfont{\Large\sffamily\mdseries\upshape} +\providecommand\subsectionfont{\large\sffamily\mdseries\upshape} +\setkomafont{section}{\sectionfont} +\setkomafont{subsection}{\subsectionfont} \setlength\parindent{0pt} \setlength\columnsep{10\p@} \setlength\columnseprule{0\p@} @@ -322,7 +327,6 @@ setkeys=\kvsetkeys% \setlength{\@aftersubsecvspace}{\aftersubsecvspace}% } } % end AtEndPreamble -\changes{v1.1}{2017/04/12}{Added macros and symbols for social media} \providecommand*\@addresssymbol{} \providecommand*\addresssymbol{} \providecommand*\@mobilesymbol{\Mobilefone~} @@ -399,6 +403,10 @@ setkeys=\kvsetkeys% \providecommand*{\faxnr}{} \providecommand*{\email}{} \providecommand*{\homepage}{} +\providecommand*{\twitter}{} +\providecommand*{\github}{} +\providecommand*{\facebook}{} +\providecommand*{\linkedin}{} \providecommand*{\extrainfo}{} \providecommand*{\cvquote}{} \newlist{compactitem}{itemize}{3} @@ -456,41 +464,41 @@ setkeys=\kvsetkeys% \renewcommand\maketitle{\csexpandonce{@cvtitle\komacv@style}} \RequirePackage{lastpage} \providecommand*{\totalpagemark}{% page and pagetotal -\usefonttokomafont{pagenumber}\pageref{LastPage}% +\usefontofkomafont{pagenumber}\pageref{LastPage}% } \providecommand*\headlinestyle[1]{{% \usefontofkomafont{headlinefont}% \textcolor{@headlinecolor}{#1}}} \providecommand*{\firstnamestyle}[1]{{% - \usefonttokomafont{firstnamefont}% + \usefontofkomafont{firstnamefont}% \textcolor{@firstnamecolor}{#1}}} \providecommand*{\familynamestyle}[1]{{% - \usefonttokomafont{familynamefont}% + \usefontofkomafont{familynamefont}% \textcolor{@familynamecolor}{#1}}} \providecommand*{\acadtitlestyle}[1]{{% - \usefonttokomafont{acadtitlefont}% + \usefontofkomafont{acadtitlefont}% \textcolor{@acadtitlecolor}{#1}}} \providecommand*{\addressstyle}[1]{{% - \usefonttokomafont{addressfont}% + \usefontofkomafont{addressfont}% \textcolor{@addresscolor}{#1}}} \providecommand*{\quotestyle}[1]{{% - \usefonttokomafont{quotefont}% + \usefontofkomafont{quotefont}% \textcolor{@quotecolor}{#1}}} \providecommand*{\hintstyle}[1]{{% - \usefonttokomafont{hintfont}% + \usefontofkomafont{hintfont}% \textcolor{@hintcolor}{#1}}} \providecommand*{\sectionstyle}[1]{% - \usefonttokomafont{section}% + \usefontofkomafont{section}% \textcolor{@seccolor}{#1}} \providecommand*{\subsectionstyle}[1]{% - \usefonttokomafont{subsection}% + \usefontofkomafont{subsection}% \textcolor{@subseccolor}{#1}} \providecommand*{\cvitem}[3][\@afterelementsvspace]{% \begin{tabular}{% - @{}p{\@hintscolwidth}% + @{}>{\raggedleft\arraybackslash}p{\@hintscolwidth}% @{\hspace{\@sepcolwidth}}p{\@maincolwidth}@{}% }% - \RaggedLeft\hintstyle{#2} &{#3}% + \hintstyle{#2} & {#3}% \end{tabular}\\[#1]% } \providecommand*{\cvdoubleitem}[5][\@afterelementsvspace]{% @@ -498,7 +506,7 @@ setkeys=\kvsetkeys% \begin{minipage}[t]{\@dbitemmaincolwidth}#3\end{minipage}% \hspace*{\@sepcolwidth}% \begin{minipage}[t]{\@hintscolwidth}% - \noindent\RaggedLeft\hintstyle{#4} + \noindent\raggedleft\hintstyle{#4} \end{minipage}% \hspace*{\@sepcolwidth}% \begin{minipage}[t]{\@dbitemmaincolwidth}% @@ -509,7 +517,8 @@ setkeys=\kvsetkeys% \providecommand*{\cvlistitem}[2][\@afterelementsvspace]{% \cvitem[#1]{}{% \@listitemsymbol% - \begin{minipage}[t]{\@listitemmaincolwidth}% + \hfill % + \begin{minipage}[t]{.95\@listitemmaincolwidth}% #2% \end{minipage}% }% @@ -517,13 +526,15 @@ setkeys=\kvsetkeys% \providecommand*{\cvlistdoubleitem}[3][\@afterelementsvspace]{% \cvitem[#1]{}{% \@listitemsymbol% - \begin{minipage}[t]{\@listdbitemmaincolwidth}% + \hfill % + \begin{minipage}[t]{.9\@listdbitemmaincolwidth}% #2% \end{minipage}% - \hspace*{\@sepcolwidth} + \hspace*{.9\@sepcolwidth} \ifstrempty{#3}{}{% \@listitemsymbol% - \begin{minipage}[t]{\@listdbitemmaincolwidth}% + \hfill % + \begin{minipage}[t]{.9\@listdbitemmaincolwidth}% #3% \end{minipage} }% @@ -547,35 +558,35 @@ setkeys=\kvsetkeys% } \newbox{\@commentmainbox} \providecommand*{\cvitemwithcomment}[4][\@afterelementsvspace]{% - \savebox{\@commentmainbox}{{\usefonttokomafont{commentmainfont}#3}}% + \savebox{\@commentmainbox}{{\usefontofkomafont{commentmainfont} #3}}% \settowidth\@commentmainlength{\usebox{\@commentmainbox}}% \setlength{\@commentlength}{% \@maincolwidth-\@sepcolwidth-\@commentmainlength% }% \cvitem[#1]{#2}{% \begin{minipage}[t]{\@commentmainlength}% - \usefonttokomafont{commentmainfont} #3% + \usefontofkomafont{commentmainfont} #3% \end{minipage}% \hfill% \begin{minipage}[t]{\@commentlength}% - \RaggedLeft\usefonttokomafont{commentfont} #4% + \raggedleft\usefontofkomafont{commentfont} #4% \end{minipage}% }% } \providecommand*{\link}[2][]{% \ifstrempty{#1}{% - \href{#2}{\usefonttokomafont{linkfont}#2}}{% - \href{#2}{\usefonttokomafont{linkfont}#1}}% + \href{#2}{\usefontofkomafont{linkfont}#2}}{% + \href{#2}{\usefontofkomafont{linkfont}#1}}% } \providecommand*{\httplink}[2][]{% \ifstrempty{#1}{% - \href{http://#2}{\usefonttokomafont{httplinkfont}#2}}{% - \href{http://#2}{\usefonttokomafont{httplinkfont}#1}}% + \href{http://#2}{\usefontofkomafont{httplinkfont}#2}}{% + \href{http://#2}{\usefontofkomafont{httplinkfont}#1}}% } \providecommand*{\emaillink}[2][]{% \ifstrempty{#1}{% - \href{mailto:#2}{\usefonttokomafont{emaillinkfont}#2}}{% - \href{mailto:#2}{\usefonttokomafont{emaillinkfont}#1}}% + \href{mailto:#2}{\usefontofkomafont{emaillinkfont}#2}}{% + \href{mailto:#2}{\usefontofkomafont{emaillinkfont}#1}}% } \hypersetup{ |