Added a new model, and did some factorisation

8 files changed, 24 insertions, 123 deletions

diff --git a/model_4/resources/00_length.tex b/model_4/resources/00_length.tex
new file mode 100755
index 0000000..97560df
--- /dev/null
+++ b/model_4/resources/00_length.tex
@@ -0,0 +1,5 @@
+% Distance de la colonne
+%\setlength{\columnsep}{0.25cm}
+
+% Occupation de la colonne 
+\columnratio{0.25}
diff --git a/model_4/resources/00_preamble.tex b/model_4/resources/00_preamble.tex
index d9c52c5..c92dc33 100755
--- a/model_4/resources/00_preamble.tex
+++ b/model_4/resources/00_preamble.tex
@@ -4,15 +4,6 @@
 \pagestyle{empty}
 \pagenumbering{gobble}
 
-\usepackage{fontspec}
-\defaultfontfeatures{Ligatures={Common, Required, Contextual}}
-\setmainfont{EB Garamond}
-
-% Change the font for bold text
-\let\bf\textbf
-\renewcommand{\textbf}[1]{{\LibertineFont\selectfont\bf{#1}}}
-
-\setmonofont{Latin Modern Mono Light}
 
 
 \newcommand{\DUrolelatex}[1]{#1}
@@ -27,3 +18,8 @@
 	\@ifundefinedcolor{#1}{#3}{#2}
 }
 \makeatother
+
+\input{../common/10_language.tex}
+\input{../common/10_lists.tex}
+\input{../common/10_nowidows.tex}
+\input{../common/10_levels.tex}
diff --git a/model_4/resources/10_fonts.tex b/model_4/resources/10_fonts.tex
index 2f53033..424bb0e 100755
--- a/model_4/resources/10_fonts.tex
+++ b/model_4/resources/10_fonts.tex
@@ -1,12 +1,15 @@
-\newfontfamily\EBGaramond{EB Garamond}[

-    Mapping=tex-text,

-    Ligatures={Common, Required, Contextual}

-]

-\newfontfamily\EBLigatures{EB Garamond}[

-    Mapping=tex-text,

-    Ligatures={Common, Required, Contextual, Historic}

-]

-\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O}

+\usepackage{fontspec}

+

+\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}

 \newfontfamily\BeatrixFont[Path=../fonts/,Mapping=tex-text]{Beatrix}

+

+\defaultfontfeatures{Ligatures={Common, Required, Contextual}}

+\setmainfont{EB Garamond}

+

+% Change the font for bold text

+\let\bf\textbf

+\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}}

+

+\setmonofont{Latin Modern Mono Light}

diff --git a/model_4/resources/10_language.tex b/model_4/resources/10_language.tex
deleted file mode 100755
index 7cc0990..0000000
--- a/model_4/resources/10_language.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\RequirePackage[french]{babel}

-

-%\frenchbsetup{ItemLabeli=\color{fondetsection}\ding{251}}

-

-\selectlanguage{french}

-\frenchspacing

-\FrenchFootnotes

-

