diff --git a/rapport_francais/headfoot_content_francais.tex b/rapport_francais/headfoot_content_francais.tex
index 03b1ae7ba286dec2e390f7ac65faa7134881f58d..f7f6fd9662f322ab6ceb4e51e6cbec16104ae833 100644
--- a/rapport_francais/headfoot_content_francais.tex
+++ b/rapport_francais/headfoot_content_francais.tex
@@ -19,7 +19,7 @@
% RO : champ droit pour les pages impaires
%*******************************************************************************
-
+\restoregeometry
\fancyhf{} % sets both header and footer to nothing
\renewcommand{\headrulewidth}{0pt} % Remove the top horizontal bar in fancyhdr http://tex.stackexchange.com/a/13897
diff --git a/rapport_francais/preambule_rapport_francais.tex b/rapport_francais/preambule_rapport_francais.tex
index 5250efb77aebc712e2ebf905c0cdfa321901fd4b..1709d09acd4e1eff4468b42b9cf1f4c2f6540f66 100644
--- a/rapport_francais/preambule_rapport_francais.tex
+++ b/rapport_francais/preambule_rapport_francais.tex
@@ -13,6 +13,13 @@
\usepackage{amssymb}
\usepackage{graphicx}
+% Quotations
+% @see https://fr.sharelatex.com/learn/Typesetting_quotations
+% @usage the environment displayquote prints a display quotation and the command \textquote an in-line quotation
+\usepackage{csquotes}
+% displayquote in italic
+\renewcommand{\mkbegdispquote}[2]{\itshape}
+
% Gestion de la bibliographie avec biblatex
\usepackage[
backend=bibtex,
@@ -40,6 +47,9 @@
\usepackage{textcomp} % Unicode degree symbol °
+% Ecrire les siècles
+\def\siecle#1{\textsc{\romannumeral #1}\textsuperscript{e}~siècle}
+
% Supprime les liens moches et permet le retour à la ligne du ToC
\PassOptionsToPackage{hyphens}{url}\usepackage[hidelinks,breaklinks]{hyperref}
@@ -50,6 +60,13 @@
% http://www.xm1math.net/doculatex/tableaux.html
\usepackage{array,multirow,makecell}
+%How to create fixed width table columns with text raggedright/centered/raggedleft?
+% @see https://tex.stackexchange.com/a/12712
+% @example \begin{tabular}{| c | L{3cm} | C{3cm} | R{3cm} |}
+\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}
+\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}
+\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}
+
% Avoir la possibilité de ne pas avoir de césure sur un bloc de texte (pour le titre en page de garde) http://tex.stackexchange.com/a/5003
% @example \nohyphens{(text block)}
\usepackage{hyphenat}
@@ -105,6 +122,10 @@
% @example \cfoot{\thepage\ sur \pageref{LastPage}}
% @see https://fr.wikibooks.org/wiki/LaTeX/Mise_en_page
\usepackage{lastpage}
+% Style de page du rapport
+\fancypagestyle{rapport}{
+\input{rapport_francais/headfoot_content_francais}
+}
% Quatrième de couverture
% @see http://latex-community.org/forum/viewtopic.php?t=26188#p92083
@@ -114,6 +135,8 @@
}
% Todo notes
+% @usage The todonotes package makes three commands available to the user: \todo[]{}, \missingfigure{} and \listoftodos.
\usepackage{todonotes}
+% Ajustement des bulles todo mises dans la marge
\setlength{\marginparwidth}{1.6cm}
%\let\marginpar\oldmarginpar
\ No newline at end of file
diff --git a/rapport_irstea.tex b/rapport_irstea.tex
index ed71a0ee846151dacd1368f3982cc4af4954c51f..f2cfebeea3b007275f9d36460ac877e6c792fc1c 100644
--- a/rapport_irstea.tex
+++ b/rapport_irstea.tex
@@ -92,8 +92,10 @@
\chapter{Annexes}
-%\input{contenu/annexes}
+\input{contenu/annexes}
+
+\input{rapport_irstea/nuancier_irsteacolors}
\chapter{Remerciements}
\input{contenu/remerciements}
diff --git a/rapport_irstea/irsteacolors.sty b/rapport_irstea/irsteacolors.sty
new file mode 100644
index 0000000000000000000000000000000000000000..b3244e4861e85882e59d594755a4ff7ae1abc386
--- /dev/null
+++ b/rapport_irstea/irsteacolors.sty
@@ -0,0 +1,75 @@
+% Defines Irstea palette for use with LaTeX.
+%
+% Copyright 2013 by Dominique Heitz <dominique.heitz _at_ irstea.fr>
+%
+% This program can be redistributed and/or modified under the terms
+% of the GNU Public License, version 2.
+
+% prairie
+\definecolor{prairie}{rgb}{0.643137254901961, 0.768627450980392, 0.}
+\definecolor{prairie2}{rgb}{0.882352941176471, 0.925490196078431, 0.776470588235294}
+
+% océan
+\definecolor{ocean}{rgb}{0., 0.619607843137255, 0.87843137254902}
+\definecolor{ocean2}{rgb}{0.733333333333333, 0.882352941176471, 0.929411764705882}
+
+% marine
+\definecolor{marine}{rgb}{0., 0.227450980392157, 0.501960784313725}
+
+% acier
+\definecolor{acier}{rgb}{0.572549019607843, 0.576470588235294, 0.631372549019608}
+
+% bleu foncé
+\definecolor{bleufonce}{rgb}{0.0156862745098039, 0.16078431372549, 0.427450980392157}
+\definecolor{bleufonce2}{rgb}{0.686274509803922, 0.701960784313725, 0.792156862745098}
+
+% gris
+\definecolor{gris}{rgb}{0.380392156862745, 0.380392156862745, 0.450980392156863}
+
+
+
+
+% butter (yellowish)
+\definecolor{tabutter}{rgb}{0.98824, 0.91373, 0.30980} % #fce94f
+\definecolor{ta2butter}{rgb}{0.92941, 0.83137, 0} % #edd400
+\definecolor{ta3butter}{rgb}{0.76863, 0.62745, 0} % #c4a000
+
+% orange
+\definecolor{taorange}{rgb}{0.98824, 0.68627, 0.24314} % #fcaf3e
+\definecolor{ta2orange}{rgb}{0.96078, 0.47451, 0} % #f57900
+\definecolor{ta3orange}{rgb}{0.80784, 0.36078, 0} % #ce5c00
+
+% chocolate (brownish)
+\definecolor{tachocolate}{rgb}{0.91373, 0.72549, 0.43137} % #e9b96e
+\definecolor{ta2chocolate}{rgb}{0.75686, 0.49020, 0.066667} % #c17d11
+\definecolor{ta3chocolate}{rgb}{0.56078, 0.34902, 0.0078431} % #8f5902
+
+% chameleon (greenish)
+\definecolor{tachameleon}{rgb}{0.54118, 0.88627, 0.20392} % #8ae234
+\definecolor{ta2chameleon}{rgb}{0.45098, 0.82353, 0.086275} % #73d216
+\definecolor{ta3chameleon}{rgb}{0.30588, 0.60392, 0.023529} % #4e9a06
+
+% sky blue
+\definecolor{taskyblue}{rgb}{0.44706, 0.56078, 0.81176} % #728fcf
+\definecolor{ta2skyblue}{rgb}{0.20392, 0.39608, 0.64314} % #3465a4
+\definecolor{ta3skyblue}{rgb}{0.12549, 0.29020, 0.52941} % #204a87
+
+% plum (violettish)
+\definecolor{taplum}{rgb}{0.67843, 0.49804, 0.65882} % #ad7fa8
+\definecolor{ta2plum}{rgb}{0.45882, 0.31373, 0.48235} % #75507b
+\definecolor{ta3plum}{rgb}{0.36078, 0.20784, 0.4} % #5c3566
+
+% scarlet red
+\definecolor{tascarletred}{rgb}{0.93725, 0.16078, 0.16078} % #ef2929
+\definecolor{ta2scarletred}{rgb}{0.8, 0, 0} % #cc0000
+\definecolor{ta3scarletred}{rgb}{0.64314, 0, 0} % #a40000
+
+% aluminium
+\definecolor{taaluminium}{rgb}{0.93333, 0.93333, 0.92549} % #eeeeec
+\definecolor{ta2aluminium}{rgb}{0.82745, 0.84314, 0.81176} % #d3d7cf
+\definecolor{ta3aluminium}{rgb}{0.72941, 0.74118, 0.71373} % #babdb6
+
+% gray
+\definecolor{tagray}{rgb}{0.53333, 0.54118, 0.52157} % #888a85
+\definecolor{ta2gray}{rgb}{0.33333, 0.34118, 0.32549} % #555753
+\definecolor{ta3gray}{rgb}{0.18039, 0.20392, 0.21176} % #2e3436
diff --git a/rapport_irstea/nuancier_irsteacolors.tex b/rapport_irstea/nuancier_irsteacolors.tex
new file mode 100644
index 0000000000000000000000000000000000000000..46fcafe87c54c4a59fe7e5328cbc0e2ecaab0d09
--- /dev/null
+++ b/rapport_irstea/nuancier_irsteacolors.tex
@@ -0,0 +1,35 @@
+% Affichage d'un nuancier des couleurs utilisées dans la charte graphique Irstea
+% @usage Ajouter "\RequirePackage{rapport_irstea/irsteacolors}" dans le préambule d'un rapport
+% et importer ce fichier dans le corps du rapport "\input{rapport_irstea/nuancier_irsteacolors}"
+% @author David Dorchies
+% @date Juin 2017
+
+\section{Nuancier charte graphique Irstea}
+
+\newcommand{\nuancier}[1]{
+\begin{minipage}[c]{1.2cm}
+\begin{tikzpicture}
+\filldraw [fill=#1, draw=black] (0,0) rectangle ++(1,1);
+\end{tikzpicture}
+\end{minipage}
+\begin{minipage}[c]{2.8cm}
+#1
+\end{minipage}
+}
+
+\begin{center}
+\begin{tabular}{ccc}
+\nuancier{prairie} & \nuancier{prairie2} & \nuancier{ocean} \\[1cm]
+\nuancier{ocean2} & \nuancier{marine} & \nuancier{acier} \\[1cm]
+\nuancier{bleufonce} & \nuancier{bleufonce2} & \nuancier{gris} \\[1cm]
+\nuancier{tabutter} & \nuancier{ta2butter} & \nuancier{ta3butter} \\[1cm]
+\nuancier{taorange} & \nuancier{ta2orange} & \nuancier{ta3orange} \\[1cm]
+\nuancier{tachocolate} & \nuancier{ta2chocolate} & \nuancier{ta3chocolate} \\[1cm]
+\nuancier{tachameleon} & \nuancier{ta2chameleon} & \nuancier{ta3chameleon} \\[1cm]
+\nuancier{taskyblue} & \nuancier{ta2skyblue} & \nuancier{ta3skyblue} \\[1cm]
+\nuancier{taplum} & \nuancier{ta2plum} & \nuancier{ta3plum} \\[1cm]
+\nuancier{tascarletred} & \nuancier{ta2scarletred} & \nuancier{ta3scarletred} \\[1cm]
+\nuancier{taaluminium} & \nuancier{ta2aluminium} & \nuancier{ta3aluminium} \\[1cm]
+\nuancier{tagray} & \nuancier{ta2gray} & \nuancier{ta3gray} \\[1cm]
+\end{tabular}
+\end{center}
\ No newline at end of file
diff --git a/rapport_irstea/preambule_irstea.tex b/rapport_irstea/preambule_irstea.tex
index 8dce17cf27e464c22b58d6bb4a56692c1997e796..9b72837ce1f2e20d62553d070e070545f28511b7 100644
--- a/rapport_irstea/preambule_irstea.tex
+++ b/rapport_irstea/preambule_irstea.tex
@@ -14,12 +14,10 @@
\urlstyle{same} %http://tex.stackexchange.com/questions/261434/changing-url-font
% Definition des couleurs
+\RequirePackage{rapport_irstea/irsteacolors}
\definecolor{titreColor}{RGB}{0,58,128} % Marine
-\definecolor{marine}{RGB}{0,58,128}
-\definecolor{ocean}{RGB}{0,158,224}
-\definecolor{prairie}{RGB}{164,196,0}
-\definecolor{acier}{RGB}{146,147,161}
+
\hypersetup{
colorlinks,
diff --git a/rapport_onema/logo_afb.eps b/rapport_onema/logo_afb.eps
new file mode 100644
index 0000000000000000000000000000000000000000..d2d3ffabe8e423a92192ae9f56318553b819e199
Binary files /dev/null and b/rapport_onema/logo_afb.eps differ
diff --git a/rapport_onema/preambule_onema.tex b/rapport_onema/preambule_onema.tex
index 4439041aa269036f186b6f06d7ec50ee04a93fdb..3b227fae8e92557ef8149a0734fd3db0b267c11d 100644
--- a/rapport_onema/preambule_onema.tex
+++ b/rapport_onema/preambule_onema.tex
@@ -76,4 +76,9 @@
\section{\listfigurename}%
\@starttoc{lof}%
}
-\makeatother
\ No newline at end of file
+\makeatother
+
+% Style de page pour les résumés (entête avec logo et titre du rapport
+\fancypagestyle{resume}{
+\input{rapport_onema/headfoot_resume_onema}
+}
\ No newline at end of file
diff --git a/rapport_onema/titre_onema.tex b/rapport_onema/titre_onema.tex
index 7c9a5f71a5ec9971f29830968a150c716ac2252d..710330d0905f2dcaed24497cc3cff679d49522f4 100644
--- a/rapport_onema/titre_onema.tex
+++ b/rapport_onema/titre_onema.tex
@@ -10,12 +10,12 @@
\begin{minipage}{0.5\textwidth}
% Logo IRSTEA
-\includegraphics[width=3.06cm,height=3.06cm,keepaspectratio]{rapport_onema/logo_irstea_rvb}%
+\includegraphics[width=3cm,height=3cm,keepaspectratio]{rapport_onema/logo_irstea_rvb}%
\end{minipage}
\begin{minipage}{0.5\textwidth}
% Logo ONEMA
\begin{flushright}
-\includegraphics[width=5cm,height=3.06cm,keepaspectratio]{rapport_onema/logo_onema}%
+\includegraphics[width=7cm,height=3cm,keepaspectratio]{rapport_onema/logo_afb}%
\end{flushright}
\end{minipage}
@@ -33,7 +33,10 @@
\vspace*{2cm}
\vfill
\begin{flushleft}
+ {\setlength{\baselineskip}{2.4\baselineskip}% Problème sur les interlignes du titre
\textcolor{titreColor}{\huge\bfseries\sffamily\nohyphens\titre{}}
+ \par% Problème sur les interlignes du titre
+ }
\end{flushleft}
% sous-titre du document