Merge branch 'master' into local-github

3 files changed, 77 insertions, 26 deletions

diff --git a/cv.tex b/cv.tex
index a0eb5d7..65e7200 100755
--- a/cv.tex
+++ b/cv.tex
@@ -2,18 +2,20 @@
 

 \documentclass{darwiin-cv}

 

-%Italian hyphenation for the word: ''corporations''

-\hyphenation{im-pre-se}

-

+\name{Christophe}{ROGER}

+\socialinfo{

+	\linkedin{christopheroger}

+	\viadeo{christopheroger}

+	\github{darwiin}\\

+	\smartphone{+687 123 456}

+	\email{christophe.roger@mail.com}\\

+	\address{2 Rue du quartier, 98765 Ville, Pays}\\

+	\infos{Né le 23 septembre 1982 (33 ans) à Nouméa, Nouvelle-Calédonie}

+}

 %------------------------------------------

 \begin{document}

 

-\setlist[itemize,1]{label=\faAngleRight, nosep, leftmargin=2em}	

-

-\pagestyle{empty} 												% non-numbered pages

-\font\fb=''[cmr10]'' 											% for use with \LaTeX command

-

-\input{section_perso}											% Personal data section

+\makecvheader

 

 \resumetitle{Architecte logiciel | Développeur/Concepteur JEE}

 

diff --git a/darwiin-cv.cls b/darwiin-cv.cls
index ff1d227..f24fcb6 100755
--- a/darwiin-cv.cls
+++ b/darwiin-cv.cls
@@ -1,4 +1,4 @@
-\ProvidesClass{darwiin-cv}[2015/10/04 v1.0 Christophe ROGER CV Class]
+\ProvidesClass{darwiin-cv}[2015/10/04 v1.1 Christophe ROGER CV Class]
 
 \LoadClass[11pt,a4paper]{article}
 
@@ -18,21 +18,23 @@
 \RequirePackage{enumitem}
 \RequirePackage{longtable} 	
 
-
-
-
 % Setup hyperref package, and colours for links
 \definecolor{linkcolour}{rgb}{0,0.2,0.6}
 \hypersetup{colorlinks,breaklinks,urlcolor=linkcolour, linkcolor=linkcolour}
 
+\pagestyle{empty}                         % non-numbered pages
+\font\fb=''[cmr10]''                      % for use with \LaTeX command
+
 % Setup CV sections
 \titleformat{\section}{\Large\raggedright}{}{0em}{}[\titlerule]
 \titlespacing{\section}{0pt}{2pt}{2pt}
 