diff --git a/model_4/resources/10_levels.tex b/model_4/resources/10_levels.tex
deleted file mode 100755
index d2c8682..0000000
--- a/model_4/resources/10_levels.tex
+++ /dev/null
@@ -1,73 +0,0 @@
-\newcommand{\DUrolelevel}[1]{%

-  \resizebox{\linewidth}{!}{%

-  \begin{tikzpicture}

-    \draw (0,0) -- (5,0);

-    \fill(#1,-.1) rectangle ($ (#1,0) + (0.1, .1) $);

-  \end{tikzpicture}

-  }

-}

-

-\ifdefinedcolor{sidecolor}{%

-  \colorlet{patterncolor}{sidecolor}

-}{%

-  \colorlet{patterncolor}{textsidecolor}

-}

-

-\ifdefinedcolor{backsidecolor}{%

-  \colorlet{emptycolor}{backsidecolor}

-}{%

-  \colorlet{emptycolor}{white}

-}

-

-\usetikzlibrary{shapes.geometric,calc}

-\newcommand\starScore[2]{

-\pgfmathsetmacro\pgfxa{#1+1}

-\tikzstyle{scorestars}=[star, star points=5, star point ratio=2.25, draw,inner sep=0.15em,anchor=outer point 3]

-\begin{tikzpicture}[baseline]

-  \foreach \i in {1,...,#2} {

-    \pgfmathparse{(\i<=#1?"patterncolor":"emptycolor")}

-    \edef\starcolor{\pgfmathresult}

-    \draw (\i*1em,0) node[name=star\i,scorestars,fill=\starcolor]  {};

-   }

-   \pgfmathparse{(#1>int(#1)?int(#1+1):0}

-   \let\partstar=\pgfmathresult

-   \ifnum\partstar>0

-     \pgfmathsetmacro\starpart{#1-(int(#1))}

-     \path [clip] ($(star\partstar.outer point 3)!(star\partstar.outer point 2)!(star\partstar.outer point 4)$) rectangle 

-    ($(star\partstar.outer point 2 |- star\partstar.outer point 1)!\starpart!(star\partstar.outer point 1 -| star\partstar.outer point 5)$);

-     \fill (\partstar*1em,0) node[scorestars,fill=patterncolor]  {};

-   \fi

-

-,\end{tikzpicture}

-}

-

-

-\newcommand\roundscore[2]{

-\pgfmathsetmacro\pgfxa{#1+1}

-\tikzstyle{scorestars}=[circle, draw, inner sep=0.15em,anchor=west]

-\begin{tikzpicture}[baseline]

-  \foreach \i in {1,...,#2} {

-    \pgfmathparse{(\i<=#1?"blue!70":"lightgray")}

-    \edef\starcolor{\pgfmathresult}

-    \draw (\i*1em,0) node[name=star\i,scorestars,fill=\starcolor]  {};

-   }

-  \pgfmathparse{(#1>int(#1)?int(#1+1):0}

-  \let\partstar=\pgfmathresult

-  \ifnum\partstar>0

-    \pgfmathsetmacro\starpart{#1-(int(#1))}

-    \path [clip] (star\partstar.north west) rectangle 

-    ($(star\partstar.south west)!\starpart!(star\partstar.south east)$);

-    \fill (\partstar*1em,0) node[scorestars,fill=blue!70]  {};

-  \fi,

-

-\end{tikzpicture}

-}

-

-\newcommand{\DUrolestar}[1]{%

-  \resizebox{\linewidth}{!}{%

-  \starScore{#1}{5}

-  }

-}

-

-

-

diff --git a/model_4/resources/10_lists.tex b/model_4/resources/10_lists.tex
deleted file mode 100755
index b87845a..0000000
--- a/model_4/resources/10_lists.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\usepackage{fontawesome}
-
-\newenvironment{DUCLASSdiamondlist}{\renewcommand{\labelitemi}{$\diamond$}}{}
-\newenvironment{DUCLASSastlist}{\renewcommand{\labelitemi}{$\ast$}}{}
-\newenvironment{DUCLASScdotlist}{\renewcommand{\labelitemi}{$\cdot$}}{}
-\newenvironment{DUCLASSbulletlist}{\renewcommand{\labelitemi}{$\bullet$}}{}
-\newenvironment{DUCLASSchecklist}{\renewcommand{\labelitemi}{\faCheck}}{}
-\newenvironment{DUCLASSnonelist}{\renewcommand{\labelitemi}{}}{}
-
-\renewcommand{\labelitemi}{$\bullet$}
-\renewcommand{\labelitemii}{$\cdot$}
-\renewcommand{\labelitemiii}{$\diamond$}
-\renewcommand{\labelitemiv}{$\ast$}
-
-% Réduit l'indentation pour les éléments des listes
-\usepackage{enumitem}
-\setlist[itemize,1]{leftmargin=.0cm}
diff --git a/model_4/resources/10_nowidows.tex b/model_4/resources/10_nowidows.tex
deleted file mode 100755
index 3b96931..0000000
--- a/model_4/resources/10_nowidows.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\widowpenalty=1000
-\clubpenalty=500
diff --git a/model_4/resources/99_sidebar.tex b/model_4/resources/99_sidebar.tex
index 52dc735..36bc102 100755
--- a/model_4/resources/99_sidebar.tex
+++ b/model_4/resources/99_sidebar.tex
@@ -3,18 +3,15 @@
 \def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1}\item[]}
 \let\endchangemargin=\endlist 
 
-% Une commande dédiée pour les notes de marge
-%\setlength{\columnsep}{0.25cm}
-\columnratio{0.25}
-
 \ifdefinedcolor{backsidecolor}{%
   \backgroundcolor{c[1]}{backsidecolor}
 }{}
 
+% Une commande dédiée pour les notes de marge
 \newcommand{\DUsidebar}[1]{%
   \switchcolumn[0]
   \begin{changemargin}{0.5cm}{1cm} 
-  \LibertineFont\selectfont
+  \AltFont\selectfont
   \ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{}
   #1
   \end{changemargin}