9 files changed, 64 insertions, 73 deletions
diff --git a/model_6/Makefile b/model_6/Makefile
index 170dd32..25786c6 100755
--- a/model_6/Makefile
+++ b/model_6/Makefile
@@ -1,40 +1 @@
-TEX=xelatex
-SOURCE=.
-
-SRC  =$(wildcard *.rst)
-
-PDFS = $(SRC:.rst=.pdf)
-
-all: $(PDFS)
-
-DIR = $(sort $(shell find $(SOURCE) -name '*.rst' -print))
-SOURCES = $(sort $(wildcard resources/*.tex) )
-
-null  :=
-space := $(null) #
-comma := ,
-TEX_STYLE := $(subst $(space),$(comma),$(strip $(SOURCES)))
-
-PACK = $(shell sed -e 's/\#.*$$//' -e '/^$$/d' resources/modules)
-PACKAGES := $(subst $(space),$(comma),$(strip $(PACK)))
-
-tmp:
-	mkdir tmp
-
-# Generate the latex file from rst
-tmp/%.tex: %.rst $(SOURCES)| tmp
-	$$(command -v rst2latex rst2latex.py | head -n 1)  --no-section-subtitles --table-style=borderless --use-latex-citations --use-latex-docinfo --documentclass=extarticle --documentoption=12pt,A4,table --syntax-highlight=short --stylesheet=$(PACKAGES),$(TEX_STYLE) $< $@
-	sed -i -e 's/continued on next page/suite sur la page suivante/;s|^%$$||' $@
-	sed -i -e 's/admonition-/admonition/g' $@
-
-# Generate each pdf with latex
-tmp/%.pdf: tmp/%.tex | tmp
-	$(TEX) -output-directory tmp $<
-	while grep 'Rerun to get ' tmp/$*.log ; do $(TEX) -output-directory tmp $< ; done
-
-# Put the pdf in the right place
-%.pdf: tmp/%.pdf | tmp
-	cp $< $@
-
-clean:
-	rm -r tmp
+include ../common/Makefile.common
diff --git a/model_6/example.rst b/model_6/example.rst
index 5db07a6..42c055b 100755
--- a/model_6/example.rst
+++ b/model_6/example.rst
@@ -11,16 +11,6 @@
 
 .. default-role:: latex
 
-.. raw:: latex
-
-
-  %\setstretch{1.4}
-
-  % Espacement entre chaque note de marge
-  %\setlength{\notesep}{0cm}
-
-  \renewcommand{\labelitemi}{}
-
 
 .. role:: smallcaps
 .. role:: smallemph
@@ -37,6 +27,9 @@ Nom et Prénom
 Petite légende
 --------------
 
+:latex:`\renewcommand{\labelitemi}{}`
+
+
 .. container:: header
 
   * 17 allée des cerisiers
@@ -46,7 +39,6 @@ Petite légende
   * 01/02/1980
   * Permis B
 
-
 Expériences
 ===========
 
diff --git a/model_6/lettre.rst b/model_6/lettre.rst
new file mode 100755
index 0000000..57ad1f1
--- /dev/null
+++ b/model_6/lettre.rst
@@ -0,0 +1,34 @@
+.. -*- mode: rst -*-
+.. -*-  coding: utf-8 -*-
+
+
+.. role:: latex(raw)
+   :format: latex
+
+.. default-role:: latex
+
+:latex:`\renewcommand{\labelitemi}{}`
+
+.. |phoneicon|    replace::   `\renewcommand{\labelitemi}{\faPhone}`
+.. |mailicon|     replace::   `\renewcommand{\labelitemi}{\faEnvelope}`
+.. |noicon|       replace::   `\renewcommand{\labelitemi}{}`
+
+.. container:: header
+
+  * 17 allée des cerisiers
+  * 75001 Paris |phoneicon|
+  * 01 23 45 67 89 |mailicon|
+  * email@example |noicon|
+
+* Company Recruitment team
+* *Company, Inc.*
+* *123 somestreet*
+* *some city*
+
+.. raw:: latex
+
+    \setstretch{1.5}
+    \vspace{2cm}
+
+:latex:`\lipsum[1-3]`
+
diff --git a/model_6/resources/00_preamble.tex b/model_6/resources/00_preamble.tex
index e969bba..bd36515 100755
--- a/model_6/resources/00_preamble.tex
+++ b/model_6/resources/00_preamble.tex
@@ -1,6 +1,6 @@
 \usepackage{calc}
 
-\usepackage[a4paper, top=0.5cm, bottom=0.5cm, outer=2.0cm, inner=2.0cm]{geometry}
+\usepackage[a4paper, top=2cm, bottom=0.5cm, outer=2.0cm, inner=2.0cm]{geometry}
 \pagestyle{empty}
 \pagenumbering{gobble}
 
diff --git a/model_6/resources/10_container.tex b/model_6/resources/10_container.tex
index a880a85..9b4173b 100644
--- a/model_6/resources/10_container.tex
+++ b/model_6/resources/10_container.tex
@@ -1,8 +1,22 @@
+\usepackage[absolute]{textpos}
 \newenvironment{DUCLASSheader}
     {   % renew the itemize command in order to apply a flushright to each elements
         \let\olditemize\itemize% 
-        \renewcommand\itemize{\olditemize\raggedleft\setlength\itemsep{0.0em}\small}%
-        % Create a minipage on the right
-        \begin{flushright}\begin{minipage}[t][0cm][b]{\linewidth}%
-        \raggedleft\em\color{gray}}
-    {   \end{minipage}\end{flushright}}
+        \renewcommand\itemize{
+            \olditemize%
+            \raggedleft%
+            \setlength\itemsep{0.0em}%
+            \small}%
+        \raggedleft%
+        \em%
+        % A textblock is created for placing the header in the topright corner
+        \begin{textblock*}{\linewidth}[0,0](2cm,1.5cm)%
+
+        % Create a new group for the color gray
+        \begingroup%
+        \color{gray}%
+    }
+    {   
+        \endgroup%
+        \end{textblock*}%
+    }
diff --git a/model_6/resources/10_fonts.tex b/model_6/resources/10_fonts.tex
index 0dc179e..84eb7a0 100755
--- a/model_6/resources/10_fonts.tex
+++ b/model_6/resources/10_fonts.tex
@@ -1,14 +1,11 @@
 \usepackage{fontspec}
-\setmainfont[Mapping=tex-text]{EB Garamond}
-
-% Set the bold font as Linux Libertine as the EB Garamond miss some characters
-\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O}
-\let\bf\textbf
-\renewcommand{\textbf}[1]{{\LibertineFont\selectfont\bf{#1}}}
+\setmainfont{EB Garamond}
+    [ BoldFont = {Linux Libertine O Bold}
+    , Mapping=tex-text
+    ]
 
 \setmonofont{Latin Modern Mono Light}
 
-\newfontfamily\TitleFont[Path=resources/, Mapping=tex-text]{CaviarDreams}
-\newfontfamily\CaviarDreamsFont[Path=resources/, Mapping=tex-text]{CaviarDreams}
+\newfontfamily\TitleFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams}
 
-%\newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O}
+\input{../common/10_fonts.tex}
diff --git a/model_6/resources/10_title_style.tex b/model_6/resources/10_title_style.tex
index 05036f4..a194354 100755
--- a/model_6/resources/10_title_style.tex
+++ b/model_6/resources/10_title_style.tex
@@ -13,7 +13,6 @@
 \makeatletter
 
 \def\@maketitle{%
-  \vspace*{1cm}
   \fontsize{1.2cm}{2cm}
   \TitleFont\selectfont \@title
 }
diff --git a/model_6/resources/99_begin.tex b/model_6/resources/99_begin.tex
index 4867a82..8783087 100755
--- a/model_6/resources/99_begin.tex
+++ b/model_6/resources/99_begin.tex
@@ -1,7 +1 @@
 \input{../common/90_ref.tex}
-
-%% On charge les colonnes dès le début du document.
-%\AtBeginDocument{%
-%  \begin{paracol}{2}
-%}
-
diff --git a/model_6/resources/CaviarDreams.ttf b/model_6/resources/CaviarDreams.ttf
deleted file mode 100644
index 4ba4279..0000000
--- a/model_6/resources/CaviarDreams.ttf
+++ /dev/null