+% Configure list
+\setlist[itemize,1]{label=\faAngleRight, nosep, leftmargin=2em} 
+
 % Setup Array : new column type
 \newcolumntype{R}[1]{>{\hfill}m{#1}}
 
-
 %Italian hyphenation for the word: ''corporations''
 \hyphenation{im-pre-se}
 
@@ -40,7 +42,6 @@
 \defaultfontfeatures{Mapping=tex-text}
 \setmainfont[BoldFont = Helvetica Neue, ItalicFont=Helvetica Neue Thin Italic ,SmallCapsFont = Helvetica Neue Light]{Helvetica Neue Thin}
 
-
 %New length definition
 \newlength{\datebox}
 \settowidth{\datebox}{Décembre 2009}
@@ -53,26 +54,74 @@
 
 % Macros
 \newcommand{\el}{\enspace \faAngleRight \enspace}					        % Custom itemize to use with array
-\newcommand\user[2]{\color{Blue}{\LARGE #1 #2}\color{Black}}	    % Username
-\newcommand\linkedin[2]{\faLinkedin \enspace \href{#1}{#2}}		    % Linkedin icon + URL
-\newcommand\viadeo[2]{\faViadeo \enspace \href{#1}{#2}}           % Viadeo icon + URL
-\newcommand\github[2]{\faGithub \enspace \href{#1}{#2}}           % Github icon + URL
-\newcommand\address[1]{\faMapMarker \enspace #1}						      % Home icon + address as parameter
-\newcommand\infos[1]{\faInfo \enspace #1}                         % I icon
-\newcommand\smartphone[1]{\faMobilePhone \enspace #1}             % Smartphone Icon
-\newcommand\email[2]{\faAt \enspace \href{mailto:#1}{#2}}   % Envelope Icon + mailto link
 \newcommand\link[2]{\href{#1}{#2} \faLink }
 \newcommand\important[1]{\textbf #1}
 
+% Render author's name
+% Usage: \user{<firstanme>}{<lastname>}
+\newcommand\user[2]{\color{Blue}{\LARGE #1 #2}\color{Black}}      % Username
+
+% Render a text with its symbol
+% Usage; \socialtext{<icon>}{<label>}
+\newcommand{\socialtext}[2]{\mbox{\textcolor{Blue}{#1}\hspace{0.5em}#2\hspace{1em}}}
+
+% Render a link with its symbol
+% Usage; \sociallink{<icon>}{<label>}
+\newcommand{\sociallink}[3]{\mbox{\textcolor{Blue}{#1}\hspace{0.5em}\href{#2}{#3}\hspace{1em}}}
+
+% Define author's name
+% Usage: \name{<firstname>}{<lastname>}
+% Usage: \firstname{<firstname>}
+% Usage: \lastname{<lastname>}
+% Usage: \familyname{<familyname>}
+\newcommand*{\name}[2]{\def\@firstname{#1}\def\@lastname{#2}}
+\newcommand*{\firstname}[1]{\def\@firstname{#1}}
+\newcommand*{\lastname}[1]{\def\@lastname{#1}}
+\newcommand*{\familyname}[1]{\def\@lastname{#1}}
+\def\@familyname{\@lastname}
+
+% Render author's address
+% Usage: \address{<address>}
+\newcommand*{\address}[1]{\socialtext{\faMapMarker}{#1}}
+
+% Render author's infos
+% Usage: \infos{<infos>}
+\newcommand*{\infos}[1]{\socialtext{\faInfo}{#1}}
+
+% Render author's linked-in (optional)
+% Usage: \linkedin{<linked-in-nick>}
+\newcommand*{\linkedin}[1]{\sociallink{\faLinkedin}{http://www.linkedin.com/in/#1/fr}{linkedin.com/in/#1}}
+
+% Render author's viadeo(optional)
+% Usage: \viadeo{<viadeo-nick>}
+\newcommand*{\viadeo}[1]{\sociallink{\faViadeo}{http://www.viadeo.com/fr/profile/#1}{viadeo.com/fr/profile/#1}} 
+
+% Render author's github (optional)
+% Usage: \github{<github-nick>}
+\newcommand*{\github}[1]{\sociallink{\faGithub}{https://www.github.com/#1}{github.com/#1}}           % Github icon + URL
+
+% Render author's email (optional)
+% Usage: \email{<email adress>}
+\newcommand*{\email}[1]{\sociallink{\faAt}{mailto:#1}{#1}}
+
+\newcommand*\smartphone[1]{\socialtext{\faMobilePhone}{#1}}    
+
 \newcommand\resumetitle[1]{
 	\par{
-		\bigskip\center{\Large #1}\par
+		\bigskip\center{\Large \color{Blue}#1\color{Black}}\par
 	}
 	\bigskip
 }
 
+% Define social entries to print in header
+\newcommand{\socialinfo}[1]{\def\@socialinfo{#1}}
 
-
+% Render CV header
+% Needs \firstname and \lastname to be defined
+\newcommand{\makecvheader}{
+  \user{\@firstname}{\@lastname}\\
+  \small{\@socialinfo}
+}
 
 %Resume part title definition
 \newcommand\sectionTitle[2]{\section{\texorpdfstring{\color{Blue}#2\enspace #1}{#1}}}
diff --git a/section_competences.tex b/section_competences.tex
index bf088be..ec356d0 100755
--- a/section_competences.tex
+++ b/section_competences.tex
@@ -1,5 +1,5 @@
 %Section compétences

-\sectionTitle{Compétences}{\faCode}

+\sectionTitle{Compétences}{\faTasks}

 \renewcommand{\arraystretch}{1.1}

 

 	\begin{tabular}{>{\small}r>{\small}p{13cm}}