From 8b1eff59ef4e0fa32ff38461e631a55cc747d3b3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Jan 2021 22:31:33 +0000 Subject: moderncv (22jan21) git-svn-id: svn://tug.org/texlive/trunk@57496 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/moderncv/moderncv.cls | 174 +++- .../tex/latex/moderncv/moderncvbodyi.sty | 10 +- .../tex/latex/moderncv/moderncvbodyii.sty | 10 +- .../tex/latex/moderncv/moderncvbodyiii.sty | 27 +- .../tex/latex/moderncv/moderncvbodyiv.sty | 9 +- .../tex/latex/moderncv/moderncvbodyv.sty | 19 +- .../tex/latex/moderncv/moderncvcollection.sty | 4 +- .../tex/latex/moderncv/moderncvcolorblack.sty | 4 +- .../tex/latex/moderncv/moderncvcolorblue.sty | 4 +- .../tex/latex/moderncv/moderncvcolorburgundy.sty | 4 +- .../tex/latex/moderncv/moderncvcolorgreen.sty | 4 +- .../tex/latex/moderncv/moderncvcolorgrey.sty | 4 +- .../tex/latex/moderncv/moderncvcolororange.sty | 4 +- .../tex/latex/moderncv/moderncvcolorpurple.sty | 4 +- .../tex/latex/moderncv/moderncvcolorred.sty | 4 +- .../tex/latex/moderncv/moderncvcompatibility.sty | 7 +- .../tex/latex/moderncv/moderncvdebugtools.sty | 4 +- .../tex/latex/moderncv/moderncvfooti.sty | 8 +- .../tex/latex/moderncv/moderncvheadi.sty | 11 +- .../tex/latex/moderncv/moderncvheadii.sty | 8 +- .../tex/latex/moderncv/moderncvheadiii.sty | 20 +- .../tex/latex/moderncv/moderncvheadiv.sty | 13 +- .../tex/latex/moderncv/moderncvheadv.sty | 10 +- .../tex/latex/moderncv/moderncvheadvi.sty | 6 +- .../tex/latex/moderncv/moderncviconsawesome.sty | 39 +- .../tex/latex/moderncv/moderncviconsletters.sty | 32 +- .../tex/latex/moderncv/moderncviconsmarvosym.sty | 46 +- .../tex/latex/moderncv/moderncvskillmatrix.sty | 1051 ++++++++++++++++++++ .../tex/latex/moderncv/moderncvstylebanking.sty | 11 +- .../tex/latex/moderncv/moderncvstylecasual.sty | 11 +- .../tex/latex/moderncv/moderncvstyleclassic.sty | 11 +- .../tex/latex/moderncv/moderncvstyleempty.sty | 4 +- .../tex/latex/moderncv/moderncvstylefancy.sty | 11 +- .../tex/latex/moderncv/moderncvstyleoldstyle.sty | 4 +- Master/texmf-dist/tex/latex/moderncv/tweaklist.sty | 4 +- 35 files changed, 1418 insertions(+), 178 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty (limited to 'Master/texmf-dist/tex/latex/moderncv') diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index 193f8e2bb6e..2facfcd8d48 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -1,5 +1,5 @@ %% start of file `moderncv.cls'. -%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{moderncv}[2015/07/28 v2.0.0 modern curriculum vitae and letter document class] +\ProvidesClass{moderncv}[2021/01/21 v2.1.0 modern curriculum vitae and letter document class] %------------------------------------------------------------------------------- @@ -95,21 +95,34 @@ \xetexorluatexfalse \fi \fi -% automatic loading of latin modern fonts -%\ifxetexorluatex -% \RequirePackage{fontspec} -% \defaultfontfeatures{Ligatures=TeX} -% \RequirePackage{unicode-math} -% \setmainfont{Latin Modern} -% \setsansfont{Latin Modern Sans} -% \setmathfont{Latin Modern Math} -%\else - \RequirePackage[T1]{fontenc} - \IfFileExists{lmodern.sty}% - {\RequirePackage{lmodern}}% - {} -%\fi +% do not use inputenc and do not automatically load lmodern to avoid problems with German +% charactes, see +% https://tex.stackexchange.com/questions/496630/lualatex-problems-with-german-characters +\ifxetexorluatex +% \RequirePackage{fontspec} +% \defaultfontfeatures{Ligatures=TeX} +% \RequirePackage{unicode-math} +% \setmainfont{Latin Modern} +% \setsansfont{Latin Modern Sans} +% \setmathfont{Latin Modern Math} +% \ifluatex +% \usepackage{luatextra} +% \usepackage{lualatex-math} %loads fontspec +% \usepackage{shellesc} % fix a bug for lualatex shellescape +% \fi +\else + \RequirePackage[utf8]{inputenc} +% \RequirePackage[utf8]{inputenx} +% %additions for utf8 +% \input{ix-utf8enc.dfu} + \RequirePackage[T1]{fontenc} + % loading lmodern can cause issues with certain special characters. avoid. +% \IfFileExists{lmodern.sty}% +% {\RequirePackage{lmodern}}% +% {} +% \fi +\fi % hyper links (hyperref is loaded at the end of the preamble to pass options required by loaded packages such as CJK) \newcommand*\pdfpagemode{UseNone}% do not show thumbnails or bookmarks on opening (on supporting browsers); set \pdfpagemode to "UseOutlines" to show bookmarks \RequirePackage{url} @@ -129,8 +142,8 @@ bookmarksdepth= 2,% to show sections and subsections pdfauthor = {\@firstname{}~\@lastname{}}, pdftitle = {\@firstname{}~\@lastname{}\notblank{\@title}{ -- \@title}{}}, - pdfsubject = {Resum\'{e} of \@firstname{}~\@lastname{}}, - pdfkeywords = {\@firstname{}~\@lastname{}, curriculum vit\ae{}, resum\'{e}}}} + pdfsubject = {R\'{e}sum\'{e} of \@firstname{}~\@lastname{}}, + pdfkeywords = {\@firstname{}~\@lastname{}, curriculum vit\ae{}, r\'{e}sum\'{e}}}} % graphics \RequirePackage{graphicx} @@ -155,13 +168,13 @@ \settowidth{\pagenumberwidth}{\color{color2}\addressfont\itshape\strut\thepage/\pageref{lastpage}}% \fancypagestyle{plain}{% \fancyfoot[r]{\parbox[b]{\pagenumberwidth}{\color{color2}\pagenumberfont\strut\thepage/\pageref{lastpage}}}}% the parbox is required to ensure alignment with a possible center footer (e.g., as in the casual style) - \pagestyle{plain}}{}}% - \AtEndDocument{\label{lastpage}}\else\fi}} + \pagestyle{plain}}{}}\fi}% + \AtEndDocument{\label{lastpage}}} \pagestyle{plain} % reduced list spacing % package providing hooks into lists -% originally developped by Jakob Schiøtz (see http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty) +% originally developped by Jakob Schiotz (see http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty) % modified and distributed with moderncv(not available otherwise on ctan) \RequirePackage{tweaklist} \renewcommand*{\itemhook}{% @@ -191,6 +204,7 @@ % compatibility package with older versions of moderncv \RequirePackageWithOptions{moderncvcompatibility} +\RequirePackage{expl3} %------------------------------------------------------------------------------- % class definition @@ -247,20 +261,39 @@ % usage: \phone[]{} % where should be either "fixed" (default), "mobile" or "fax \collectionnew{phones} -\newcommand*{\phone}[2][fixed]{\collectionadd[#1]{phones}{#2}} +\NewDocumentCommand{\phone}{O{fixed}m}{% + \ifthenelse{\equal{#1}{fax}}% + {\collectionadd[#1]{phones}{#2}} + {\collectionadd[#1]{phones}{\protect\tellink{#2}}} + } + +% http://latex.org/forum/viewtopic.php?t=12239 +\def\SplitMyMacro#1/#2{#2} + + % adds a social link to one's personal information (optional) % usage: \social[][]{} -% where should be either "linkedin", "twitter" or "github" +% where should be either "linkedin", "xing", "twitter", "github", "gitlab", "bitbucket" or "skype" \collectionnew{socials} \NewDocumentCommand{\social}{O{}O{}m}{% \ifthenelse{\equal{#2}{}}% {% - \ifthenelse{\equal{#1}{linkedin}}{\collectionadd[linkedin]{socials}{\protect\httplink[#3]{www.linkedin.com/in/#3}}}{}% - \ifthenelse{\equal{#1}{twitter}} {\collectionadd[twitter]{socials} {\protect\httplink[#3]{www.twitter.com/#3}}} {}% - \ifthenelse{\equal{#1}{github}} {\collectionadd[github]{socials} {\protect\httplink[#3]{www.github.com/#3}}} {}% - } - {\collectionadd[#1]{socials}{\protect\httplink[#3]{#2}}}} + \ifthenelse{\equal{#1}{linkedin}} {\collectionadd[linkedin]{socials} {\protect\httpslink[#3]{www.linkedin.com/in/#3}}} {}% + \ifthenelse{\equal{#1}{xing}} {\collectionadd[xing]{socials} {\protect\httpslink[#3]{www.xing.com/profile/#3}}} {}% + \ifthenelse{\equal{#1}{twitter}} {\collectionadd[twitter]{socials} {\protect\httpslink[#3]{www.twitter.com/#3}}} {}% + \ifthenelse{\equal{#1}{github}} {\collectionadd[github]{socials} {\protect\httpslink[#3]{www.github.com/#3}}} {}% + \ifthenelse{\equal{#1}{gitlab}} {\collectionadd[gitlab]{socials} {\protect\httpslink[#3]{www.gitlab.com/#3}}} {}% + \ifthenelse{\equal{#1}{stackoverflow}}{\collectionadd[stackoverflow]{socials}{\protect\httpslink[#3]{stackoverflow.com/users/#3}}} {}% + \ifthenelse{\equal{#1}{bitbucket}} {\collectionadd[bitbucket]{socials} {\protect\httpslink[#3]{www.bitbucket.org/#3}}} {}% + \ifthenelse{\equal{#1}{skype}} {\collectionadd[skype]{socials} {#3}} {}% + \ifthenelse{\equal{#1}{orcid}} {\collectionadd[orcid]{socials} {\protect\httpslink[#3]{orcid.org/#3}}} {}% + \ifthenelse{\equal{#1}{researchgate}} {\collectionadd[researchgate]{socials} {\protect\httpslink[#3]{www.researchgate.net/profile/#3}}} {}% + \ifthenelse{\equal{#1}{researcherid}} {\collectionadd[researcherid]{socials} {\protect\httpslink[#3]{www.researcherid.com/rid/#3}}} {}% + \ifthenelse{\equal{#1}{telegram}} {\collectionadd[telegram]{socials} {\protect\httpslink[#3]{t.me/#3}}} {}% + \ifthenelse{\equal{#1}{googlescholar}}{\collectionadd[googlescholar]{socials}{\protect\httpslink[#3]{scholar.google.com/citations?user=#3}}} {}% {}% + } + {\collectionadd[#1]{socials}{\protect\httpslink[#3]{#2}}}} % defines additional personal information (optional) % usage: \extrainfo{} @@ -288,16 +321,26 @@ \renewcommand{\theenumiv} {\@Alph\c@enumiv} % other symbols -\newcommand*{\listitemsymbol} {\labelitemi~} -\newcommand*{\addresssymbol} {} -\newcommand*{\mobilephonesymbol} {} -\newcommand*{\fixedphonesymbol} {} -\newcommand*{\faxphonesymbol} {} -\newcommand*{\emailsymbol} {} -\newcommand*{\homepagesymbol} {} -\newcommand*{\linkedinsocialsymbol}{} -\newcommand*{\twittersocialsymbol} {} -\newcommand*{\githubsocialsymbol} {} +\newcommand*{\listitemsymbol} {\labelitemi~} +\newcommand*{\addresssymbol} {} +\newcommand*{\mobilephonesymbol} {} +\newcommand*{\fixedphonesymbol} {} +\newcommand*{\faxphonesymbol} {} +\newcommand*{\emailsymbol} {} +\newcommand*{\homepagesymbol} {} +\newcommand*{\linkedinsocialsymbol} {} +\newcommand*{\xingsocialsymbol} {} +\newcommand*{\twittersocialsymbol} {} +\newcommand*{\githubsocialsymbol} {} +\newcommand*{\gitlabsocialsymbol} {} +\newcommand*{\stackoverflowsocialsymbol}{} +\newcommand*{\bitbucketsocialsymbol} {} +\newcommand*{\skypesocialsymbol} {} +\newcommand*{\orcidsocialsymbol} {} +\newcommand*{\researchgatesocialsymbol} {} +\newcommand*{\researchidsocialsymbol} {} +\newcommand*{\googlescholarsocialsymbol}{} +\newcommand*{\telegramsocialsymbol} {} % other %------ @@ -312,34 +355,39 @@ % usage: \makefooter \newcommand*{\makefooter}{}% +\newcommand*{\@loadmoderncvpackage}[3][]{% + \begingroup\edef\x{\endgroup% + \noexpand\RequirePackage[#1]{moderncv#2\ifcase#3\or i\or ii\or iii\or iv\or v\or vi\or vii\or viii\or ix\or x\fi}% + }\x} + % loads a style variant (a combination of header, body and footer) % usage: \moderncvstyle{