From b9bbd2030bf892c1701811c7989fd19d32793308 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@irstea.fr>
Date: Fri, 17 Feb 2017 12:12:12 +0100
Subject: [PATCH] Modifications rapport ONEMA
---
.../preambule_rapport_francais.tex | 27 ++++++++++-
rapport_onema.tex | 21 ++++----
rapport_onema/headfoot_content_onema.tex | 2 +-
rapport_onema/headfoot_resume_onema.tex | 2 +-
rapport_onema/preambule_onema.tex | 48 +++++++++++++------
5 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/rapport_francais/preambule_rapport_francais.tex b/rapport_francais/preambule_rapport_francais.tex
index 21a1b82..8aacce8 100644
--- a/rapport_francais/preambule_rapport_francais.tex
+++ b/rapport_francais/preambule_rapport_francais.tex
@@ -12,14 +12,38 @@
\usepackage{amsfonts}
\usepackage{amssymb}
\usepackage{graphicx}
-\usepackage[usenames,dvipsnames]{xcolor}
+
+% Gestion de la bibliographie avec biblatex
+\usepackage[
+ backend=bibtex,
+ style=authoryear,
+ natbib=true
+]{biblatex}
+\addbibresource{biblio.bib}
+%Line breaks of long URLs in biblatex bibliography http://tex.stackexchange.com/a/134281
+\setcounter{biburllcpenalty}{7000}
+\setcounter{biburlucpenalty}{8000}
+
+% http://tex.stackexchange.com/a/13691/124910
+\usepackage{tocstyle}
+
+% Ajout de la gestion des couleurs
+% The \usepackage is obvious, but the initialization of additional commands like usenames allows you to use names of the default colors, the same 16 base colors as used in HTML. The dvipsnames allows you access to more colors, another 64, and svgnames allows access to about 150 colors. The initialization of "table" allows colors to be added to tables by placing the color command just before the table. https://en.wikibooks.org/wiki/LaTeX/Colors
+% @see http://mirrors.ircam.fr/pub/CTAN/macros/latex/contrib/xcolor/xcolor.pdf
+\usepackage[usenames,dvipsnames,svgnames,table]{xcolor}
+
\usepackage{textcomp} % Unicode degree symbol °
% Supprime les liens moches et permet le retour à la ligne du ToC
\usepackage[hidelinks,breaklinks]{hyperref}
+% Définition des marges
\usepackage[left=2cm,right=2cm,top=2cm,bottom=2cm]{geometry}
+% Table's definition
+% http://www.xm1math.net/doculatex/tableaux.html
+\usepackage{array,multirow,makecell}
+
% Superposition d'image pour la page de garde
\usepackage[percent]{overpic}
@@ -37,7 +61,6 @@
% Liens colorés http://tex.stackexchange.com/a/12408
\usepackage{url}
-\usepackage{xcolor}
\hypersetup{
colorlinks,
linkcolor={blue!50!black},
diff --git a/rapport_onema.tex b/rapport_onema.tex
index 6458428..aa86008 100644
--- a/rapport_onema.tex
+++ b/rapport_onema.tex
@@ -7,8 +7,6 @@
\documentclass[12pt,a4paper,titlepage,twoside]{report}
% Insertion des différents préambules au document
-\input{rapport_francais/preambule_rapport_francais}
-\input{rapport_francais/preambule_tables_matieres_par_partie}
\input{rapport_onema/preambule_onema}
@@ -52,23 +50,25 @@
\newpage
\input{contenu/synthese}
+
% Table des matières
\cleardoublepage
\tableofcontents
-\input{contenu/chap1}
-\input{contenu/chap2}
+%\input{contenu/chap1}
+
+
+%\input{contenu/chap2}
+
+% Bibliographie
\chapter{Bibliographie}
-\bibliographystyle{apalike}
-% Modifier la ligne suivante en fonction du nom du fichier .bib utilisé (ici biblio.bib)
-\bibliography{biblio}
+\printbibliography[heading=none]
-\chapter{Table des illustrations}
+\chapter{Table des illustrations}
\listoffigures
-
\listoftables
%TRAITEMENT DES ILLUSTRATIONS
@@ -80,12 +80,13 @@
\chapter{Annexes}
-\input{contenu/annexes}
+%\input{contenu/annexes}
\chapter{Remerciements}
\input{contenu/remerciements}
+
% 4ème de couverture
\cleartobackcover
\input{rapport_onema/backcover.tex}
diff --git a/rapport_onema/headfoot_content_onema.tex b/rapport_onema/headfoot_content_onema.tex
index 68a7f58..03b1ae7 100644
--- a/rapport_onema/headfoot_content_onema.tex
+++ b/rapport_onema/headfoot_content_onema.tex
@@ -23,5 +23,5 @@
\fancyhf{} % sets both header and footer to nothing
\renewcommand{\headrulewidth}{0pt} % Remove the top horizontal bar in fancyhdr http://tex.stackexchange.com/a/13897
-\fancyfoot[C]{\thepage/\pageref{LastPage}}
+\fancyfoot[C]{\thepage/\pageref*{LastPage}}
diff --git a/rapport_onema/headfoot_resume_onema.tex b/rapport_onema/headfoot_resume_onema.tex
index 1eb2c30..ee28511 100644
--- a/rapport_onema/headfoot_resume_onema.tex
+++ b/rapport_onema/headfoot_resume_onema.tex
@@ -21,5 +21,5 @@
\fancyhead[L]{}
-\fancyfoot[C]{\thepage/\pageref{LastPage}}
+\fancyfoot[C]{\thepage/\pageref*{LastPage}}
diff --git a/rapport_onema/preambule_onema.tex b/rapport_onema/preambule_onema.tex
index ed69d14..787d44e 100644
--- a/rapport_onema/preambule_onema.tex
+++ b/rapport_onema/preambule_onema.tex
@@ -20,22 +20,29 @@
% Definition des titres
\usepackage{titlesec}
\titleformat{\chapter}
+ [block]
{\color{titreColor}\normalfont\Large\bfseries\sffamily}
{\thechapter}{0.5em}{}
\titleformat{\section}
- {\normalfont\Large\bfseries\sffamily}
+ [block]
+ {\normalfont\Large\bfseries\sffamily\raggedright}
{\thesection}{0.5em}{}
\titleformat{\subsection}
- {\bfseries\sffamily\itshape}
+ [block]
+ {\normalfont\bfseries\sffamily\itshape\raggedright}
{\thesubsection}{0.5em}{}
-\setcounter{secnumdepth}{3} % for numbering subsubsection http://tex.stackexchange.com/a/42163
\titleformat{\subsubsection}
- {\sffamily\itshape}
+ [block]
+ {\normalfont\sffamily\itshape\raggedright}
{\thesubsubsection}{0.5em}{}
+\setcounter{secnumdepth}{3} % for numbering subsubsection http://tex.stackexchange.com/a/42163
+
+% Définition du format des paragraphes
+\setlength{\parskip}{0.5em}
% Format des titres utilisés dans le préambule du rapport (Auteurs, résumé...)
\newcommand{\titrepreambule}[1]{
@@ -53,17 +60,30 @@
% Replace hyphen by bullet in list
\usepackage{enumitem}
-
-% Table's definition
-% http://www.xm1math.net/doculatex/tableaux.html
-\usepackage{array,multirow,makecell}
-\setcellgapes{1pt}
-\makegapedcells
-\newcolumntype{R}[1]{>{\raggedleft\arraybackslash }b{#1}}
-\newcolumntype{L}[1]{>{\raggedright\arraybackslash }b{#1}}
-\newcolumntype{C}[1]{>{\centering\arraybackslash }b{#1}}
+\setlist[itemize]{label=\raisebox{0.25ex}{$\bullet$}}
% Page de N Ã M
% @example \cfoot{\thepage\ sur \pageref{LastPage}}
% @see https://fr.wikibooks.org/wiki/LaTeX/Mise_en_page
-\usepackage{lastpage}
\ No newline at end of file
+\usepackage{lastpage}
+
+% Acronymes
+\usepackage[printonlyused,withpage]{acronym}
+
+% Numbers too close to figure captions in List of Figures http://tex.stackexchange.com/a/117089/124910
+\makeatletter
+\def\l@figure{\@dottedtocline{1}{1.5em}{3.5em}}
+\def\l@table{\@dottedtocline{1}{1.5em}{3.5em}}
+\makeatother
+
+% List of figures and tables as sections in a report https://texblog.org/2014/03/25/table-of-contents-list-of-figures-and-tables-as-sections-in-a-report/
+\makeatletter
+\renewcommand\listoftables{%
+ \section{\listtablename}%
+ \@starttoc{lot}%
+}
+\renewcommand\listoffigures{%
+ \section{\listfigurename}%
+ \@starttoc{lof}%
+}
+\makeatother
\ No newline at end of file
--
GitLab