Merged 'master'.

# conflict in awesome-cv.cls
This commit is contained in:
Amin Khan 2016-05-07 15:31:36 +01:00
commit 719209c232
13 changed files with 92 additions and 79 deletions

4
.gitignore vendored
View file

@ -18,3 +18,7 @@
.*sw[op] .*sw[op]
*~ *~
### Mac OS X ###
## Mac OS X metadata files:
*.DS_Store

View file

@ -21,7 +21,7 @@
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% Identification % Identification
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
\ProvidesClass{awesome-cv}[2016/01/09 v1.4 Awesome Curriculum Vitae Class] \ProvidesClass{awesome-cv}[2016/01/30 v1.5 Awesome Curriculum Vitae Class]
\NeedsTeXFormat{LaTeX2e} \NeedsTeXFormat{LaTeX2e}
@ -144,21 +144,13 @@
\definecolor{awesome-darknight}{HTML}{131A28} \definecolor{awesome-darknight}{HTML}{131A28}
\colorlet{awesome}{awesome-red} \colorlet{awesome}{awesome-red}
% Boolean value to switch section color highlighting
\newbool{acvSectionColorHighlight}
\setbool{acvSectionColorHighlight}{true}
% Awesome section color % Awesome section color
\newcounter{colorCounter}
\def\@sectioncolor#1#2#3{% \def\@sectioncolor#1#2#3{%
{% \ifbool{acvSectionColorHighlight}{{\color{awesome}#1#2#3}}{#1#2#3}%
\color{%
\ifcase\value{colorCounter}%
awesome\or%
awesome\or%
awesome\or%
awesome\or%
awesome\else%
awesome\fi%
} #1#2#3%
}%
\stepcounter{colorCounter}%
} }
@ -207,7 +199,7 @@
BoldItalicFont=*-SemiboldIt BoldItalicFont=*-SemiboldIt
]{SourceSansPro} ]{SourceSansPro}
% Set main font, same as for body (default is Source Sans Pro) % Set main font
\setmainfont[ \setmainfont[
Path=\@fontdir, Path=\@fontdir,
UprightFont=*-Regular, UprightFont=*-Regular,
@ -216,6 +208,7 @@
BoldItalicFont=*-BoldIt BoldItalicFont=*-BoldIt
]{SourceSansPro} ]{SourceSansPro}
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% Configuration for styles % Configuration for styles
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
@ -230,7 +223,7 @@
\newcommand*{\footerstyle}[1]{{\fontsize{8pt}{1em}\footerfont\scshape\color{lighttext} #1}} \newcommand*{\footerstyle}[1]{{\fontsize{8pt}{1em}\footerfont\scshape\color{lighttext} #1}}
\newcommand*{\sectionstyle}[1]{{\fontsize{16pt}{1em}\bodyfont\bfseries\color{text}\@sectioncolor #1}} \newcommand*{\sectionstyle}[1]{{\fontsize{16pt}{1em}\bodyfont\bfseries\color{text}\@sectioncolor #1}}
\newcommand*{\subsectionstyle}[1]{{\fontsize{12pt}{1em}\bodyfont\scshape\textcolor{text}{#1}}} \newcommand*{\subsectionstyle}[1]{{\fontsize{12pt}{1em}\bodyfont\scshape\textcolor{text}{#1}}}
\newcommand*{\paragraphstyle}{\fontsize{9pt}{1em}\bodyfontlight\upshape\color{graytext}} \newcommand*{\paragraphstyle}{\fontsize{9pt}{1em}\bodyfontlight\upshape\color{text}}
% For elements of entry % For elements of entry
\newcommand*{\entrytitlestyle}[1]{{\fontsize{10pt}{1em}\bodyfont\bfseries\color{darktext} #1}} \newcommand*{\entrytitlestyle}[1]{{\fontsize{10pt}{1em}\bodyfont\bfseries\color{darktext} #1}}
@ -315,7 +308,6 @@
% Usage: \linkedin{<linked-in-nick>} % Usage: \linkedin{<linked-in-nick>}
\newcommand*{\linkedin}[1]{\def\@linkedin{#1}} \newcommand*{\linkedin}[1]{\def\@linkedin{#1}}
% Defines writer's twitter (optional)
% Usage: \twitter{<twitter handle>} % Usage: \twitter{<twitter handle>}
\newcommand*{\twitter}[1]{\def\@twitter{#1}} \newcommand*{\twitter}[1]{\def\@twitter{#1}}
@ -323,6 +315,15 @@
% Usage: \skype{<skype account>} % Usage: \skype{<skype account>}
\newcommand*{\skype}[1]{\def\@skype{#1}} \newcommand*{\skype}[1]{\def\@skype{#1}}
% Defines writer's reddit (optional)
% Usage: \reddit{<reddit account>}
\newcommand*{\reddit}[1]{\def\@reddit{#1}}
% Defines writer's xing (optional)
% Usage: \xing{<xing name>}
\newcommand*{\xing}[1]{\def\@xing{#1}}
% Defines writer's twitter (optional)
% Defines writer's extra informations (optional) % Defines writer's extra informations (optional)
% Usage: \extrainfo{<extra informations>} % Usage: \extrainfo{<extra informations>}
\newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}} \newcommand*{\extrainfo}[1]{\def\@extrainfo{#1}}
@ -368,7 +369,8 @@
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% Commands for extra % Commands for extra
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% Define helper macros a user can change easily in header %% Define helper macros a user can change easily
% Header
\newcommand{\acvHeaderNameDelim}{\space} \newcommand{\acvHeaderNameDelim}{\space}
\newcommand{\acvHeaderAfterNameSkip}{.4mm} \newcommand{\acvHeaderAfterNameSkip}{.4mm}
\newcommand{\acvHeaderAfterPositionSkip}{.4mm} \newcommand{\acvHeaderAfterPositionSkip}{.4mm}
@ -378,6 +380,11 @@
\newcommand{\acvHeaderAfterSocialSkip}{6mm} \newcommand{\acvHeaderAfterSocialSkip}{6mm}
\newcommand{\acvHeaderAfterQuoteSkip}{5mm} \newcommand{\acvHeaderAfterQuoteSkip}{5mm}
% Others
\newcommand{\acvSectionTopSkip}{3mm}
\newcommand{\acvSectionContentTopSkip}{2.5mm}
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% Commands for utilities % Commands for utilities
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
@ -416,81 +423,61 @@
\ifthenelse{\isundefined{\@email}}% \ifthenelse{\isundefined{\@email}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false}%
}%
{\acvHeaderSocialSep}%
\href{mailto:\@email}{\faEnvelope\acvHeaderIconSep\@email}% \href{mailto:\@email}{\faEnvelope\acvHeaderIconSep\@email}%
}% }%
\ifthenelse{\isundefined{\@homepage}}% \ifthenelse{\isundefined{\@homepage}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false}%
}%
{\acvHeaderSocialSep}%
\href{http://\@homepage}{\faHome\acvHeaderIconSep\@homepage}% \href{http://\@homepage}{\faHome\acvHeaderIconSep\@homepage}%
}% }%
\ifthenelse{\isundefined{\@github}}% \ifthenelse{\isundefined{\@github}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false}%
}%
{\acvHeaderSocialSep}%
\href{https://github.com/\@github}{\faGithubSquare\acvHeaderIconSep\@github}% \href{https://github.com/\@github}{\faGithubSquare\acvHeaderIconSep\@github}%
}% }%
\ifthenelse{\isundefined{\@stackoverflowid}}% \ifthenelse{\isundefined{\@stackoverflowid}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false} %
}%
{\acvHeaderSocialSep}%
\href{https://stackoverflow.com/users/\@stackoverflowid}{\faStackOverflow\acvHeaderIconSep\@stackoverflowname}% \href{https://stackoverflow.com/users/\@stackoverflowid}{\faStackOverflow\acvHeaderIconSep\@stackoverflowname}%
}% }%
\ifthenelse{\isundefined{\@linkedin}}% \ifthenelse{\isundefined{\@linkedin}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false}%
}%
{\acvHeaderSocialSep}%
\href{https://www.linkedin.com/in/\@linkedin}{\faLinkedinSquare\acvHeaderIconSep\@linkedin}% \href{https://www.linkedin.com/in/\@linkedin}{\faLinkedinSquare\acvHeaderIconSep\@linkedin}%
}% }%
\ifthenelse{\isundefined{\@twitter}}% \ifthenelse{\isundefined{\@twitter}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false} %
}%
{\acvHeaderSocialSep}%
\href{https://twitter.com/\@twitter}{\faTwitter\acvHeaderIconSep\@twitter}% \href{https://twitter.com/\@twitter}{\faTwitter\acvHeaderIconSep\@twitter}%
}% }%
\ifthenelse{\isundefined{\@skype}}% \ifthenelse{\isundefined{\@skype}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false} %
}%
{\acvHeaderSocialSep}%
\faSkype\acvHeaderIconSep\@skype% \faSkype\acvHeaderIconSep\@skype%
}% }%
\ifthenelse{\isundefined{\@reddit}}%
{}%
{%
\ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
\href{https://www.reddit.com/user/\@reddit}{\faReddit\acvHeaderIconSep\@reddit}%
}%
\ifthenelse{\isundefined{\@xing}}%
{}%
{%
\ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
\href{https://www.xing.com/profile/\@xing}{\faXingSquare\acvHeaderIconSep\@xing}
}%
\ifthenelse{\isundefined{\@extrainfo}}% \ifthenelse{\isundefined{\@extrainfo}}%
{}% {}%
{% {%
\ifbool{isstart}% \ifbool{isstart}{\setbool{isstart}{false}}{\acvHeaderSocialSep}%
{%
\setbool{istart}{false} %
}%
{\acvHeaderSocialSep}%
\@extrainfo% \@extrainfo%
}% }%
} \\[\acvHeaderAfterSocialSkip]% } \\[\acvHeaderAfterSocialSkip]%
@ -512,31 +499,34 @@
% Define a section for CV % Define a section for CV
% Usage: \cvsection{<section-title>} % Usage: \cvsection{<section-title>}
\newcommand{\cvsection}[1]{% \newcommand{\cvsection}[1]{%
\par\addvspace{1.5ex} \vspace{\acvSectionTopSkip}
\phantomsection{}
\sectionstyle{#1} \sectionstyle{#1}
\phantomsection
\color{gray}\vhrulefill{0.9pt} \color{gray}\vhrulefill{0.9pt}
\par\nobreak\addvspace{1ex}
} }
% Define a subsection for CV % Define a subsection for CV
% Usage: \cvsubsection{<subsection-title>} % Usage: \cvsubsection{<subsection-title>}
\newcommand{\cvsubsection}[1]{% \newcommand{\cvsubsection}[1]{%
\phantomsection{} \vspace{\acvSectionContentTopSkip}
\vspace{-3mm}
\subsectionstyle{#1} \subsectionstyle{#1}
\phantomsection
} }
% Define a paragraph for CV % Define a paragraph for CV
\newenvironment{cvparagraph}{% \newenvironment{cvparagraph}{%
\vspace{\acvSectionContentTopSkip}
\vspace{-3mm} \vspace{-3mm}
\paragraphstyle \paragraphstyle
}{% }{%
\vspace{1mm} \par
\vspace{2mm}
} }
% Define an environment for cventry % Define an environment for cventry
\newenvironment{cventries}{% \newenvironment{cventries}{%
\vspace{\acvSectionContentTopSkip}
\begin{center} \begin{center}
}{% }{%
\end{center} \end{center}
@ -544,6 +534,7 @@
% Define an entry of cv information % Define an entry of cv information
% Usage: \cventry{<position>}{<title>}{<location>}{<date>}{<description>} % Usage: \cventry{<position>}{<title>}{<location>}{<date>}{<description>}
\newcommand*{\cventry}[5]{% \newcommand*{\cventry}[5]{%
\vspace{-2.0mm}
\setlength\tabcolsep{0pt} \setlength\tabcolsep{0pt}
\setlength{\extrarowheight}{0pt} \setlength{\extrarowheight}{0pt}
\begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}} \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}} L{\textwidth - 4.5cm} R{4.5cm}}
@ -551,8 +542,8 @@
{\entrypositionstyle{#1} & \entrydatestyle{#4} \\} {\entrypositionstyle{#1} & \entrydatestyle{#4} \\}
{\entrytitlestyle{#2} & \entrylocationstyle{#3} \\ {\entrytitlestyle{#2} & \entrylocationstyle{#3} \\
\entrypositionstyle{#1} & \entrydatestyle{#4} \\} \entrypositionstyle{#1} & \entrydatestyle{#4} \\}
\multicolumn{2}{L{\textwidth}}{\descriptionstyle{#5}} \\ \multicolumn{2}{L{\textwidth}}{\descriptionstyle{#5}}
\end{tabular*} \end{tabular*}%
} }
% Define an environment for cvsubentry % Define an environment for cvsubentry
@ -581,6 +572,8 @@
% Define an environment for cvhonor % Define an environment for cvhonor
\newenvironment{cvhonors}{% \newenvironment{cvhonors}{%
\vspace{\acvSectionContentTopSkip}
\vspace{-2mm}
\begin{center} \begin{center}
\setlength\tabcolsep{0pt} \setlength\tabcolsep{0pt}
\setlength{\extrarowheight}{0pt} \setlength{\extrarowheight}{0pt}
@ -597,6 +590,8 @@
% Define an environment for cvskill % Define an environment for cvskill
\newenvironment{cvskills}{% \newenvironment{cvskills}{%
\vspace{\acvSectionContentTopSkip}
\vspace{-2.0mm}
\begin{center} \begin{center}
\setlength\tabcolsep{1ex} \setlength\tabcolsep{1ex}
\setlength{\extrarowheight}{0pt} \setlength{\extrarowheight}{0pt}
@ -613,7 +608,7 @@
% Define an environment for cvitems(for cventry) % Define an environment for cvitems(for cventry)
\newenvironment{cvitems}{% \newenvironment{cvitems}{%
\vspace{-4mm} \vspace{-4.0mm}
\begin{justify} \begin{justify}
\begin{itemize}[leftmargin=2ex, nosep, noitemsep] \begin{itemize}[leftmargin=2ex, nosep, noitemsep]
\setlength{\parskip}{0pt} \setlength{\parskip}{0pt}
@ -621,7 +616,7 @@
}{% }{%
\end{itemize} \end{itemize}
\end{justify} \end{justify}
\vspace{-2mm} \vspace{-4.0mm}
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

View file

@ -40,6 +40,9 @@
% \definecolor{graytext}{HTML}{5D5D5D} % \definecolor{graytext}{HTML}{5D5D5D}
% \definecolor{lighttext}{HTML}{999999} % \definecolor{lighttext}{HTML}{999999}
% Set false if you don't want to highlight section with awesome color
\setbool{acvSectionColorHighlight}{true}
% If you would like to change the social information separator from a pipe (|) to something else % If you would like to change the social information separator from a pipe (|) to something else
\renewcommand{\acvHeaderSocialSep}{\quad\textbar\quad} \renewcommand{\acvHeaderSocialSep}{\quad\textbar\quad}
@ -57,12 +60,13 @@
\homepage{www.posquit0.com} \homepage{www.posquit0.com}
\github{posquit0} \github{posquit0}
\linkedin{posquit0} \linkedin{posquit0}
% \stackoverflow{SOid}{SOname} % \stackoverflow{SO-id}{SO-name}
% \twitter{@twit} % \twitter{@twit}
% \skype{skypeid} % \skype{skype-id}
% \reddit{reddit-id}
% \extrainfo{extra informations} % \extrainfo{extra informations}
\quote{``Make the change that you want to see in the world."} \quote{``Must be the change that you want to see in the world."}
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------

Binary file not shown.

View file

@ -21,7 +21,7 @@
\documentclass[11pt, a4paper]{awesome-cv} \documentclass[11pt, a4paper]{awesome-cv}
% Configure page margins with geometry % Configure page margins with geometry
% \geometry{left=1.4cm, top=.8cm, right=1.4cm, bottom=1.8cm, footskip=.5cm} \geometry{left=1.4cm, top=.8cm, right=1.4cm, bottom=1.8cm, footskip=.5cm}
% Specify the location of the included fonts % Specify the location of the included fonts
\fontdir[fonts/] \fontdir[fonts/]
@ -40,6 +40,9 @@
% \definecolor{graytext}{HTML}{5D5D5D} % \definecolor{graytext}{HTML}{5D5D5D}
% \definecolor{lighttext}{HTML}{999999} % \definecolor{lighttext}{HTML}{999999}
% Set false if you don't want to highlight section with awesome color
\setbool{acvSectionColorHighlight}{true}
% If you would like to change the social information separator from a pipe (|) to something else % If you would like to change the social information separator from a pipe (|) to something else
\renewcommand{\acvHeaderSocialSep}{\quad\textbar\quad} \renewcommand{\acvHeaderSocialSep}{\quad\textbar\quad}
@ -57,12 +60,13 @@
\homepage{www.posquit0.com} \homepage{www.posquit0.com}
\github{posquit0} \github{posquit0}
\linkedin{posquit0} \linkedin{posquit0}
% \stackoverflow{SOid}{SOname} % \stackoverflow{SO-id}{SO-name}
% \twitter{@twit} % \twitter{@twit}
% \skype{skypeid} % \skype{skype-id}
% \reddit{reddit-id}
% \extrainfo{extra informations} % \extrainfo{extra informations}
\quote{``Make the change that you want to see in the world."} \quote{``Must be the change that you want to see in the world."}
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% BIBLIOGRAPHY % BIBLIOGRAPHY

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

View file

@ -21,7 +21,7 @@
\documentclass[11pt, a4paper]{awesome-cv} \documentclass[11pt, a4paper]{awesome-cv}
% Configure page margins with geometry % Configure page margins with geometry
% \geometry{left=1.4cm, top=.8cm, right=1.4cm, bottom=1.8cm, footskip=.5cm} \geometry{left=1.4cm, top=.8cm, right=1.4cm, bottom=1.8cm, footskip=.5cm}
% Specify the location of the included fonts % Specify the location of the included fonts
\fontdir[fonts/] \fontdir[fonts/]
@ -40,6 +40,9 @@
% \definecolor{graytext}{HTML}{5D5D5D} % \definecolor{graytext}{HTML}{5D5D5D}
% \definecolor{lighttext}{HTML}{999999} % \definecolor{lighttext}{HTML}{999999}
% Set false if you don't want to highlight section with awesome color
\setbool{acvSectionColorHighlight}{true}
% If you would like to change the social information separator from a pipe (|) to something else % If you would like to change the social information separator from a pipe (|) to something else
\renewcommand{\acvHeaderSocialSep}{\quad\textbar\quad} \renewcommand{\acvHeaderSocialSep}{\quad\textbar\quad}
@ -57,12 +60,13 @@
\homepage{www.posquit0.com} \homepage{www.posquit0.com}
\github{posquit0} \github{posquit0}
\linkedin{posquit0} \linkedin{posquit0}
% \stackoverflow{SOid}{SOname} % \stackoverflow{SO-id}{SO-name}
% \twitter{@twit} % \twitter{@twit}
% \skype{skypeid} % \skype{skype-id}
% \reddit{reddit-id}
% \extrainfo{extra informations} % \extrainfo{extra informations}
\quote{``Make the change that you want to see in the world."} \quote{``Must be the change that you want to see in the world."}
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------

View file

@ -8,5 +8,7 @@
% CONTENT % CONTENT
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
\begin{cvparagraph} \begin{cvparagraph}
%---------------------------------------------------------
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ullamcorper neque sit amet lectus facilisis sed luctus nisl iaculis. Vivamus at neque arcu, sed tempor quam. Curabitur pharetra tincidunt tincidunt. Morbi volutpat feugiat mauris, quis tempor neque vehicula volutpat. Duis tristique justo vel massa fermentum accumsan. Mauris ante elit, feugiat vestibulum tempor eget, eleifend ac ipsum. Donec scelerisque lobortis ipsum eu vestibulum. Pellentesque vel massa at felis accumsan rhoncus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ullamcorper neque sit amet lectus facilisis sed luctus nisl iaculis. Vivamus at neque arcu, sed tempor quam. Curabitur pharetra tincidunt tincidunt. Morbi volutpat feugiat mauris, quis tempor neque vehicula volutpat. Duis tristique justo vel massa fermentum accumsan. Mauris ante elit, feugiat vestibulum tempor eget, eleifend ac ipsum. Donec scelerisque lobortis ipsum eu vestibulum. Pellentesque vel massa at felis accumsan rhoncus.
\end{cvparagraph} \end{cvparagraph}