3 files changed, 7 insertions, 58 deletions
diff --git a/model_2/Makefile b/model_2/Makefile
index ae2f58e..25786c6 100755
--- a/model_2/Makefile
+++ b/model_2/Makefile
@@ -1,50 +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
-
-# Image generation
-content/%.pdf: content/%.svg
-	inkscape -D -z --export-pdf=$@ $<
-
-# 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_2/resources/00_preamble.tex b/model_2/resources/00_preamble.tex
index 89cb0c4..a199f07 100755
--- a/model_2/resources/00_preamble.tex
+++ b/model_2/resources/00_preamble.tex
@@ -21,4 +21,5 @@
 \input{../common/10_lists.tex}
 \input{../common/10_nowidows.tex}
 \input{../common/10_levels.tex}
+\def\nocolumns{}
 \input{../common/99_sidebar.tex}
diff --git a/model_2/resources/10_fonts.tex b/model_2/resources/10_fonts.tex
index 928f801..0bb7c03 100755
--- a/model_2/resources/10_fonts.tex
+++ b/model_2/resources/10_fonts.tex
@@ -1,17 +1,14 @@
 \usepackage{fontspec}
+
 \defaultfontfeatures{Ligatures={Common, Required, Contextual}}
 \setmainfont{EB Garamond}
-
-% Change the font for bold text
-\let\bf\textbf
-\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}}
+    [ BoldFont = {Linux Libertine O Bold}]
 
 \setmonofont{Latin Modern Mono Light}
+
 \newfontfamily\EBLigatures{EB Garamond}[
     Mapping=tex-text,
     Ligatures={Common, Required, 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