Preparing files.

EricMarcon · Dec 21, 2017 · fdeeafd · fdeeafd
1 parent e26bd0f
commit fdeeafd
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 24,544 deletions.
diff --git a/EcoFoG.sty b/EcoFoG.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{EcoFoG}[2016/12/09 Modèle de rapport EcoFoG, v.1.10]
+\ProvidesPackage{EcoFoG}[2017/10/30 Modèle de rapport EcoFoG, v.1.11]
 
 
 % Based on memoir, style companion
@@ -32,28 +32,26 @@
 	\setlist[enumerate]{noitemsep,nolistsep}
 
 % Allow more space between words to avoid overfull boxes
-	\tolerance=500						% default 200
+	\tolerance=500                % default 200
 
-\RequirePackage{marginfix} 				% Adjust margin paragraphs vertical position
+\RequirePackage{marginfix}      % Adjust margin paragraphs vertical position
 
 % International fonts
 \RequirePackage[utf8]{inputenc}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{lmodern}
-\RequirePackage{microtype}				% Letter spacing
+\RequirePackage{microtype}      % Letter spacing
 
 \RequirePackage[french, english]{babel}	% http://en.wikibooks.org/wiki/LaTeX/Internationalization#French
-\RequirePackage{lettrine}				% Lettrine
-\RequirePackage{siunitx}				% units, e.g. \SI{5}{\kilo\meter}
-\RequirePackage{nth}					% English numbers, e.g. \nth{1} yields 1st (French: \ieme{} is included in babel)
+\RequirePackage{lettrine}       % Lettrine
+\RequirePackage{siunitx}        % units, e.g. \SI{5}{\kilo\meter}
+\RequirePackage{nth}            % English numbers, e.g. \nth{1} yields 1st (French: \ieme{} is included in babel)
 
 
 % Bibliography
 \RequirePackage[
-	backend=biber,
+	backend=bibtex,
 	hyperref=true,
-%	doi=false,
-%	url=false,
 	isbn=false,
 	backref=true,
 	bibstyle=authoryear-ibid,
@@ -120,11 +118,11 @@
 \RequirePackage{graphicx}
 	\graphicspath{{graphics/}}
 \RequirePackage{epstopdf}
-\RequirePackage{needspace}									% Full-width figures
-\RequirePackage[config, font=scriptsize]{caption,subfig} 	% Subfigures
+\RequirePackage{needspace}                                % Full-width figures
+\RequirePackage[config, font=scriptsize]{caption,subfig}  % Subfigures
 
 % Tables
-\RequirePackage{multirow} 									% Merge table lines
+\RequirePackage{multirow}                                 % Merge table lines
 
 % Text blocks
 \RequirePackage[absolute,overlay]{textpos} 
@@ -139,9 +137,13 @@
 % Internal hyperlinks
 \RequirePackage{hyperref}
 \hypersetup{
-	pdfborder={0 0 0}		% No borders around internal hyperlinks
+	pdfborder={0 0 0}         % No borders around internal hyperlinks
 }
-\RequirePackage{memhfixc}		% Necessary for memoir + hyperref
+\RequirePackage{memhfixc}   % Necessary for memoir + hyperref
+
+% PDF pages insertion
+\RequirePackage{pdfpages}
+
 
 
 %%% PAGE LAYOUT 
@@ -253,9 +255,7 @@
 	\setmarginnotes{0.1in}{0.1in}{0.1in}
 	\setulmarginsandblock{1.5in}{1in}{*}
 	\checkandfixthelayout
-	\makeatletter
 	\ch@ngetext
-	\makeatletter
 	\clearpage
 	\setlength{\widthw}{\textwidth+\marginparsep+\marginparwidth}
 	\footnotesatfoot
@@ -270,9 +270,7 @@
 	\setsidecaps{0.2in}{1.8in}
 	\setulmarginsandblock{1.5in}{1in}{*}
 	\checkandfixthelayout
-	\makeatletter
 	\ch@ngetext
-	\makeatletter
 	\clearpage
 	\setlength{\widthw}{\textwidth+\marginparsep+\marginparwidth}
 	\footnotesinmargin
@@ -342,6 +340,20 @@
 	\newpage
 }
 
+% Clear page and open an even one (\clearpage opens an odd one)
+\newcommand{\evenpage}{
+  \clearpage
+	\strictpagecheck % slower but efficient detection of odd/even pages
+  \checkoddpage
+  \ifoddpage
+    \thispagestyle{empty}
+    ~\\ % Print a character or the page will not exist
+    \newpage
+  \else
+    % do nothing
+  \fi
+}
+
 
 % code command
 \newcommand{\code}[1]{\begingroup \ttfamily #1\endgroup}

diff --git a/Mesures_de_la_Biodiversite.Rnw b/Mesures_de_la_Biodiversite.Rnw
@@ -24,7 +24,7 @@
 
 %%% BIBLIOGRAPHY FILE
 %%%------------------------------------------------------------------------------
-\addbibresource{library.bib}
+\addbibresource{../library.bib}
 
 %%% THE DOCUMENT
 %%%-------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ par(mar=c(0,0,0,0))
 
 
 \selectlanguage{english}
-\sisetup{locale = EN}
+\sisetup{locale = UK}
 
 %%%------------------------------------------------------------------------------
 \frontmatter

diff --git a/Neutre.Rnw b/Neutre.Rnw
@@ -13,7 +13,7 @@ data(Paracou618)
 
 \LargeMargins
 \selectlanguage{english}
-\sisetup{locale = EN}
+\sisetup{locale = UK}
 \chapter[Mesures neutres de la diversité alpha ou gamma]{Mesures neutres de la diversité $\alpha$ ou $\gamma$}
 \label{chap:MesuresNeutres}
 

diff --git a/Notations.Rnw b/Notations.Rnw
@@ -11,7 +11,7 @@ par(mar=c(0,0,0,0))
 
 \LargeMargins
 \selectlanguage{english}
-\sisetup{locale = EN}
+\sisetup{locale = UK}
 \LargeMargins
 \chapter{Notations}
 

diff --git a/Notions.Rnw b/Notions.Rnw
@@ -11,7 +11,7 @@ par(mar=c(0,0,0,0))
 
 \LargeMargins
 \selectlanguage{english}
-\sisetup{locale = EN}
+\sisetup{locale = UK}
 \chapter{Notions de Diversité}
 
 \lettrine{L}{e terme} \foreignlanguage{english}{\emph{biodiversity}} est attribué \autocite{Meine2006} à Walter Rosen, un membre du \emph{National Research Council} américain, qui a commencé à contracter les termes \foreignlanguage{english}{\emph{biological diversity}} pendant la préparation d'un colloque dont les actes seront publiés sous le titre \foreignlanguage{english}{\og Biodiversity\fg{}} \autocite{Wilson1988}.

diff --git a/Phylodiversite.Rnw b/Phylodiversite.Rnw
@@ -13,7 +13,7 @@ data(Paracou618)
 
 \LargeMargins
 \selectlanguage{english}
-\sisetup{locale = EN}
+\sisetup{locale = UK}
 \chapter{Cadre}
 
 \begin{Essentiel}

diff --git a/Spatial.Rnw b/Spatial.Rnw
@@ -14,7 +14,7 @@ data(Paracou618)
 
 \LargeMargins
 \selectlanguage{english}
-\sisetup{locale = EN}
+\sisetup{locale = UK}
 \chapter[Cadre]{Cadre}