4 files changed, 6 insertions, 108 deletions
diff --git a/model_1/Makefile b/model_1/Makefile
index 99eb4e8..25786c6 100755
--- a/model_1/Makefile
+++ b/model_1/Makefile
@@ -1,46 +1 @@
-TEX=xelatex
-SOURCE=.
-
-SRC  =$(wildcard *.rst)
-SVG  =$(wildcard content/*.svg)
-
-PDFS = $(SRC:.rst=.pdf)
-INCLUDED_PDF = $(SVG:.svg=.pdf)
-
-all: $(PDFS)
-
-BIBS =$(wildcard *.bib)
-
-DIR = $(sort $(shell find $(SOURCE) -name '*.rst' -print))
-SOURCES = $(sort $(wildcard resources/*.tex))
-
-null  :=
-space := $(null) #
-comma := ,
-TEX_STYLE := $(subst $(space),$(comma),$(strip $(SOURCES)))
-TEX_BIBS := $(subst $(space),$(comma),$(strip $(BIBS)))
-
-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 $(INCLUDED_PDF) $(SOURCES)| tmp
-	$$(command -v rst2latex rst2latex.py | head -n 1)  --no-section-subtitles --table-style=borderless --use-latex-citations --use-latex-docinfo --documentclass=article --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 $(BIBS) | tmp
-	$(TEX) -output-directory tmp $<
-	#bibtex tmp/$*.aux && $(TEX) -output-directory tmp $< || echo "no bib"
-	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_1/example.rst b/model_1/example.rst
index 7cf0a1a..11c066d 100755
--- a/model_1/example.rst
+++ b/model_1/example.rst
@@ -14,7 +14,6 @@
 
 
   \setstretch{1.4}
-  %\definecolor{orangeColor}{RGB}{255, 165, 0}
 
   % Espacement entre chaque note de marge
   \setlength{\notesep}{1.3cm}
@@ -25,12 +24,6 @@
 .. role:: smallcaps
 .. role:: smallemph
 
-.. |EDD|          replace::   :smallcaps:`EDD`
-.. |ISO9001|      replace::   :smallcaps:`ISO9001`
-.. |PDF|          replace::   :smallcaps:`PDF`
-
-.. |ITIL|         replace::   :smallcaps:`ITIL`
-
 .. |tuxicon|      replace::   `\renewcommand{\labelitemi}{\faLinux}`
 .. |phoneicon|    replace::   `\renewcommand{\labelitemi}{\faPhone}`
 .. |mailicon|     replace::   `\renewcommand{\labelitemi}{\faEnvelope}`
@@ -54,8 +47,6 @@ Créateur de talent
   * 75001 Paris |phoneicon|
   * 01 23 45 67 89 |mailicon|
   * email@example |noicon|
-  * 01/02/1980
-  * Permis B
 
 .. sidebar:: Compétences
 
@@ -64,23 +55,17 @@ Créateur de talent
   * Conception
   * Esprit de synthèse
   * Écoute |noicon|
-  * \
 
 .. sidebar:: Niveaux
 
-  Autre
+  Étoiles
 
   :star:`4.5`
 
-  Anglais
+  Autres
 
   :level:`5`
 
-  Bureautique
-
-  :level:`3`
-
-
 
 Expériences
 ===========
@@ -95,29 +80,6 @@ Expériences
 
   - :latex:`\lipsum[1-3][1]`
   - :latex:`\lipsum[1-3][2]`
-  - :latex:`\lipsum[1-3][3]`
-
-
-:2011 — 2018:
-
-  **Poste occupé** — *Entreprise* — Adresse.
-
-  :latex:`\lipsum[1-3][5-10]`
-
-  :latex:`\lipsum[4-7][5-10]`
-
-:2010 — 2011:
-
-  **Poste occupé** — *Entreprise* — Adresse.
-
-  :latex:`\lipsum[1-3][10-15]`
-
-
-:2008 — 2010:
-
-  **Poste occupé** — *Entreprise* — Adresse.
-
-  :latex:`\lipsum[1-3][15-21]`
 
 
 Réalisations
@@ -128,15 +90,11 @@ Description
 
 :latex:`\lipsum[4-7][10-15]`
 
-:latex:`\lipsum[4-7][15-20]`
-
 Description
 -----------
 
 :latex:`\lipsum[7-10][10-15]`
 
-:latex:`\lipsum[7-10][15-20]`
-
 
 Formations
 ==========
@@ -158,8 +116,3 @@ Formations
     **Baccalauréat Scientifique** — *Lycée* – Ville
 
     Spécialité
-
-.. raw:: latex
-
-  \vspace{1cm}
-  \center\pgfornament[color=backsidecolor,width=1cm]{3}
diff --git a/model_1/resources/10_fonts.tex b/model_1/resources/10_fonts.tex
index 24f6cfc..d070ac6 100755
--- a/model_1/resources/10_fonts.tex
+++ b/model_1/resources/10_fonts.tex
@@ -1,15 +1,12 @@
 \usepackage{fontspec}
 \defaultfontfeatures{Ligatures={Common, Required, Contextual}}
 \setmainfont{EB Garamond}
+    [ BoldFont = {Linux Libertine O Bold}]
 
 \newcommand{\DUtitletitle}[1]{%
     {\begin{center}\textbf{\textsc{#1}}\end{center}}
  }
 
-% Change the font for bold text
-\let\bf\textbf
-\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}}
-
 \setmonofont{Latin Modern Mono Light}
 \newfontfamily\EBGaramond 
   {EB Garamond}
@@ -24,6 +21,5 @@
     , Contextual
     , Historic } ]
 
-\newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O}
-\newfontfamily\CaviarDreamsFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams}
-\newfontfamily\CaviarDreamsBoldFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams_Bold}
+\input{../common/10_fonts.tex}
+\let\AltFont\LibertineFont
diff --git a/model_1/resources/99_begin.tex b/model_1/resources/99_begin.tex
index 7b7a793..8783087 100755
--- a/model_1/resources/99_begin.tex
+++ b/model_1/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}
-}
-