From 551b21743067d6b09c090119a0a820ad47dda8ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 Mar 2020 21:32:00 +0000 Subject: limecv (15mar20) git-svn-id: svn://tug.org/texlive/trunk@54329 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/limecv/README.md | 1 - .../doc/latex/limecv/examples/mwe-latex.pdf | Bin 112373 -> 138929 bytes .../doc/latex/limecv/examples/mwe-lualatex.pdf | Bin 41474 -> 42544 bytes .../doc/latex/limecv/examples/mwe-xelatex.pdf | Bin 42445 -> 43259 bytes Master/texmf-dist/doc/latex/limecv/limecv.pdf | Bin 205852 -> 207251 bytes Master/texmf-dist/source/latex/limecv/limecv.dtx | 49 ++++++++++++--------- Master/texmf-dist/tex/latex/limecv/limecv.cls | 27 ++++++------ 7 files changed, 43 insertions(+), 34 deletions(-) diff --git a/Master/texmf-dist/doc/latex/limecv/README.md b/Master/texmf-dist/doc/latex/limecv/README.md index 7f6d8dcb43d..f7043a60b8a 100644 --- a/Master/texmf-dist/doc/latex/limecv/README.md +++ b/Master/texmf-dist/doc/latex/limecv/README.md @@ -47,4 +47,3 @@ Default profile picture courtesy of Twitter. [blog]: https://olivierpieters.be/blog/archive/tag/limecv [FA]: http://fontawesome.io [fira]: https://github.com/mozilla/Fira -[docs]: http://ctan.org/tex-archive/macros/generic/limecv/limecv.pdf diff --git a/Master/texmf-dist/doc/latex/limecv/examples/mwe-latex.pdf b/Master/texmf-dist/doc/latex/limecv/examples/mwe-latex.pdf index 5c713461d11..d23fb38b778 100644 Binary files a/Master/texmf-dist/doc/latex/limecv/examples/mwe-latex.pdf and b/Master/texmf-dist/doc/latex/limecv/examples/mwe-latex.pdf differ diff --git a/Master/texmf-dist/doc/latex/limecv/examples/mwe-lualatex.pdf b/Master/texmf-dist/doc/latex/limecv/examples/mwe-lualatex.pdf index 2c45a52ba2b..a5d151f860c 100644 Binary files a/Master/texmf-dist/doc/latex/limecv/examples/mwe-lualatex.pdf and b/Master/texmf-dist/doc/latex/limecv/examples/mwe-lualatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/limecv/examples/mwe-xelatex.pdf b/Master/texmf-dist/doc/latex/limecv/examples/mwe-xelatex.pdf index 9f8a7415ead..cfe03916755 100644 Binary files a/Master/texmf-dist/doc/latex/limecv/examples/mwe-xelatex.pdf and b/Master/texmf-dist/doc/latex/limecv/examples/mwe-xelatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/limecv/limecv.pdf b/Master/texmf-dist/doc/latex/limecv/limecv.pdf index 3f9abc70690..c88b31ac720 100644 Binary files a/Master/texmf-dist/doc/latex/limecv/limecv.pdf and b/Master/texmf-dist/doc/latex/limecv/limecv.pdf differ diff --git a/Master/texmf-dist/source/latex/limecv/limecv.dtx b/Master/texmf-dist/source/latex/limecv/limecv.dtx index ade6d1febc5..99600b830cd 100644 --- a/Master/texmf-dist/source/latex/limecv/limecv.dtx +++ b/Master/texmf-dist/source/latex/limecv/limecv.dtx @@ -26,7 +26,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{limecv} %<*class> - [2020/02/08 v0.1.7 limecv Document class for CVs.] + [2020/03/15 v0.1.8 limecv Document class for CVs.] % % %<*driver> @@ -69,7 +69,7 @@ % % \fi % -% \CheckSum{1630} +% \CheckSum{1632} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -97,13 +97,14 @@ % \changes{v0.1.5}{2018/06/05}{Custom contact fields.} % \changes{v0.1.6}{2018/06/17}{Added support for French.} % \changes{v0.1.7}{2020/02/08}{Added support for Italian.} +% \changes{v0.1.8}{2020/03/15}{Upgrade to Font Awesome 5.} % % \DoNotIndex{\NewDocumentCommand,\NewDocumentEnvironment} % % \providecommand*{\url}{\texttt} % -% \def\fileversion{v0.1.3} -% \def\filedate{2017/11/25} +% \def\fileversion{v0.1.8} +% \def\filedate{2020/03/15} % % \GetFileInfo{limecv.dtx} % \title{The \textsf{limecv} document class\thanks{This document corresponds % @@ -163,10 +164,10 @@ % and |\cvMainFont| command. The mono spaced font can be changed by means of % the |monofont| class option. % -% \cvRequirement{FontAwesome}\footnote{\url{http://fontawesome.io}} is the +% \cvRequirement{FontAwesome5}\footnote{\url{http://fontawesome.io}} is the % icon font used. This font should also be available and cannot be replaced by % another icon font. Most modern TeX distributions ship with this font since -% they provide the |fontawesome| package. +% they provide the |fontawesome5| package. % % \section{General Macros and Document Class Options} % @@ -968,6 +969,7 @@ Dear Miss.\ Smith \definecolor{cvRed}{HTML}{7f2d35} \definecolor{cvDark}{HTML}{2F3142} \definecolor{cvAccent}{HTML}{474A65} +\definecolor{cvBackground}{HTML}{FFFFFF} % \end{macrocode} % % \subsection{New Column Types} @@ -1139,7 +1141,7 @@ Dear Miss.\ Smith minimum width=\cvProgressAreaWidth, minimum height=\cvProgressAreaHeight, rectangle, - draw, + draw=cvBackground, cvGreen, progressArea }, @@ -1175,7 +1177,7 @@ Dear Miss.\ Smith % \begin{macrocode} \NewDocumentCommand{\cv@loadFonts}{}{ \RequirePackage{fontspec} - \RequirePackage{fontawesome} + \RequirePackage{fontawesome5} % \end{macrocode} % % Load the fonts. By default Fira will be loaded, but this can be overwritten @@ -1193,13 +1195,13 @@ Dear Miss.\ Smith % \begin{macrocode} \ifcv@fontPath \newfontfamily{\cv@FA}[Path=\limecv@path]% - {FontAwesome} + {Font Awesome 5 Free} \else - \newfontfamily{\cv@FA}{FontAwesome} + \newfontfamily{\cv@FA}{Font Awesome 5 Free} \fi % \end{macrocode} % -% The |fontawesome| package does not feature all of the latest icons available, +% The |fontawesome5| package does not feature all of the latest icons available, % so we define some of the manually since they are relevant for this CV. % % \begin{macro}{\faAddressCard} @@ -1221,7 +1223,7 @@ Dear Miss.\ Smith % \end{macrocode} % \end{macro} % -% In the future, the |fontawesome| dependency can be dropped if a manually coded +% In the future, the |fontawesome5| dependency can be dropped if a manually coded % icon is included, such as those defined in monderncv. Example: % \url{https://raw.githubusercontent.com/xdanaux/moderncv/% % master/moderncviconsmarvosym.sty} @@ -1240,7 +1242,7 @@ Dear Miss.\ Smith \ifluatex \cv@loadFonts \else - \RequirePackage{fontawesome} + \RequirePackage{fontawesome5} \RenewDocumentCommand{\familydefault}{}{\sfdefault} \fi \fi @@ -1397,7 +1399,7 @@ Dear Miss.\ Smith \newlength\cvSkillSep \setlength\cvSkillSep{1ex} \newlength\cvHeaderIconWidth -\setlength\cvHeaderIconWidth{0pt} +\setlength\cvHeaderIconWidth{10pt} % \end{macrocode} % % @@ -1416,10 +1418,10 @@ Dear Miss.\ Smith \NewDocumentCommand{\cvSkill}{m}{% \begingroup \my@repeat@count=\z@ - \@whilenum\my@repeat@count<#1\do{\faCircle\advance% + \@whilenum\my@repeat@count<#1\do{\faCircle[solid]\advance% \my@repeat@count\@ne}% \my@repeat@count=\numexpr5-\z@\relax - \@whilenum\my@repeat@count>#1\do{\faCircleO\advance% + \@whilenum\my@repeat@count>#1\do{\faCircle[regular]\advance% \my@repeat@count\m@ne}% \endgroup } @@ -1449,8 +1451,15 @@ Dear Miss.\ Smith % \begin{macrocode} \NewDocumentCommand{\cv@Title}{mm}{% \ifnodedefined{cv@last item \the\value{cv@lastItem}}{% - \setlength\cvHeaderIconWidth{% - \maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}% + \setlength\cvHeaderIconWidth\cvHeaderIconWidth%{% + %\maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}% +% \end{macrocode} +% +% \changes{v0.1.8}{2020/03/15}{For now, the |widthof| macro is not used +% anymore since there is an issue with the latest version of Font Awesome 5 +% (5.7.0).} +% +% \begin{macrocode} \protected@write\@auxout{}{\global\cvHeaderIconWidth=\the\cvHeaderIconWidth} \node[% below=\cvSectionSep of cv@last item % @@ -1858,7 +1867,7 @@ Dear Miss.\ Smith % % \begin{macrocode} \NewDocumentEnvironment{cvPublications}{}{% -\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaperO} +\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaper} % \end{macrocode} % insures uniqueness % \begin{macrocode} @@ -2176,7 +2185,7 @@ Dear Miss.\ Smith \cv@ContactTemplateLink{\cvContactWebsite}{\faGlobe} \cv@ContactTemplateLink{\cvContactGithub}{\faGithub} \cv@ContactTemplateLink{\cvContactGitlab}{\faGitlab} - \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedinSquare} + \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedin} \cv@ContactTemplateLink{\cvContactTwitter}{\faTwitter} \cv@ContactTemplateLink{\cvContactKeybase}{\faKey} \begin{tikzpicture}[% diff --git a/Master/texmf-dist/tex/latex/limecv/limecv.cls b/Master/texmf-dist/tex/latex/limecv/limecv.cls index f162d523585..8d6fdc0323d 100644 --- a/Master/texmf-dist/tex/latex/limecv/limecv.cls +++ b/Master/texmf-dist/tex/latex/limecv/limecv.cls @@ -20,7 +20,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{limecv} - [2020/02/08 v0.1.7 limecv Document class for CVs.] + [2020/03/15 v0.1.8 limecv Document class for CVs.] \RequirePackage{kvoptions} \DeclareBoolOption[false]{print} @@ -52,6 +52,7 @@ \definecolor{cvRed}{HTML}{7f2d35} \definecolor{cvDark}{HTML}{2F3142} \definecolor{cvAccent}{HTML}{474A65} +\definecolor{cvBackground}{HTML}{FFFFFF} \newcolumntype{L}[1]{>{\raggedright\let\newline\\% \arraybackslash\hspace{0pt}}m{#1}} \newcolumntype{C}[1]{>{\centering\let\newline\\% @@ -147,7 +148,7 @@ minimum width=\cvProgressAreaWidth, minimum height=\cvProgressAreaHeight, rectangle, - draw, + draw=cvBackground, cvGreen, progressArea }, @@ -173,15 +174,15 @@ } \NewDocumentCommand{\cv@loadFonts}{}{ \RequirePackage{fontspec} - \RequirePackage{fontawesome} + \RequirePackage{fontawesome5} \setmainfont[Numbers={Monospaced}]{\limecv@sansfont} \setsansfont{\limecv@sansfont} \setmonofont{\limecv@monofont} \ifcv@fontPath \newfontfamily{\cv@FA}[Path=\limecv@path]% - {FontAwesome} + {Font Awesome 5 Free} \else - \newfontfamily{\cv@FA}{FontAwesome} + \newfontfamily{\cv@FA}{Font Awesome 5 Free} \fi \ProvideDocumentCommand{\faAddressCard}{}{{\cv@FA% \symbol{"F2B9}}} @@ -196,7 +197,7 @@ \ifluatex \cv@loadFonts \else - \RequirePackage{fontawesome} + \RequirePackage{fontawesome5} \RenewDocumentCommand{\familydefault}{}{\sfdefault} \fi \fi @@ -278,16 +279,16 @@ \newlength\cvSkillSep \setlength\cvSkillSep{1ex} \newlength\cvHeaderIconWidth -\setlength\cvHeaderIconWidth{0pt} +\setlength\cvHeaderIconWidth{10pt} \NewDocumentCommand{\cvSection}{m}{\Large\textbf{#1}} \newcount\my@repeat@count \NewDocumentCommand{\cvSkill}{m}{% \begingroup \my@repeat@count=\z@ - \@whilenum\my@repeat@count<#1\do{\faCircle\advance% + \@whilenum\my@repeat@count<#1\do{\faCircle[solid]\advance% \my@repeat@count\@ne}% \my@repeat@count=\numexpr5-\z@\relax - \@whilenum\my@repeat@count>#1\do{\faCircleO\advance% + \@whilenum\my@repeat@count>#1\do{\faCircle[regular]\advance% \my@repeat@count\m@ne}% \endgroup } @@ -302,8 +303,8 @@ \setcounter{cv@titleNext}{1} \NewDocumentCommand{\cv@Title}{mm}{% \ifnodedefined{cv@last item \the\value{cv@lastItem}}{% - \setlength\cvHeaderIconWidth{% - \maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}% + \setlength\cvHeaderIconWidth\cvHeaderIconWidth%{% + %\maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}% \protected@write\@auxout{}{\global\cvHeaderIconWidth=\the\cvHeaderIconWidth} \node[% below=\cvSectionSep of cv@last item % @@ -604,7 +605,7 @@ (cv@last item \the\value{cv@lastItem}) {}; } \NewDocumentEnvironment{cvPublications}{}{% -\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaperO} +\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaper} \stepcounter{cv@itemPrev} \stepcounter{cv@itemNext} \cv@definecvItem @@ -825,7 +826,7 @@ \cv@ContactTemplateLink{\cvContactWebsite}{\faGlobe} \cv@ContactTemplateLink{\cvContactGithub}{\faGithub} \cv@ContactTemplateLink{\cvContactGitlab}{\faGitlab} - \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedinSquare} + \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedin} \cv@ContactTemplateLink{\cvContactTwitter}{\faTwitter} \cv@ContactTemplateLink{\cvContactKeybase}{\faKey} \begin{tikzpicture}[% -- cgit v1.2.3