Merge branch 'master' into complete

6 files changed, 184 insertions, 53 deletions

diff --git a/README.md b/README.md
index 32e7775..71a2384 100755
--- a/README.md
+++ b/README.md
@@ -1,38 +1,87 @@
-Awesome Source CV [![Example](https://img.shields.io/badge/Exemple-pdf-blue.svg)](https://raw.githubusercontent.com/posquit0/Awesome-CV/master/examples/resume.pdf)
+Awesome Source CV [![Example](https://img.shields.io/badge/Exemple-pdf-blue.svg)](https://github.com/darwiin/awesome-neue-latex-cv/releases/download/1.4-github/cv.pdf)
 =================
 
 ## About
 
-**Awesome Source Latex CV** is based on a CV template created by Alessandro Plasmati. The original template use _XeLaTeX_ engine and _[Fontin Sans](http://www.exljbris.com/fontinsans.html)_ font. 
+**Awesome Source Latex CV** was originally based on a CV template created by Alessandro Plasmati. Thi template use _XeLaTeX_ engine and _[Fontin Sans](http://www.exljbris.com/fontinsans.html)_ font. 
 
-Original Alessandro Plasmati template and more informations can be found here :
+More informations about the original Alessandro Plasmati template can be found here :
 
    -  [ Scribd ](http://fr.scribd.com/doc/16335667/Writing-your-Professional-CV-with-LaTeX)
    -  [ LaTeX Templates ](http://www.latextemplates.com/template/plasmati-graduate-cv)
    -  [ ShareLatex ](https://www.sharelatex.com/templates/cv-or-resume/professional-cv)
 
-**Personal data** has moved on top of the first page just before the position and _[Fontin Sans](http://www.exljbris.com/fontinsans.html)_ font has been replaced by _[Source Sans Pro Font](https://github.com/adobe-fonts/source-sans-pro)_ from Adobe. _[Font Awesome](http://fontawesome.io/)_ icons are used to highlight important elements.
+**Personal data** has moved on top of the first page just before the position and _[Fontin Sans](http://www.exljbris.com/fontinsans.html)_ font has been replaced by _[Source Sans Pro Font](https://github.com/adobe-fonts/source-sans-pro)_ from Adobe. _[Font Awesome](http://fontawesome.io/)_ icons highlight important elements.
 
-Unlike _Alessandro Plasmati_ CV template, all layout stuff in **Awesome Source Latex CV** has moved in the Latex class file _awesome-source-cv.cls_.
+Unlike _Alessandro Plasmati_ CV template, all layout stuff in **Awesome Source Latex CV** has moved in the Latex class file _awesome-source-cv.cls_ to imptove source code readability.
 
 ## Quick start
 
-You can edit online **Awesome Source Latex CV** on [Overleaf](https://www.overleaf.com/latex/templates/awesome-source-cv/wrdjtkkytqcw). Feel free to use my [invite link](https://www.overleaf.com/signup?ref=54c221604cd6) if you want to create your account.
+You can edit online **Awesome Source Latex CV** on [Overleaf](https://www.overleaf.com/latex/templates/awesome-source-cv/wrdjtkkytqcw). Feel free to use my [referal link](https://www.overleaf.com/signup?ref=54c221604cd6) if you want to create your account.
 
 ## How to use **Awesome Source CV** latex class
 
+### Use the **Awesome Source CV** options
+
+When declaring the `\documentclass` you can use option(s) to customize your CV rendering.
+
+```latex
+% Used with no option, the template will use the 'traditional' 
+% header layout your system fonts and the default color scheme ie. blue
+\documentclass{awesome-source-cv}
+
+% Used with localFont option the template will use the 'traditional' 
+% header layout, fonts included in the fonts directory and the default color scheme
+\documentclass[localFont]{awesome-source-cv}
+
+% Used with localFont option, the template will use the 'alternative' 
+% header layout, your system fonts and the default color scheme
+\documentclass[alternative]{awesome-source-cv}
+
+```
+
+### Construct the header
+
+Outside of the `\socialinfo` wrapper you have to define the mandatory parameters `\name` and `\tagline`.
+
 ```latex
 % Define author's name
 % Usage: \name{<firstname>}{<lastname>}
 % Mandatory
 \name{Christophe}{ROGER}
 
+% Define author's photo (optional)
+% Usage \photo{<diameter>}{<photo>}
+\photo{2.5cm}{darwiin}
+
 % Define author's tagline
 % Usage: \tagline{<tag line>} 
 % Mandatory
 \tagline{Chef de projet IT}
 ```
 
+Most social network have their command to render a clickable link or a simple text entry.
+
+```latex
+% Render author's linked-in (optional)
+% Usage: \linkedin{<linked-in-nick>}
+\linkedin{christopheroger}
+
+% Render author's viadeo(optional)
+% Usage: \viadeo{<viadeo-nick>}
+\viadeo{christopheroger}
+
+% Render author's github (optional)
+% Usage: \github{<github-nick>}
+\github{darwiin}
+
+% Render author's email (optional)
+% Usage: \email{<email adress>}
+\email{christophe.roger@mail.com}
+```
+
+Put these command in the `\socialinfo` wrapper. Feel free to add `\\` when you want to force a new line.
+
 ```latex
 \socialinfo{
   \linkedin{christopheroger}
@@ -45,7 +94,15 @@ You can edit online **Awesome Source Latex CV** on [Overleaf](https://www.overle
 }
 ```
 
-To describe your experiences you have first to declare the **experiences** environment
+Use the `\makecvheader`command to generate the header.
+
+```latex
+\makecvheader
+```
+
+### Construct the _experiences_ section
+
+To describe your experiences you have first to declare the `experiences` environment
 
 ```latex
 % Begin a new experiences environment to use experience and consultantexperience macro
@@ -96,6 +153,39 @@ entry must be separated by the **\emptyseparator**
 \end{experiences}
 ```
 
+### Construct the _languages_ section
+
+The _languages_ section use the **skills** environment. 
+
+```latex
+% Begin a new skills environment and fill it with skill entries
+  \begin{skills}
+
+% Render a skill in the skills environment
+% Usage: \skill{<skill>}{<level between 1 and 5>}
+    \skill{Français}{5}
+    \skill{Anglais}{4}
+
+% End the skills environment    
+  \end{skills}
+```
+
+### Construct the _scolarship_ section
+
+The _scolarship_ section ise the **scolarship** environment.
+
+```latex
+  \begin{scholarship}
+
+% Render a scholarshipentry in the scolarship environment
+% Usage: \scholarshipentry{<date>}{<description>}
+    \scholarshipentry{2007}
+          {Master STIC Professionel filière MBDS de l'Université de Nice Sophia Antipolis (Master Informatique spécialité Multimédia, Base de Données et intégration de Systèmes)}
+    \scholarshipentry{2005}
+          {Licence Sciences et Technologies, Mention Informatique, de l'Université de Nouvelle-Calédonie}
+  \end{scholarship}
+```
+
 ## License
 
 Latex class file _awesome-source-cv.cls_ is published under the term of the [LPPL Version 1.3c](https://www.latex-project.org/lppl.txt).
diff --git a/awesome-source-cv.cls b/awesome-source-cv.cls
index e5a7e98..9553482 100755
--- a/awesome-source-cv.cls
+++ b/awesome-source-cv.cls
@@ -1,7 +1,7 @@
 %% Copyright 2016 Christophe Roger
 %
 % Author: 
-%Christophe Roger
+% Christophe Roger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -17,9 +17,9 @@
 %
 % This work consists of the files awesome-source-cv.cls 
 
-\ProvidesClass{awesome-source-cv}[2016/10/14 v1.3 Awesome Source CV Class]
+\ProvidesClass{awesome-source-cv}[2016/11/05 v1.5 Awesome Source CV Class]
 
-\LoadClass[11pt,a4paper]{article}
+\LoadClass[a4paper]{article}
 
 \DeclareOption{green}{
   \def\@green{green}
@@ -39,6 +39,11 @@
 \DeclareOption{localFont}{
   \def\@local{local}
 }
+
+\DeclareOption{alternative}{
+  \def\@alternative{alternate}
+}
+
 \ProcessOptions
 
 % Dependences
@@ -58,7 +63,8 @@
 \RequirePackage{longtable} 	
 \RequirePackage{etoolbox}
 \RequirePackage{tikz}
-\RequirePackage{pgffor}
+%\RequirePackage{pgffor}
+\RequirePackage[skins]{tcolorbox}
 
 % Define default accent colors
 \definecolor{basecolor}{HTML}{000066}       %BLUE
@@ -123,9 +129,6 @@
 }
 
 %New length definition
-\newlength{\datebox}
-\settowidth{\datebox}{Décembre 2009}
-
 \newlength{\rightcolumnlength}
 \setlength{\rightcolumnlength}{14.8cm}
 
@@ -144,21 +147,15 @@
 \newcommand\link[2]{\color{linkcolor}\href{#1}{#2}\color{Black} }
 \newcommand\important[1]{\textbf #1}
 
-% Create tag
+% Create a tag
+% Usage: \cvtag{<tag label>}
 \newcommand{\cvtag}[1]{%
   \tikz[baseline]\node[anchor=base,draw=darkGrey!70,rounded corners=0.5ex,inner xsep=1ex,inner ysep =0.55ex,text height=1.3ex,text depth=.25ex]{#1};
 }
 
-% Create skill level
-%\newcommand{\cvskill}[2]{%
-%\textcolor{accentcolor}{\textbf{#1}}\hfill
-%\foreach \x in {1,...,5}{%
-%  \space{\color{accentcolor} \ifnumgreater{\x}{#2}{\faCircleThin}{\faCircle}}}\par%
-%}
-
 % Render author's name
 % Usage: \user{<firstanme>}{<lastname>}
-\newcommand\user[2]{\color{accentcolor}{\LARGE #1 \textbf{#2}}\color{Black}}      % Username
+\newcommand\user[2]{\color{accentcolor}{\LARGE #1 \textbf{#2}}\color{Black}}
 
 % Render a text with its symbol
 % Usage; \socialtext{<icon>}{<label>}
@@ -183,6 +180,10 @@
 % Usage: \tagline{<tag line>}
 \newcommand*{\tagline}[1]{\def\@tagline{#1}}
 
+% Define author's photo
+% Usage \photo{<diameter>}{<photo>}
+\newcommand{\photo}[2]{\def\@photo{#2}\def\@photodiameter{#1}}
+
 % Render author's address
 % Usage: \address{<address>}
 \newcommand*{\address}[1]{\socialtext{\locationSymbol}{#1}}
@@ -211,11 +212,16 @@
 % Usage: \smartphone{<mobile phone number>}
 \newcommand*\smartphone[1]{\socialtext{\mobileSymbol}{#1}}    
 
+% Render author's tagline
 \newcommand\resumetitle[1]{
-	\par{
-		\bigskip\center{\Large \color{accentcolor}\textsc{#1}\color{Black}}\par
-	}
-	\bigskip
+  \ifundef{\@alternative}{
+	 \par{
+	 	 \bigskip\center{\Large \color{accentcolor}\textsc{#1}\color{Black}}\par
+	 }
+	 \bigskip
+  }{
+    \color{accentcolor}\textsc{\large{#1}}\color{black}
+  }
 }
 
 % Define social entries to print in header
@@ -223,25 +229,58 @@
 
 % Render CV header
 % Needs \@firstname, \@lastname and \@tagline to be defined
-\newcommand{\makecvheader}{
-  \user{\@firstname}{\@lastname}\\
-  \small{\@socialinfo}
-  \resumetitle{\@tagline}
+\newcommand*{\makecvheader}{
+  \ifundef{\@alternative}{
+    \ifundef{\@photodiameter}{
+      \begin{minipage}{\linewidth}
+    }{
+      \begin{minipage}{\dimexpr\linewidth-\@photodiameter-2em}
+    }
+    \color{accentcolor}\user{\@firstname}{\@lastname}\color{black}\\
+    \small{\@socialinfo}
+    \end{minipage}
+    \ifdef{\@photodiameter}{
+      \begin{minipage}{\@photodiameter}
+        \tikz\path[fill overzoom image={\@photo}]circle[radius=0.5\linewidth];
+      \end{minipage}
+    }{}
+    \resumetitle{\@tagline}
+  }{
+    \ifundef{\@photodiameter}{
+      \begin{minipage}{\linewidth}
+    }{
+      \begin{minipage}{\dimexpr\linewidth-\@photodiameter-2em}
+    }
+    \user{\@firstname}{\@lastname}\\
+    \resumetitle{\@tagline}
+    \smallskip\\
+    \small{\@socialinfo}
+    \end{minipage}
+    \ifdef{\@photodiameter}{
+      \begin{minipage}{\@photodiameter}
+        \tikz\path[fill overzoom image={\@photo}]circle[radius=0.5\linewidth];
+      \end{minipage}
+    }{}
+    \bigskip
+  }
 }
 
 % Resume part title definition
 \newcommand\sectionTitle[2]{\section{\texorpdfstring{\color{accentcolor}#2\enspace #1}{#1}}}
 
-\newcolumntype{D}{>{\raggedleft}p{\leftcolumn}}
+% Define a new column type for the scholarship environment
+\newcolumntype{Y}{>{\raggedleft}p{\leftcolumn}}
 
-% Define the 'scolarship' environment
-\newenvironment{scolarship}{%
-  \begin{tabular}{D p{\rightcolumnlength}}
+% Define the 'scholarship' environment
+\newenvironment{scholarship}{%
+  \begin{tabular}{Y p{\rightcolumnlength}}
 }{%
   \end{tabular}
 }
 
-\newcommand\scolarshipentry[2]{
+% Render a scholarshipentry in the scolarship environment
+% Usage: \scholarshipentry{<date>}{<description>}
+\newcommand\scholarshipentry[2]{
   #1    &  #2 \\
 }
 
@@ -253,15 +292,16 @@
 }
 
 % Render a skill in the skills environment
-% Usage: 
-% \skill{<skill>}{<level>}
+% Usage: \skill{<skill>}{<level>}
 \newcommand\skill[2]{
   \textsc{#1}    & \foreach \x in {1,...,5}{{\color{accentcolor!80} \ifnumgreater{\x}{#2}{\faCircleO}{\faCircle}}\enspace } \\
 }
 
+\newcolumntype{E}{>{\raggedright\arraybackslash}p{\rightcolumnlength}}
+
 % Define the 'experiences' environment
 \newenvironment{experiences}{%
-  \begin{longtable}{R{\leftcolumn}|p{\rightcolumnlength}}
+  \begin{longtable}{R{\leftcolumn}|E}
 }{%
   \end{longtable}
 }
@@ -275,10 +315,10 @@
 %                    }
 %                    {<Technology list>}
 \newcommand\experience[7]{
-  \textsc{#1}    & \textsc{#2, #3, #4}   								\\
+  \textsc{#1}    & \textsc{#2, #3, #4}   								\\*
   \textsc{#5}    & \begin{minipage}[t]{\rightcolumnlength}
   					         #6
-                   \end{minipage}										\\
+                   \end{minipage}										\\*
                  & \footnotesize{\foreach \n in {#7}{\cvtag{\n}}} 	\\
   }
 
@@ -292,12 +332,12 @@
 %                    }
 %                    {<Technology list>}
 \newcommand\consultantexperience[9]{
-  \textsc{#1}    & \textsc{#2, #3, #4}   								\\
-  \textsc{#5}    & \emph{#6} pour #7                       				\\
+  \textsc{#1}    & \textsc{#2, #3, #4}   								\\*
+  \textsc{#5}    & \emph{#6} pour #7                       				\\*
   				       & 	\begin{minipage}[t]{\rightcolumnlength}
   						        #8
-                   	\end{minipage}										\\
-                 & \footnotesize{\foreach \n in {#9}{\cvtag{\n}} } 	\\
+                   	\end{minipage}										\\*
+                 & \footnotesize{\foreach \n in {#9}{\cvtag{\n}}} 	\\
   }
 
 \newcommand\emptySeparator{\multicolumn{2}{c}{}\\}
diff --git a/cv.tex b/cv.tex
index ff41d40..09f25ae 100755
--- a/cv.tex
+++ b/cv.tex
@@ -10,10 +10,11 @@
 % Template license:

 % CC BY-SA 4.0 (https://creativecommons.org/licenses/by-sa/4.0/)

 

-\documentclass[localFont]{awesome-source-cv}

+\documentclass[localFont,alternative]{awesome-source-cv}

 

 \name{Christophe}{ROGER}

 \tagline{Architecte Logiciel | Développeur/Concepteur Java/JEE}

+\photo{2.5cm}{darwiin}

 \socialinfo{

 	\linkedin{christopheroger}

 	\viadeo{christopheroger}

diff --git a/darwiin.png b/darwiin.png
new file mode 100644
index 0000000..22ae9ab
--- /dev/null
+++ b/darwiin.png
diff --git a/section_competences.tex b/section_competences.tex
index 9a5f242..281634d 100755
--- a/section_competences.tex
+++ b/section_competences.tex
@@ -13,7 +13,7 @@
 \sectionTitle{Compétences}{\faTasks}

 \renewcommand{\arraystretch}{1.1}

 

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

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

 		\textsc{Langages de programmation:}  		&   \textbf{Java} (\textbf{JEE}, \textbf{JSE}, JME, Java Card Platform), Microsoft .Net (\textbf{C\#},asp.net)\\ 

 		\textsc{Programmation web:}               	&   ZK, JSP, JSF, JBoss RichFaces, Javascript, jQuery, AngularJS, Bootstrap, LESS, CSS\\ 

 		\textsc{Bases de données:}                  &   \textbf{IBM DB2}, Oracle Database, Microsoft SQL Server, MySQL, PostgreSQL \\ 

diff --git a/section_scolarite.tex b/section_scolarite.tex
index f2e14c8..e5051d0 100755
--- a/section_scolarite.tex
+++ b/section_scolarite.tex
@@ -12,13 +12,13 @@
 %Section: Scholarships and additional info

 \sectionTitle{Formation}{\faMortarBoard}

 

-\begin{scolarship}

-	\scolarshipentry{2007}

+\begin{scholarship}

+	\scholarshipentry{2007}

 					{Master STIC Professionel filière MBDS de l'Université de Nice Sophia Antipolis (Master Informatique spécialité Multimédia, Base de Données et intégration de Systèmes)}

-	\scolarshipentry{2005}

+	\scholarshipentry{2005}

 					{Licence Sciences et Technologies, Mention Informatique, de l'Université de Nouvelle-Calédonie}

-	\scolarshipentry{2004}

+	\scholarshipentry{2004}

 					{BTS Informatique de Gestion option administrateurs de réseaux}

-	\scolarshipentry{2000}

+	\scholarshipentry{2000}

 					{Baccalauréat Scientifique option Mathématiques}

-\end{scolarship}
\ No newline at end of file
+\end{scholarship}
\ No newline at end of file