Added a new model, and did some factorisation

13 files changed, 49 insertions, 194 deletions

diff --git a/model_1/example.pdf b/model_1/example.pdf
index 9520951..1b21296 100644
--- a/model_1/example.pdf
+++ b/model_1/example.pdf
diff --git a/model_1/resources/00_colors.tex b/model_1/resources/00_colors.tex
index 376b77b..567d01b 100755
--- a/model_1/resources/00_colors.tex
+++ b/model_1/resources/00_colors.tex
@@ -9,3 +9,4 @@
 

 % Couleur utilisée pour le texte du bandeau

 \definecolor{textsidecolor}{RGB}{255,255,255}

+\definecolor{altColor}{RGB}{255,255,255}

diff --git a/model_1/resources/00_length.tex b/model_1/resources/00_length.tex
new file mode 100755
index 0000000..36dd81a
--- /dev/null
+++ b/model_1/resources/00_length.tex
@@ -0,0 +1,6 @@
+% Distance de la colonne
+\setlength{\columnsep}{0.25cm}
+
+
+% Occupation de la colonne 
+\columnratio{0.25}
diff --git a/model_1/resources/00_preamble.tex b/model_1/resources/00_preamble.tex
index c5f02fc..99d4658 100755
--- a/model_1/resources/00_preamble.tex
+++ b/model_1/resources/00_preamble.tex
@@ -4,21 +4,6 @@
 \pagestyle{empty}
 \pagenumbering{gobble}
 
-\usepackage{fontspec}
-\defaultfontfeatures{Ligatures={Common, Required, Contextual}}
-\setmainfont{EB Garamond}
-
-\newcommand{\DUtitletitle}[1]{%
-    {\begin{center}\textbf{\textsc{#1}}\end{center}}
- }
-
-% 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}
 
 % Supprime l'indentation pour les listes de définitions
@@ -31,3 +16,11 @@
 	\@ifundefinedcolor{#1}{#3}{#2}
 }
 \makeatother
+
+
+\input{../common/10_language.tex}
+\input{../common/10_lists.tex}
+\input{../common/10_icons.tex}
+\input{../common/10_nowidows.tex}
+\input{../common/10_levels.tex}
+\input{../common/99_sidebar.tex}
diff --git a/model_1/resources/10_fonts.tex b/model_1/resources/10_fonts.tex
index cdd96f7..24f6cfc 100755
--- a/model_1/resources/10_fonts.tex
+++ b/model_1/resources/10_fonts.tex
@@ -1,11 +1,29 @@
-\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}

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

+\setmainfont{EB Garamond}

+

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

+  [ Mapping=tex-text ]

+

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

diff --git a/model_1/resources/10_language.tex b/model_1/resources/10_language.tex
deleted file mode 100755
index 7cc0990..0000000
--- a/model_1/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_1/resources/10_levels.tex b/model_1/resources/10_levels.tex
deleted file mode 100755
index d2c8682..0000000
--- a/model_1/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_1/resources/10_lists.tex b/model_1/resources/10_lists.tex
deleted file mode 100755
index b87845a..0000000
--- a/model_1/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_1/resources/10_nowidows.tex b/model_1/resources/10_nowidows.tex
deleted file mode 100755
index e04cb18..0000000
--- a/model_1/resources/10_nowidows.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\widowpenalty=1000
-\clubpenalty=1000
diff --git a/model_1/resources/10_title_style.tex b/model_1/resources/10_title_style.tex
index f1fdc16..e784ecb 100755
--- a/model_1/resources/10_title_style.tex
+++ b/model_1/resources/10_title_style.tex
@@ -1,13 +1,11 @@
 \usepackage{titlesec}

 

 \providecommand{\DUdocumentsubtitle}[1]{%

-  %\begin{nthcolumn}{1}

   \color{black}

   \em

   \EBLigatures\selectfont

   \Large

   #1

-  %\end{nthcolumn}

 }

 

 \makeatletter

diff --git a/model_1/resources/90_ref.tex b/model_1/resources/90_ref.tex
deleted file mode 100755
index 96edd79..0000000
--- a/model_1/resources/90_ref.tex
+++ /dev/null
@@ -1,35 +0,0 @@
-\usepackage[
-    pdfencoding=auto,
-    linkbordercolor={0.5 0 0},
-    citebordercolor={0 0 0.5},
-    urlbordercolor=textsidecolor,
-    pdfborderstyle={/S/U/W 1}
-]{hyperref}
-
-% Remove the underline for the footnotes
-\providecommand*{\DUfootnotemark}[3]{%
-  \hypersetup{pdfborderstyle={/W 0}}%
-  \raisebox{1em}{\hypertarget{#1}{}}%
-  \hyperlink{#2}{\textsuperscript{#3}}%
-  \hypersetup{pdfborderstyle={/S/U/W 1}}%
-}
-
-\providecommand{\DUfootnotetext}[4]{%
-  \begingroup%
-  \renewcommand{\thefootnote}{%
-    \protect\hypersetup{pdfborderstyle={/W 0}}%
-    \protect\raisebox{1em}{\protect\hypertarget{#1}{}}%
-    \protect\hyperlink{#2}{#3}
-    \protect\hypersetup{pdfborderstyle={/S/U/W 1}}%
-  }%
-  \footnotetext{#4}%
-  \endgroup%
-}
-
-\let\tableofcontentsWithoutRefMarks\tableofcontents
-
-\renewcommand{\tableofcontents}{%
-    \protect\hypersetup{pdfborderstyle={/W 0}}%
-    \tableofcontentsWithoutRefMarks
-    \protect\hypersetup{pdfborderstyle={/S/U/W 1}}%
-}
diff --git a/model_1/resources/99_begin.tex b/model_1/resources/99_begin.tex
new file mode 100755
index 0000000..7b7a793
--- /dev/null
+++ b/model_1/resources/99_begin.tex
@@ -0,0 +1,7 @@
+\input{../common/90_ref.tex}
+
+% On charge les colonnes dès le début du document.
+\AtBeginDocument{%
+  \begin{paracol}{2}
+}
+
diff --git a/model_1/resources/99_sidebar.tex b/model_1/resources/99_sidebar.tex
deleted file mode 100755
index 470f4c2..0000000
--- a/model_1/resources/99_sidebar.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\newlength{\notesep}
-
-\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[0]}{backsidecolor}
-}{}
-
-\newcommand{\DUsidebar}[1]{%
-  \switchcolumn[0]
-  \begin{changemargin}{0.7cm}{0.7cm} 
-  \LibertineFont\selectfont
-  \ifdefinedcolor{textsidecolor}{\color{textsidecolor}}{}
-  #1
-  \end{changemargin}
-  \vspace{\notesep}
-  \switchcolumn
-  \ifdefinedcolor{textsidecolor}{\color{black}}{}
-}
-
-\AtBeginDocument{%
-  \begin{paracol}{2}
-}
-\AtEndDocument{%
-  % Make the column go to the bottom
-  \flushpage
-  \end{paracol}
-}