yathesis (14apr20)

git-svn-id: svn://tug.org/texlive/trunk@54740 c570f23f-e606-0410-a88d-b1316a301751

18 files changed, 514 insertions, 650 deletions

diff --git a/Master/texmf-dist/doc/latex/yathesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/yathesis/CHANGELOG.md
index b69c6a9c6f5..8355f3c1582 100644
--- a/Master/texmf-dist/doc/latex/yathesis/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/yathesis/CHANGELOG.md
@@ -1,5 +1,21 @@
 # [Unreleased]
 
+# [1.0.2] - 2020-04-13
+
+## Changed
+
+- Specimens now highlight the automatic local tocs and local bibs features of
+  the class.
+- Verso of the asbtract page now with empty footer.
+- Completion file for TeXstudio improved and updated.
+
+## Fixed
+- Switches between pages styles robustified.
+- Bug #65 now for bibtex as well.
+- French rules were applied to glossaries and acronyms even in case of
+  `mainlanguage=english`.
+- Subtitles were too close to multiline titles.
+
 # [1.0.1] - 2020-03-28
 
 ## Changed
diff --git a/Master/texmf-dist/doc/latex/yathesis/README.md b/Master/texmf-dist/doc/latex/yathesis/README.md
index ada8c793b7e..3bc87c50391 100644
--- a/Master/texmf-dist/doc/latex/yathesis/README.md
+++ b/Master/texmf-dist/doc/latex/yathesis/README.md
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------
 
-- `yathesis` --- Yet Another Thesis Class, version 1.0.1
+- `yathesis` --- Yet Another Thesis Class, version 1.0.2
 - E-mail: `denis.bitouze@univ-littoral.fr`
 - Released under the LaTeX Project Public License v1.3c or later. See
   http://www.latex-project.org/lppl.txt
diff --git a/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl b/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
index 83f0c7af572..c7c13d8c8cd 100644
--- a/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
+++ b/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
@@ -1,47 +1,46 @@
 # mode: yathesis.cls
-# denisbitouze, 2020-03-26
+# denisbitouze, 2020-04-05
 #
-#include:class-book
-#include:latex-document
-#include:latex-mathsymbols
-#include:tex
-#include:pgfopts
+#include:adjustbox
+#include:array
+#include:babel
+#include:biblatex
+#include:bookmark
+#include:colophon
+#include:csquotes
+#include:datatool
+#include:datetime
+#include:draftwatermark
+#include:environ
+#include:epigraph
+#include:etoc
 #include:etoolbox
-#include:xpatch
-#include:morewrites%
 #include:filehook
-#include:hopatch
-#include:xifthen
-#include:xkeyval%
+#include:fncychap
 #include:geometry
 #include:graphicx
-#include:environ
-#include:adjustbox
-#include:array
-#include:xstring
-#include:textcase
-#include:translator
+#include:hopatch
+#include:hypcap
+#include:ifdraft
+#include:iflang
 #include:iftex
-#include:epigraph
-#include:tcolorbox
+#include:letltxmacro
 #include:marvosym
+#include:morewrites
+#include:nonumonpart
+#include:pgfopts
 #include:setspace
-#include:etoc
+#include:tcolorbox
+#include:textcase
+#include:titleps
 #include:tocbibind
-#include:nonumonpart
+#include:translator
+#include:twoopt
 #include:xcolor
-#include:datatool
-#include:fncychap
-#include:titleps
-#include:ifdraft
-#include:colophon
-#include:draftwatermark
-#include:babel
-#include:iflang
-#include:datetime
-#include:hypcap
-#include:bookmark
-#include:glossaries-babel
+#include:xifthen
+#include:xkeyval
+#include:xpatch
+#include:xstring
 #
 # Document class
 #keyvals:\documentclass/yathesis
@@ -132,39 +131,17 @@ datetime
 \doctoralschool[%<précision(s)%>]{nom de l'école doctorale%text}#n
 \laboratory[%<précision(s)%>]{%<nom du laboratoire%>}{%<adresse du laboratoire%>}#n
 #
-#keyvals:\pres
-logo=
-logoheight=
-url=
-#endkeyvals
-#keyvals:\comue
+#keyvals:\pres,\comue,\doctoralschool
 logo=
 logoheight=
 url=
 #endkeyvals
-#keyvals:\institute
+#keyvals:\institute,\coinstitute,\company
 logo=
 logoheight=
 url=
 nologo
 #endkeyvals
-#keyvals:\coinstitute
-logo=
-logoheight=
-url=
-nologo
-#endkeyvals
-#keyvals:\company
-logo=
-logoheight=
-url=
-nologo
-#endkeyvals
-#keyvals:\doctoralschool
-logo=
-logoheight=
-url=
-#endkeyvals
 #keyvals:\laboratory
 logo=
 logoheight=
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/add-ons.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/add-ons.tex
index 017bcbf332f..027e0067c2c 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/add-ons.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/add-ons.tex
@@ -8,6 +8,9 @@ différents éditeurs de texte.
 \index{éditeur de texte!TeXstudio@\texstudio}%
 \index{TeXstudio@\texstudio}%
 
+\changes{v1.0.2}{2020-04-13}{Fichier de complétion de \texstudio{} amélioré et
+  mis à jour}%
+
 L'éditeur \href{http://texstudio.sourceforge.net/}{\texstudio} est livré avec un
 système de complétion\index{complétion} et de vérification de l'orthographe des
 commandes, environnemens et clés pour un grand nombre de classes et
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/specimens-canevas.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/specimens-canevas.tex
index 9ed1dd1877e..04d63154a17 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/specimens-canevas.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/specimens-canevas.tex
@@ -49,11 +49,15 @@ Les deux canevas et deux spécimens ainsi proposés ont pour but :
     }%
   \end{tcolorbox}
   %
+  \changes{v1.0.2}{2020-04-13}{Les fonctionnalités de tables des matières
+    locales automatiques et de bibliographies locales automatiques sont désormais
+    illustrées dans les spécimens de thèses}%
+  \changes{v1.0.1}{2020-03-28}{Spécimens améliorés}%
   \changes{v0.99n}{2016-06-11}{Réorganisation des spécimens et canevas}%
   \changes{v0.99m}{2016-05-22}{Réorganisation et changement de noms des
     spécimens et canevas}%
-  \changes{v0.99m}{2016-05-22}{Spécimens et canevas intégrés au \glsxtrshort{pdf}
-    de la documentation sous la forme d'archives \gls{zip}}%
+  \changes{v0.99m}{2016-05-22}{Spécimens et canevas intégrés au
+    \glsxtrshort{pdf} de la documentation sous la forme d'archives \gls{zip}}%
   \changes{v0.99l}{2014-10-23}{Réorganisation et changement de noms des
     spécimens et canevas}%
   \changes{v0.99c}{2014-06-06}{Spécimens et canevas fournis sous forme
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/configuration/thesis.cfg b/Master/texmf-dist/doc/latex/yathesis/french/documentation/configuration/thesis.cfg
index 229e79ae17d..57660e33a85 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/configuration/thesis.cfg
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/configuration/thesis.cfg
@@ -12,8 +12,9 @@
   \yadsetup{#1}%
   \setlength{\fboxsep}{10pt}%
   \setlength{\YAD@titleboxwidth}{\linewidth-2\fboxsep-2\fboxrule}%
+  \pagestyle{titles}%
   \renewcommand*{\do}[1]{%
-    \pagestyle{titles}%
+    \cleardoublepage%
     \begingroup%
     \expandafter\selectlanguage\expandafter{##1}%
     \begin{lrbox}{\YAD@titlebox}
@@ -73,6 +74,10 @@
       }%
     \end{center}
     \endgroup%
+\ifthenelse{\equal{\YAD@colophon@location}{verso-frontcover}}{%
+  \YAD@insert@colophon%
+}{%
+}%
     \boolfalse{YAD@cover@page}%
   }%
   \expandafter\docsvlist{\YAD@mainlanguage}%
@@ -177,3 +182,10 @@
 %
 \InputIfFileExists{includeall-includeonly}{}{}
 %
+\colophontext{%
+  Document intitulé \frquote{\printtitle}, écrit par \printauthor{},
+  achevé le \today{}, composé au moyen du système de préparation de document
+  \href{https://fr.wikipedia.org/wiki/LaTeX}{\LaTeX{}} et de la classe
+  \href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} dédiée aux
+  thèses préparées en France.%
+}
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-corps.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-corps.tex
index 5d30750a389..69ee9665a1b 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-corps.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-corps.tex
@@ -203,10 +203,11 @@ simplifier l'usage.
 \begin{dbexample}{Introduction}{}
   \indexex{chapitre!non numéroté}%
   \indexex{unité!du mémoire!non numérotée}%
-  Le code suivant produit la \vref{fig-introduction} illustrant une
-  introduction (générale) non numérotée. On constate que, bien que seule la
-  commande \docAuxCommand{chapter} figure sous sa forme étoilée, aucun élément
-  de structuration de ce chapitre n'est numéroté.
+  Le code suivant produit la \vref{fig-introduction} illustrant une introduction
+  (générale) non numérotée\footnote{Et, au passage, une table des matières
+    locale. Plus de détails \vref{sec-localtoc}.}. On constate que, bien que
+  seule la commande \docAuxCommand{chapter} figure sous sa forme étoilée, aucun
+  élément de structuration de ce chapitre n'est numéroté.
   %
   \bodysample{introduction}{%
     deletekeywords={[1]introduction},%
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-liminaires.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-liminaires.tex
index 1fe9f159f31..345cd4e8ce2 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-liminaires.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-liminaires.tex
@@ -107,8 +107,8 @@ La page dédiée à la clause de non-responsabilité est produite par la command
 Pour pallier cet inconvénient, et aussi pour permettre de redéfinir la phrase
 par défaut si elle ne convient pas, on pourra recourir à la commande
 \refCom{disclaimertext}\footnote{Par souci de compatibilité ascendante, la
-  commande désormais obsolète \refCom{disclaimer} est un alias de la commande
-  \refCom{disclaimer}.}.
+  commande désormais obsolète \docAuxCommand{disclaimer} est un alias de la commande
+  \refCom{disclaimertext}.}.
 
 \begin{docCommand}[doc updated=2020-03-26]{disclaimertext}{\marg{clause}}
   \index{clause de non-responsabilité!modification}%
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/personnalisation.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/personnalisation.tex
index f9cfa422723..efef940ef86 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/personnalisation.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/personnalisation.tex
@@ -181,9 +181,9 @@ clé \refKey{localtocs/depth}.
 \documentclass[localtocs]{yathesis}
 \end{preamblecode}
 
-  Dans l'exemple précédent, les tables des matières locales vont jusqu'aux
-  sous-sections. Pour qu'elles aillent par exemple jusqu'aux sous-sous-sections,
-  on recourra à :
+  Dans l'exemple précédent (illustré \vref{fig-introduction}), les tables des
+  matières locales vont jusqu'aux sous-sections. Pour qu'elles aillent par
+  exemple jusqu'aux sous-sous-sections, on recourra à :
 \begin{preamblecode}
 \documentclass[localtocs/depth=subsubsection]{yathesis}
 \end{preamblecode}
@@ -262,7 +262,7 @@ intitulée \translateexpression{localtocname}.
 
 \begin{dbexample}{Bibliographies locales automatiques}{}
   \indexex{bibliographie!locale}%
-  Pour que chaque chapitre finisse automatiquement par sa bibliographie locale,
+  Pour que chaque chapitre finisse automatiquement par sa bibliographie locale
   il suffit de passer l'option suivante à la \yatCl{}.
 \begin{preamblecode}
 \documentclass[localbibs]{yathesis}
@@ -272,6 +272,14 @@ intitulée \translateexpression{localtocname}.
 Les bibliographies locales sont introduites par une section (non numérotée)
 intitulée \translateexpression{localbibname}.
 
+La \vref{fig-localbib} illustre cette fonctionnalité.
+\begin{figure}[htbp]
+  \centering
+  \screenshot{localbib}
+  \caption{Bibliographie locale}
+  \label{fig-localbib}
+\end{figure}
+
 \subsection{Versions du mémoire}\label{sec-versions}
 \index{version du mémoire}%
 
@@ -460,7 +468,9 @@ Ce colophon peut être personnalisé au moyen de l'option
     %
     \changes{v1.0.0}{2020-03-26}{Nouvelle option de classe
       \protect\refKey{colophon-location} permettant de modifier l'emplacement par
-      défaut (en 2\ieme{} de couverture) du colophon ou de le supprimer.}%
+      défaut (en 2\ieme{} de couverture) du colophon ou de le
+      supprimer\protect\footnote{Pour retrouver le comportement antérieur (pas
+        de colophon), il suffit de spécifier \protect\lstinline|colophon-location=nowhere|.}.}%
     %
     Cette clé permet, au moyen des valeurs suivantes, de spécifier l'emplacement
     du colophon dans le mémoire.
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex
index c169e9cceee..2eebbb57e63 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex
@@ -2,7 +2,7 @@
   Documentation de la classe \texorpdfstring{\yat}{yathesis}%
 }
 %
-\subtitle[\version{1.0.1}]{\version{1.0.1}}
+\subtitle[\version{\yathesisfileversion}]{\version{\yathesisfileversion}}
 %
 \author[denis.bitouze@univ-littoral.fr]{Denis}{Bitouzé}
 %
@@ -12,7 +12,11 @@ typesetting of theses prepared in France]{Classe LaTeX destinée à faciliter la
 %
 \keywords{mémoire, thèse, \texorpdfstring{\LaTeX}{LaTeX}, classe}{dissertation, thesis, \texorpdfstring{\LaTeX}{LaTeX}, class}
 %
-\date{\the\day}{\the\month}{\the\year}%
+\def\mysplit#1-#2-#3-{\def\myyear{#1}\def\mymonth{#2}\def\myday{#3}}
+\def\splitdate#1{\expandafter\mysplit#1-}
+\splitdate{\yathesisfiledate}
+
+\date{\myday}{\mymonth}{\myyear}%
 %
 \maketitle[nofrontcover,frametitle={drop lifted shadow}]
 
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf
index e609e99d1f9..fcb6e00bce5 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex
index c741406390b..ed9435c5235 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex
@@ -34,9 +34,8 @@
 \makeindex[title=Index des concepts,extout=pdx,extin=pnd,columnseprule]
 %
 \AtEndPreamble{%
-  \changes{v1.0.1}{2020-03-28}{Documentation révisée}%
-  \changes{v1.0.1}{2020-03-28}{Correction de bugs}%
-  \changes{v1.0.1}{2020-03-28}{Spécimens améliorés}%
+  \changes{v1.0.2}{2020-04-13}{Documentation révisée}%
+  \changes{v1.0.2}{2020-04-13}{Correction de bugs}%
   \changes{v1.0.0}{2020-03-26}{Documentation révisée}%
   \changes{v1.0.0}{2020-03-26}{Correction de bugs}%
   \changes{v0.99u}{2019-03-28}{Documentation révisée}%
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf b/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf
index 068fa4fed20..968ded32ced 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf
+++ b/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.tex b/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.tex
index c59243b445b..8b3305f2ca9 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.tex
@@ -1,5 +1,13 @@
-% Document de classe yathesis, en 12 points, interligne un et demi, et version finale
-\documentclass[12pt,space=onehalf,version=final]{yathesis}
+% Document :
+% - de classe yathesis ;
+% - en 12 points ;
+% - en version finale ;
+% - dont la partie principale :
+%   - est en interligne un et demi ;
+%   - voit chaque chapitre :
+%     - débuter par sa table des matières locale ;
+%     - finir   par sa bibliographie      locale.
+\documentclass[12pt,version=final,space=onehalf,localtocs,localbibs]{yathesis}
 %
 % Chargement manuel de packages (pas déjà chargés par la classe yathesis)
 \usepackage[T1]{fontenc}
diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx
index 21f61061e9b..58c8f72bf14 100644
--- a/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx
+++ b/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx
@@ -9,9 +9,17 @@
 %</flat-template|these-master>
 %<*these-sample|flat-sample>
 %<<COMMENT
-% Document de classe yathesis, en 12 points, interligne un et demi, et version finale
-%COMMENT
-\documentclass[12pt,space=onehalf,version=final]{yathesis}
+% Document :
+% - de classe yathesis ;
+% - en 12 points ;
+% - en version finale ;
+% - dont la partie principale :
+%   - est en interligne un et demi ;
+%   - voit chaque chapitre :
+%     - débuter par sa table des matières locale ;
+%     - finir   par sa bibliographie      locale.
+%COMMENT
+\documentclass[12pt,version=final,space=onehalf,localtocs,localbibs]{yathesis}
 %</these-sample|flat-sample>
 %<*these-sample|flat-sample|flat-template|these-master>
 %<<COMMENT
diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
index f273156bbe3..984be7e0ae0 100644
--- a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
+++ b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
@@ -23,7 +23,7 @@
 %<*readme>
 -----------------------------------------------------------------------
 
-- `yathesis` --- Yet Another Thesis Class, version 1.0.1
+- `yathesis` --- Yet Another Thesis Class, version 1.0.2
 - E-mail: `denis.bitouze@univ-littoral.fr`
 - Released under the LaTeX Project Public License v1.3c or later. See
   http://www.latex-project.org/lppl.txt
@@ -69,11 +69,15 @@ Typesetting the documentation of the class requires:
   \expandafter\begingroup
 \fi
 %</internal>
+%<*class|install>
+\def\yathesisfileversion{1.0.2}
+\def\yathesisfiledate{2020-04-13}
+%</class|install>
 %<*install>
 \input docstrip.tex
 \Msg{********************************************************}
 \Msg{* Installation}
-\Msg{* Class: yathesis 2020-03-28 v1.0.1}
+\Msg{* Class: yathesis \yathesisfiledate\space v\yathesisfileversion}
 \Msg{* that helps to write thesis following French rules (DB)}
 \Msg{********************************************************}
 \keepsilent
@@ -128,7 +132,7 @@ This work consists of the file  yathesis.dtx
 \def\YAD@treesample{\YAD@examples/\YAD@sample/en-arborescence}
 %</install>
 %<*install>
-\usedir{doc/latex/\YAD@classname/}
+\usedir{doc/latex/\YAD@classname}
 \generate{
   \nopreamble\nopostamble
   \file{README.md}{\from{\jobname.dtx}{readme}}
@@ -265,15 +269,7 @@ This work consists of the file  yathesis.dtx
 \fi
 %</internal>
 % \fi
-% \def\YADnblastversion{1.0.1}
-% \def\YADdatelastversion{\today}
-% \def\fileversion{v\YADnblastversion}
-% \def\filedate{\YADdatelastversion}
 % \iffalse
-%<*class>
-\def\fileversion{v1.0.1}
-\def\filedate{2020/03/28}
-%</class>
 %<*driver>
 \ProvidesFile{yathesis.dtx}
 \RequirePackage{scrlfile}
@@ -364,7 +360,7 @@ This work consists of the file  yathesis.dtx
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{yathesis}[\filedate\space\fileversion\space Yet another class for writing thesis (DB)]
+\ProvidesClass{yathesis}[\yathesisfiledate\space v\yathesisfileversion\space Yet another class for writing thesis (DB)]
 %    \end{macrocode}
 %
 % Pour pouvoir définir des macros dont les arguments puissent être
@@ -448,8 +444,10 @@ This work consists of the file  yathesis.dtx
 \newbool{YAD@valid@month}
 \newbool{YAD@valid@year}
 \newbool{YAD@mainmatter@used}
+\newbool{YAD@mainmatter}
 \newbool{YAD@backmatter}
 \newbool{YAD@localtocs}%
+\newbool{YAD@localbibs@used}%
 \newbool{YAD@nextwithlocaltoc}%
 \newbool{YAD@nonnumbered@chapter}%
 \newbool{YAD@nonnumbered@section}%
@@ -3080,7 +3078,6 @@ This work consists of the file  yathesis.dtx
       \cleardoublepage%
       \sethead[\thepage][][\nomname]{\nomname}{}{\thepage}\headrule%
       \YAD@ORI@printnomenclature%
-      \pagestyle{preliminary}%
     }%
   }{%
   }%
@@ -3124,8 +3121,7 @@ This work consists of the file  yathesis.dtx
 %   aux frontières des chapitres non numérotés ne soient pas
 %   erronés).
 %    \begin{macrocode}
-\xpretocmd{\pagestyle}{\cleardoublepage}{}{}%
-% \xapptocmd{\pagestyle}{\YAD@setfoot}{}{}%
+\pretocmd{\pagestyle}{\cleardoublepage}{}{}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3143,9 +3139,8 @@ This work consists of the file  yathesis.dtx
           \let\YAD@ORI@tableofcontents\tableofcontents%
           \let\YAD@ORI@localtableofcontents\localtableofcontents%
           \renewcommand{\tableofcontents}{%
-            \pagestyle{preliminary}%
             \booltrue{YAD@tableofcontents@used}%
-            \cleardoublepage%
+            \pagestyle{preliminary}%
             \YAD@phantomsection%
             % \renewcommand{\contentsname}{\cmdKV@YAD@name}
             \@ifnextchar[{\tableofcontents@YAD@with@argument}{\tableofcontents@YAD@without@argument}%]
@@ -3158,6 +3153,16 @@ This work consists of the file  yathesis.dtx
             \let\cmdKV@YAD@depth\YAD@tocdepth%
             \let\cmdKV@YAD@name\contentsname%
             \YAD@localstyle % pour les local TOCs qui suivent
+            \ifbool{YAD@mainmatter}%
+            {%
+            \pagestyle{mainmatter}%
+            }{%
+            }%
+            \ifbool{YAD@backmatter}%
+            {%
+              \pagestyle{backmatter}%
+            }{%
+            }%
           }%
           \newcommand\tableofcontents@YAD@with@argument[1][]{%
             \yadsetup{#1}%
@@ -3183,6 +3188,16 @@ This work consists of the file  yathesis.dtx
             \let\cmdKV@YAD@depth\YAD@tocdepth%
             \let\cmdKV@YAD@name\contentsname%
             \YAD@localstyle % pour les local TOCs qui suivent
+            \ifbool{YAD@mainmatter}%
+            {%
+            \pagestyle{mainmatter}%
+            }{%
+            }%
+            \ifbool{YAD@backmatter}%
+            {%
+              \pagestyle{backmatter}%
+            }{%
+            }%
           }%
         }%
 %    \end{macrocode}
@@ -3273,7 +3288,7 @@ This work consists of the file  yathesis.dtx
 % \begin{macro}{\YAD@chapter@header}
 % Définition de titres courants
 %    \begin{macrocode}
-\newcommand*{\YAD@chapter@header}{%
+\DeclareRobustCommand{\YAD@chapter@header}{%
   \ifboolexpr{
     ((test {\ifnumcomp{\value{secnumdepth}}{>}{-1}} or (not bool
     {YAD@nonnumbered@chapter})) and test {\ifnumcomp{\value{chapter}}{>}{0}}) and
@@ -3289,11 +3304,20 @@ This work consists of the file  yathesis.dtx
 %
 % \begin{macro}{\YAD@section@header}
 %    \begin{macrocode}
-\newcommand*{\YAD@section@header}{%
+\DeclareRobustCommand{\YAD@section@header}{%
   \ifboolexpr{
-    ((test {\ifnumcomp{\value{secnumdepth}}{>}{0}} or (not bool
-    {YAD@nonnumbered@section})) and test {\ifnumcomp{\value{chapter}}{>}{0}}) and
-    (not bool {YAD@backmatter})%
+    (
+      (
+        test {\ifnumcomp{\value{secnumdepth}}{>}{0}}
+        or
+        (not bool {YAD@nonnumbered@section})
+      )
+      and
+      test {\ifnumcomp{\value{chapter}}{>}{0}})
+      and
+      (not bool {YAD@backmatter})
+      and
+      (not bool {YAD@localbibs@used})
   }{%
     \thesection.
   }{%
@@ -3311,6 +3335,22 @@ This work consists of the file  yathesis.dtx
     \boolfalse{YAD@localtocs}%
   }%
 %    \end{macrocode}
+%
+% Code de débogage pour localiser les styles de pages appliqués.
+%    \begin{macrocode}
+% \RequirePackage{background}
+% \xapptocmd{\pagestyle}{%
+%   \SetBgContents{#1}
+%   \SetBgScale{2}
+%   \SetBgAngle{0}
+%   \SetBgOpacity{1}
+%   \SetBgColor{blue}
+%   \SetBgPosition{current page.south west}
+%   \SetBgHshift{3cm}
+%   \SetBgVshift{1cm}
+% }{}{}%
+%    \end{macrocode}
+%
 % Définition du style de page des titres
 %    \begin{macrocode}
 \newpagestyle{titles}[]{%
@@ -3362,13 +3402,17 @@ This work consists of the file  yathesis.dtx
 % géométrie restaurée mais toujours pas de titres courants
 %    \begin{macrocode}
 \newpagestyle{prepreliminary}[]{%
+  \sethead{}{}{}%
+  \setfoot{}{}{}%
+  \setheadrule{0pt}%
+  \setfootrule{0pt}%
 %    \end{macrocode}
 % Dans la partie pré-préliminaire, aucun élément de structuration n'est
 % numéroté, les titres courants sont absents et la profondeur de la table des
 % matières est fixée à son niveau par défaut (sous-sections)
 %    \begin{macrocode}
   \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
+  % \YAD@setfoot%
 }%
 %    \end{macrocode}
 % Définition du style de page de la partie préliminaire: début
@@ -3399,45 +3443,9 @@ This work consists of the file  yathesis.dtx
   \YAD@setfoot%
 }%
 %    \end{macrocode}
-% Définition du style de page de la partie liminaire
-%    \begin{macrocode}
-\newpagestyle{ordinary}[]{%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {%
-    \ifthenelse{%
-      \equal{\sectiontitle}{}%
-    }{%
-      \YAD@chapter@header%
-    }{%
-      \YAD@section@header%
-    }%
-  }%
-  {}%
-  {\thepage}%
-  \headrule%
-%    \end{macrocode}
-% Dans la partie liminaire, aucun élément de structuration n'est
-% numéroté et la profondeur de la table des matières est fixée à son
-% niveau par défaut (sous-sections)
-%    \begin{macrocode}
-  \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
-}%
-%    \end{macrocode}
 % Définition du style de page de la partie principale
 %    \begin{macrocode}
 \newpagestyle{mainmatter}[]{%
-  \ifthenelse{\equal{\YAD@interligne}{single}}{%
-    \singlespacing%
-  }{%
-    \ifthenelse{\equal{\YAD@interligne}{double}}{%
-      \doublespacing%
-    }{%
-      \onehalfspacing%
-    }%
-  }%
   \sethead[\thepage]%
   []%
   [\YAD@chapter@header]%
@@ -3467,12 +3475,22 @@ This work consists of the file  yathesis.dtx
 %    \begin{macrocode}
 \xapptocmd{\mainmatter}{%
   \booltrue{YAD@mainmatter@used}%
+  \booltrue{YAD@mainmatter}%
+  \pagestyle{mainmatter}%
   \ifbool{YAD@localtocs@classoption}%
   {%
     \booltrue{YAD@localtocs}%
   }{%
-  }
-  \pagestyle{mainmatter}%
+  }%
+  \ifthenelse{\equal{\YAD@interligne}{single}}{%
+    \singlespacing%
+  }{%
+    \ifthenelse{\equal{\YAD@interligne}{double}}{%
+      \doublespacing%
+    }{%
+      \onehalfspacing%
+    }%
+  }%
 }{}{}%
 %    \end{macrocode}
 % Vérification, en fin de document, de l'usage de la commande "\mainmatter" et
@@ -3493,89 +3511,50 @@ This work consists of the file  yathesis.dtx
   }%
 }%
 %    \end{macrocode}
-% Définition du style de page de la partie annexe
-%    \begin{macrocode}
-\newpagestyle{appendix}[]{%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [%
-  \ifthenelse{%
-    \value{secnumdepth}>-1
-    \and
-    \value{chapter}>0
-  }{%
-    \MakeUppercase\appendixname{} \thechapter.\
-  }{%
-  }
-  \chaptertitle%
-  ]%
-  {%
-    \ifthenelse{%
-      \equal{\sectiontitle}{}%
-    }{%
-      \ifthenelse{%
-        \value{secnumdepth}>-1
-        \and
-        \value{chapter}>0
-      }{%
-        \MakeUppercase\appendixname{} \thechapter.\
-      }{%
-      }
-      \chaptertitle%
-    }{%
-      \YAD@section@header%
-    }%
-  }%
-  {}%
-  {\thepage}%
-  \headrule%
-%    \end{macrocode}
-% Dans la partie annexe, la numérotation des paragraphes est fixée à
-% son niveau par défaut (sous-sections)
-%    \begin{macrocode}
-  \YAD@phantomsection%
-  \YAD@setsecnumdepth{\YAD@secnumdepth}%
-  \YAD@bookmarksetup{startatroot}%
-  \YAD@setfoot%
-}%
-%    \end{macrocode}
-% Extension de la commande "\appendix" de sorte qu'elle applique le style de
-% page "appendix".
+% Pour que les bibliographies locales apparaissent automatiquement à chaque fin de
+% chapitre, la commande "\chapter" est redéfinie de manière à commencer par
+% l'insertion de la bibliographie locale ("\printlocalbibs") du, donc, chapitre
+% précédent (affichée seulement si celle-ci n'est pas vide). Ceci fonctionne
+% bien, sauf :
+% \begin{itemize}
+% \item pour les chapitres séparés par des commandes intermédiaires ("\part",
+%   "\mainmatter", "\appendix", etc.)
+% \item en fin de document ("\enddocument").
+% \end{itemize}
+% Il est donc nécessaire que ces commandes commencent donc elles-mêmes par
+% l'insertion de la bibliographie locale du chapitre précédent
+% ("\printlocalbibs"), commande assurant que les chapitres suivant
+% (éventuellement) ces commandes ne l'afficheront pas en double.
 % \begin{macro}{\appendix}
 %    \begin{macrocode}
-\xapptocmd{\appendix}{%
-  \pagestyle{appendix}%
-}{}{}%
-%    \end{macrocode}
-% \end{macro}
-% Définition du style de page de la partie biblio
-%    \begin{macrocode}
-\newpagestyle{biblio}[]{%
-%    \end{macrocode}
-% Dans la partie biblio, aucun élément de structuration n'est
-% numéroté
-%    \begin{macrocode}
-  \setcounter{secnumdepth}{-10}%
-%    \end{macrocode}
-%    \begin{macrocode}
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {\YAD@chapter@header}%
-  {}%
-  {\thepage}%
-  \headrule%
+\AtEndPreamble{%
+  \xpretocmd{\part}{%
+    \printlocalbibs{}%
+  }{}{}%
+  \pretocmd{\mainmatter}{%
+    \printlocalbibs{}%
+    \cleardoublepage%
+  }{}{}%
+  \pretocmd{\appendix}{%
+    \printlocalbibs{}%
+    \cleardoublepage%
+  }{}{}%
+  \pretocmd{\backmatter}{%
+    \printlocalbibs{}%
+    \cleardoublepage%
+  }{}{}%
+  \pretocmd{\enddocument}{%
+    \printlocalbibs{}%
+  }{}{}%
+}
 %    \end{macrocode}
-% On demande que la bibliographie apparaisse au plus haut niveau des
-% signets
+% Extension de la commande "\appendix" de sorte que les chapitres d'annexe
+% soient correctement nommés.
 %    \begin{macrocode}
-  % \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@bookmarksetup{startatroot}%
-  \YAD@setfoot%
-}%
+  \apptocmd{\appendix}{%
+    \renewcommand\chaptername{\appendixname}%
+    \singlespacing%
+  }{}{}%
 %    \end{macrocode}
 % Définition du style de page de la partie finale
 %    \begin{macrocode}
@@ -3617,73 +3596,6 @@ This work consists of the file  yathesis.dtx
 }{}{}%
 %    \end{macrocode}
 % \end{macro}
-% Définition du style de page de la table des matières
-%    \begin{macrocode}
-\newpagestyle{contents}[]{%
-  \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@bookmarksetup{startatroot}%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\cmdKV@YAD@name]%
-  {\cmdKV@YAD@name}%
-  {}%
-  {\thepage}%
-  \headrule%
-%    \end{macrocode}
-% Dans la partie glossaire, aucun élément de structuration n'est
-% numéroté
-%    \begin{macrocode}
-  \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
-}%
-%    \end{macrocode}
-% Définition du style de page de la partie glossaire
-%    \begin{macrocode}
-\newpagestyle{glossaire}[]{%
-  \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@bookmarksetup{startatroot}%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {\YAD@chapter@header}%
-  {}%
-  {\thepage}%
-  \headrule%
-%    \end{macrocode}
-% Dans la partie glossaire, aucun élément de structuration n'est
-% numéroté
-%    \begin{macrocode}
-  \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
-}%
-%    \end{macrocode}
-% Définition du style de page de la partie index
-%    \begin{macrocode}
-\newpagestyle{index}[]{%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {\YAD@chapter@header}%
-  {}%
-  {\thepage}%
-  \headrule%
-%    \end{macrocode}
-% Dans la partie index, aucun élément de structuration n'est
-% numéroté
-%    \begin{macrocode}
-  \setcounter{secnumdepth}{-10}%
-  \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@setsecnumdepth{\YAD@secnumdepth}%
-  \YAD@bookmarksetup{startatroot}%
-  \YAD@setfoot%
-}%
-%    \end{macrocode}
 % Définition du style de page de la partie \textquote{4\ieme{} de
 % couverture} (\emph{blub} en anglais).
 %    \begin{macrocode}
@@ -3774,12 +3686,16 @@ This work consists of the file  yathesis.dtx
   \yadsetup{#1}
   \setlength{\fboxsep}{10pt}%
   \setlength{\YAD@titleboxwidth}{\linewidth-2\fboxsep-2\fboxrule}%
-  \renewcommand*{\do}[1]{%
-%    \end{macrocode}
 % Appel du style de page propre au(x) titre(s)
 %    \begin{macrocode}
   \pagestyle{titles}%
 %    \end{macrocode}
+  \renewcommand*{\do}[1]{%
+%    \end{macrocode}
+% Chaque nouvelle page de titre commence en page impaire.
+%    \begin{macrocode}
+    \cleardoublepage%
+%    \end{macrocode}
 % On passe dans la langue choisie en option (en français si rien n'est
 % spécifié).
 %    \begin{macrocode}
@@ -3810,7 +3726,7 @@ This work consists of the file  yathesis.dtx
     }%
     \noindent%
     \begin{minipage}{\linewidth-2\fboxsep-2\fboxrule}
-      \onehalfspacing%
+      % \onehalfspacing%
       \noindent%
       \ifthenelse{\equal{\cmdKV@YAD@frametitle}{none}}{%
       }{%
@@ -3840,8 +3756,10 @@ This work consists of the file  yathesis.dtx
       }%
       \ifundef{\printsubtitle}{%
       }{%
-        \ifdraft{}{\vspace*{\stretch{.15}}}%
-        % \vspace*{\stretch{.15}}%
+        \ifdraft{}{%
+          \vskip0.5em%
+          % \vspace*{\stretch{.15}}%
+        }%
         \par%
         \centering%
         \Large\printsubtitle%
@@ -4291,7 +4209,6 @@ This work consists of the file  yathesis.dtx
   \@ifstar{\@tempswatrue\csuse{YAD@starnostar@makekeywords}}{\@tempswafalse\csuse{YAD@starnostar@makekeywords}}%
 }%
 \csdef{YAD@starnostar@makekeywords}{%
-  \cleardoublepage%
 %    \end{macrocode}
 % Appel du style de page propre à la partie préliminaire
 %    \begin{macrocode}
@@ -4324,8 +4241,8 @@ This work consists of the file  yathesis.dtx
   \else%
   \vspace*{\stretch{1}}%
   \fi
-  \expandafter\selectlanguage\expandafter{\YAD@mainlanguage}%
   \pagestyle{preliminary}%
+  \expandafter\selectlanguage\expandafter{\YAD@mainlanguage}%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -4424,7 +4341,6 @@ This work consists of the file  yathesis.dtx
   \@ifstar{\@tempswatrue\csuse{YAD@starnostar@makelaboratory}}{\@tempswafalse\csuse{YAD@starnostar@makelaboratory}}%
 }%
 \csdef{YAD@starnostar@makelaboratory}{%
-  \cleardoublepage%
 %    \end{macrocode}
 % Appel du style de page propre à la partie préliminaire
 %    \begin{macrocode}
@@ -4795,36 +4711,19 @@ This work consists of the file  yathesis.dtx
 % Page de présentation (résumés)
 %    \begin{macrocode}
 \newcommand{\makeabstract}{%
+  \pagestyle{preliminary}%
+  \bgroup%
   \ifbool{YAD@nomakeabstract}{%
   }{%
     \YAD@alarm@noabstract%
   }%
-  \pagestyle{preliminary}%
   \YAD@phantomsection%
   \addcontentsline{toc}{chapter}{\abstractname}%
-  \booltrue{YAD@makeabstract@used}%
-  \bgroup%
   \addtolength{\footskip}{6pt minus 6pt}%
   \setfootrule{0pt}%
-  \setfoot[][%
-  \ifboolexpr{%
-    bool {YAD@inprogress@work}%
-    or bool {YAD@inprogress@work@star}%
-  }{%
-    \textsc{\translate{lbl-inprogressfoottext} \today}%
-  }{%
-    \ifboolexpr{%
-      bool {YAD@submitted@work@star}%
-    }{%
-      \textsc{\translate{lbl-submittedfoottext} \today}%
-    }{%
-    }%
-  }%
-  ][]{%
-    % \medskip\par%
+  \setfoot[][][]{%
     \YAD@laboratory@abstract@page%
   }{}{}%
-  \cleardoublepage%
   \renewcommand{\YAD@chapter@header}{\abstractname}%
   \renewcommand{\YAD@section@header}{\abstractname}%
   \YAD@abstract@page%
@@ -4838,6 +4737,8 @@ This work consists of the file  yathesis.dtx
 %    \begin{macrocode}
   \YAD@nolaboratorytrue%
   \YAD@nolaboratoryaddresstrue%
+%
+  \booltrue{YAD@makeabstract@used}%
 }%
 %    \end{macrocode}
 % \end{macro}
@@ -4918,6 +4819,7 @@ This work consists of the file  yathesis.dtx
 % Éléments communs de la page de présentation
 %    \begin{macrocode}
 \newcommand{\makebackcover}{%
+  \printlocalbibs{}%
   \pagestyle{backcover}%
 %    \end{macrocode}
 % On insère le code pour l'éventuel colophon
@@ -4942,7 +4844,6 @@ This work consists of the file  yathesis.dtx
         }%
         \csdef{YAD@starnostar@makededications}{%
         \pagestyle{prepreliminary}%
-        \cleardoublepage%
         \if@tempswa%
         \else%
         \vspace*{\stretch{2}}%
@@ -4958,9 +4859,6 @@ This work consists of the file  yathesis.dtx
         permettant de préparer des dédicaces, n'a pas été utilisée.%
         }%
         }{%
-%    \end{macrocode}
-% Appel du style de page propre à la partie préliminaire
-%    \begin{macrocode}
         \begin{flushright}
           \itshape%
           \DTLforeach*{dedications}{%
@@ -4994,6 +4892,7 @@ This work consists of the file  yathesis.dtx
         \else%
         \vspace*{\stretch{2}}%
         \fi
+        \pagestyle{preliminary}%
         }%
 %    \end{macrocode}
 % \end{macro}
@@ -5006,7 +4905,7 @@ This work consists of the file  yathesis.dtx
 }%
 \csdef{YAD@starnostar@makefrontepigraphs}{%
   \patchcmd{\epigraphs}{\qitemlabel}{\qitemlabel\itemsep=1.5\baselineskip}{}{}%
-  \cleardoublepage%
+  \pagestyle{prepreliminary}%
   \if@tempswa%
   \else%
   \vspace*{\stretch{2}}%
@@ -5027,9 +4926,6 @@ This work consists of the file  yathesis.dtx
     }{%
     }%
   }{%
-%    \end{macrocode}
-% Appel du style de page propre à la partie préliminaire
-%    \begin{macrocode}
     \begin{epigraphs}
       \DTLforeach*{frontepigraphs}{%
         \YAD@epigraphlanguage=epigraphlanguage,%
@@ -5072,39 +4968,10 @@ This work consists of the file  yathesis.dtx
   \else%
   \vspace*{\stretch{2}}%
   \fi
-}%
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{environment}{epigraphspage}
-% Environnement de la page des épigraphes globales à la thèse
-%    \begin{macrocode}
-\newenvironment{epigraphspage}{%
-%    \end{macrocode}
-% Redéfinition locale de la commande d'épigraphe
-%    \begin{macrocode}
-  \patchcmd{\epigraphs}{\qitemlabel}{\qitemlabel\itemsep=1.5\baselineskip}{}{}
-  \cleardoublepage%
-  \vspace*{\stretch{1}}%
-}{%
-  \vspace*{\stretch{1}}%
-}%
-%    \end{macrocode}
-% Appel du style de page propre à la partie préliminaire du
-% document, notamment début de l'insertion des titres courants (on
-% ajoute le style de page "prepreliminary" avant que l'environnement
-% "epigraphspage" ne débute, de sorte que sa portée ne soit pas
-% limitée à cet environnement).
-%    \begin{macrocode}
-\BeforeBeginEnvironment{epigraphspage}{%
-  \pagestyle{prepreliminary}%
-}%
-\AfterEndEnvironment{epigraphspage}{%
   \pagestyle{preliminary}%
 }%
 %    \end{macrocode}
-% \end{environment}
-%
+% \end{macro}
 %
 %\section{Commandes et styles pour les tables des matières locales}
 %
@@ -5411,6 +5278,24 @@ This work consists of the file  yathesis.dtx
 }{}{}%
 %    \end{macrocode}
 % \end{environment}
+%
+% Le code pour l'affichage des bibliographies locales, utilisé à plusieurs
+% endroits, est stocké dans une macro.
+%    \begin{macrocode}
+\newcommand{\printlocalbibs}{%
+  \ifbool{YAD@localbibs}{%
+    \ifbool{YAD@localbibs@used}{%
+    }{%
+      \let\YAD@ORI@blx@warn@bibempty\blx@warn@bibempty%
+      \def\blx@warn@bibempty{}%
+      \YAD@printbibliography@ORI[segment=\therefsegment,heading=YAD@localbibs@heading]%
+      \let\blx@warn@bibempty\YAD@ORI@blx@warn@bibempty%
+      \booltrue{YAD@localbibs@used}%
+    }%
+  }{%
+  }%
+}%
+%    \end{macrocode}
 % On redéfinit la commande "\chapter" de sorte que, dans un chapitre non
 % numéroté ("\chapter*") :
 % \begin{itemize}
@@ -5431,14 +5316,10 @@ This work consists of the file  yathesis.dtx
 \LetLtxMacro{\YAD@ORI@chapter}{\chapter}%
 \AfterPreamble{% delay the redefinition when titlesec has done its own
   \renewcommand\chapter{%
-    \ifbool{YAD@localbibs}{%
-      \let\YAD@ORI@blx@warn@bibempty\blx@warn@bibempty%
-      \def\blx@warn@bibempty{}%
-      \YAD@printbibliography@ORI[segment=\therefsegment,heading=YAD@localbibs@heading]%
-      \let\blx@warn@bibempty\YAD@ORI@blx@warn@bibempty%
-    }{%
-    }
+    \printlocalbibs{}%
+    \boolfalse{YAD@localbibs@used}%
     \cleardoublepage%
+    \renewcommand{\sectiontitle}{}%
     \YAD@phantomsection%
     \ifbool{YAD@output@paper}{%
     }{%
@@ -5487,7 +5368,7 @@ This work consists of the file  yathesis.dtx
     \boolfalse{YAD@nonnumbered@paragraph}%
     \boolfalse{YAD@nonnumbered@subparagraph}%
     \if@mainmatter%
-    \YAD@setsecnumdepth{\YAD@secnumdepth}
+    \YAD@setsecnumdepth{\YAD@secnumdepth}%
     \fi%
     \YAD@tmp@chapter[#1][#2]{#3}%
   }%
@@ -5514,7 +5395,7 @@ This work consists of the file  yathesis.dtx
 % tables des matières.
 % \end{itemize}
 %    \begin{macrocode}
-\LetLtxMacro{\YAD@ORI@section}{\section}
+\LetLtxMacro{\YAD@ORI@section}{\section}%
 \renewcommand\section{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@chapter}{%
@@ -5523,7 +5404,7 @@ This work consists of the file  yathesis.dtx
   }%
   \fi%
   \@ifstar{\YAD@starred@section}{\YAD@unstarred@section}%
-}
+}%
 \newcommandtwoopt*{\YAD@tmp@section}[3][][]{%
   \ifthenelse{\isempty{#1}}{%
     \ifthenelse{\isempty{#2}}{%
@@ -5575,7 +5456,7 @@ This work consists of the file  yathesis.dtx
 % "\section".
 % \end{itemize}
 %    \begin{macrocode}
-\LetLtxMacro{\YAD@ORI@subsection}{\subsection}
+\LetLtxMacro{\YAD@ORI@subsection}{\subsection}%
 \renewcommand\subsection{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@section}{%
@@ -5584,7 +5465,7 @@ This work consists of the file  yathesis.dtx
   }%
   \fi%
   \@ifstar{\YAD@starred@subsection}{\YAD@unstarred@subsection}%
-}
+}%
 \newcommand*{\YAD@tmp@subsection}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@subsection{#2}%
@@ -5613,7 +5494,7 @@ This work consists of the file  yathesis.dtx
   \YAD@tmp@subsection[#1]{#2}%
 }%
 %
-\LetLtxMacro{\YAD@ORI@subsubsection}{\subsubsection}
+\LetLtxMacro{\YAD@ORI@subsubsection}{\subsubsection}%
 \renewcommand\subsubsection{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@subsection}{%
@@ -5622,7 +5503,7 @@ This work consists of the file  yathesis.dtx
   }%
   \fi%
   \@ifstar{\YAD@starred@subsubsection}{\YAD@unstarred@subsubsection}%
-}
+}%
 \newcommand*{\YAD@tmp@subsubsection}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@subsubsection{#2}%
@@ -5649,7 +5530,7 @@ This work consists of the file  yathesis.dtx
   \YAD@tmp@subsubsection[#1]{#2}%
 }%
 %
-\LetLtxMacro{\YAD@ORI@paragraph}{\paragraph}
+\LetLtxMacro{\YAD@ORI@paragraph}{\paragraph}%
 \renewcommand\paragraph{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@subsubsection}{%
@@ -5658,7 +5539,7 @@ This work consists of the file  yathesis.dtx
   }%
   \fi%
   \@ifstar{\YAD@starred@paragraph}{\YAD@unstarred@paragraph}%
-}
+}%
 \newcommand*{\YAD@tmp@paragraph}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@paragraph{#2}%
@@ -5683,7 +5564,7 @@ This work consists of the file  yathesis.dtx
   \YAD@tmp@paragraph[#1]{#2}%
 }%
 %
-\LetLtxMacro{\YAD@ORI@subparagraph}{\subparagraph}
+\LetLtxMacro{\YAD@ORI@subparagraph}{\subparagraph}%
 \renewcommand\subparagraph{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@paragraph}{%
@@ -5692,7 +5573,7 @@ This work consists of the file  yathesis.dtx
   }%
   \fi%
   \@ifstar{\YAD@starred@subparagraph}{\YAD@unstarred@subparagraph}%
-}
+}%
 \newcommand*{\YAD@tmp@subparagraph}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@subparagraph{#2}%
@@ -6124,7 +6005,7 @@ This work consists of the file  yathesis.dtx
     \defbibheading{YAD@localbibs@heading}[\translate{lbl-localbibname}]{%
       \renewcommand\addcontentsline[3]{}%
       \section*{#1}%
-      \let\addcontentsline\YAD@addcontentsline
+      \let\addcontentsline\YAD@addcontentsline%
     }%
 %    \end{macrocode}
 %
@@ -6145,20 +6026,24 @@ This work consists of the file  yathesis.dtx
       \booltrue{YAD@printbibliography@used}%
 %    \end{macrocode}
 %
-% Hack aimablement fourni par samcarter
+% Un hack aimablement fourni par samcarter
 % (\url{https://texnique.fr/osqa/questions/6977/header-avec-biblatex/6978})
-% qui évite que l'entête de la bibliographie, en dernière page de celle-ci, ne
-% contienne pas seulement \enquote{Bibliographie} mais \enquote{CHAPITRE
-% XXX. Bibliographie}.
+% a permis d'éviter que l'entête de la bibliographie, en dernière page de
+% celle-ci, ne  contienne pas seulement \enquote{Bibliographie} mais
+% \enquote{CHAPITRE XXX. Bibliographie}.
 %    \begin{macrocode}
-      \pagestyle{biblio}%
+      \singlespace%
       \chapter*{\bibname}%
-      \begingroup%
-      \let\cleardoublepage\relax%
       \YAD@printbibliography@ORI[heading=none,#1]%
-      \endgroup%
+      \endsinglespace%
     }%
   }{%
+    \BeforeBeginEnvironment{thebibliography}{%
+      \singlespacing%
+    }%
+    \AtEndEnvironment{thebibliography}{%
+      \clearpage%
+    }%
   }%
 }%
 %    \end{macrocode}
@@ -6301,6 +6186,26 @@ This work consists of the file  yathesis.dtx
 }%
 %    \end{macrocode}
 %
+% Le code suivant, aimablement fourni par touhami
+% (\url{https://texnique.fr/osqa/questions/8358/packages-glossaries-et-yathesis-pepin-de-forme-plurielle-glspl})
+% perme tque, dans le cas d'un mémoire en anglais (option
+% "mainlanguage=english"), les règles s'appliquant aux glossaires et acronymes
+% soient bien celles de l'anglais (et non du français).
+%    \begin{macrocode}
+\AtEndPreamble{%
+  \@ifpackageloaded{glossaries}{%
+    \IfLanguageName{english}{%
+      \makeatletter
+      \let\glossariescaptionsenglish\undefined
+      \input{glossaries-english.ldf}
+      \makeatother
+    }{%
+    }%
+  }{%
+  }%
+}%
+%    \end{macrocode}
+%
 % \subsection{Fichiers importés par la classe}
 %
 % La \yatcl charge les fichiers de configuration locale et de données
@@ -6571,49 +6476,48 @@ This work consists of the file  yathesis.dtx
 %
 %    \begin{macrocode}
 # mode: yathesis.cls
-# denisbitouze, 2020-03-26
+# denisbitouze, 2020-04-05
 #
-#include:class-book
-#include:latex-document
-#include:latex-mathsymbols
-#include:tex
-#include:pgfopts
+#include:adjustbox
+#include:array
+#include:babel
+#include:biblatex
+#include:bookmark
+#include:colophon
+#include:csquotes
+#include:datatool
+#include:datetime
+#include:draftwatermark
+#include:environ
+#include:epigraph
+#include:etoc
 #include:etoolbox
-#include:xpatch
-#include:morewrites%
 #include:filehook
-#include:hopatch
-#include:xifthen
-#include:xkeyval%
+#include:fncychap
 #include:geometry
 #include:graphicx
-#include:environ
-#include:adjustbox
-#include:array
-#include:xstring
-#include:textcase
-#include:translator
+#include:hopatch
+#include:hypcap
+#include:ifdraft
+#include:iflang
 #include:iftex
-#include:epigraph
-#include:tcolorbox
+#include:letltxmacro
 #include:marvosym
+#include:morewrites
+#include:nonumonpart
+#include:pgfopts
 #include:setspace
-#include:etoc
+#include:tcolorbox
+#include:textcase
+#include:titleps
 #include:tocbibind
-#include:nonumonpart
+#include:translator
+#include:twoopt
 #include:xcolor
-#include:datatool
-#include:fncychap
-#include:titleps
-#include:ifdraft
-#include:colophon
-#include:draftwatermark
-#include:babel
-#include:iflang
-#include:datetime
-#include:hypcap
-#include:bookmark
-#include:glossaries-babel
+#include:xifthen
+#include:xkeyval
+#include:xpatch
+#include:xstring
 #
 # Document class
 #keyvals:\documentclass/yathesis
@@ -6704,39 +6608,17 @@ datetime
 \doctoralschool[%<précision(s)%>]{nom de l'école doctorale%text}#n
 \laboratory[%<précision(s)%>]{%<nom du laboratoire%>}{%<adresse du laboratoire%>}#n
 #
-#keyvals:\pres
-logo=
-logoheight=
-url=
-#endkeyvals
-#keyvals:\comue
-logo=
-logoheight=
-url=
-#endkeyvals
-#keyvals:\institute
-logo=
-logoheight=
-url=
-nologo
-#endkeyvals
-#keyvals:\coinstitute
+#keyvals:\pres,\comue,\doctoralschool
 logo=
 logoheight=
 url=
-nologo
 #endkeyvals
-#keyvals:\company
+#keyvals:\institute,\coinstitute,\company
 logo=
 logoheight=
 url=
 nologo
 #endkeyvals
-#keyvals:\doctoralschool
-logo=
-logoheight=
-url=
-#endkeyvals
 #keyvals:\laboratory
 logo=
 logoheight=
@@ -6993,7 +6875,7 @@ name=
 \AfterEndPreamble{
   \pretocmd{\tableofcontents@YAD@without@argument}{\cleardoublepage\zlabel{tableofcontents-withoutargument}}{}{}
   \pretocmd{\tableofcontents@YAD@with@argument}{\cleardoublepage\zlabel{tableofcontents-withargument}}{}{}
-  \pretocmd{\YAD@insert@colophon}{\clearpage\zlabel{colophon}}{}{}
+  \pretocmd{\printcolophontext}{\zlabel{colophon}}{}{}
   \pretocmd{\maketitle}{\zlabel{fr-title}}{}{}%
   \pretocmd{\makedisclaimer}{\cleardoublepage\zlabel{disclaimer}}{}{}
   \pretocmd{\makekeywords}{\cleardoublepage\zlabel{keywords}}{}{}
@@ -7019,6 +6901,9 @@ name=
       \ifthenelse{\equal{#3}{Introduction générale}}{\cleardoublepage\zlabel{introduction}%
       }{%
       }%
+      \ifthenelse{\equal{#3}{Développement}}{\zlabel{localbib}%
+      }{%
+      }%
       \ifthenelse{\equal{#3}{Contexte du chaos du rire}}{\cleardoublepage\zlabel{chapter}%
       }{%
       }%
diff --git a/Master/texmf-dist/tex/latex/yathesis/yathesis-demo.sty b/Master/texmf-dist/tex/latex/yathesis/yathesis-demo.sty
index 40e690387bd..2e02572873f 100644
--- a/Master/texmf-dist/tex/latex/yathesis/yathesis-demo.sty
+++ b/Master/texmf-dist/tex/latex/yathesis/yathesis-demo.sty
@@ -20,7 +20,7 @@
 \AfterEndPreamble{
   \pretocmd{\tableofcontents@YAD@without@argument}{\cleardoublepage\zlabel{tableofcontents-withoutargument}}{}{}
   \pretocmd{\tableofcontents@YAD@with@argument}{\cleardoublepage\zlabel{tableofcontents-withargument}}{}{}
-  \pretocmd{\YAD@insert@colophon}{\clearpage\zlabel{colophon}}{}{}
+  \pretocmd{\printcolophontext}{\zlabel{colophon}}{}{}
   \pretocmd{\maketitle}{\zlabel{fr-title}}{}{}%
   \pretocmd{\makedisclaimer}{\cleardoublepage\zlabel{disclaimer}}{}{}
   \pretocmd{\makekeywords}{\cleardoublepage\zlabel{keywords}}{}{}
@@ -46,6 +46,9 @@
       \ifthenelse{\equal{#3}{Introduction générale}}{\cleardoublepage\zlabel{introduction}%
       }{%
       }%
+      \ifthenelse{\equal{#3}{Développement}}{\zlabel{localbib}%
+      }{%
+      }%
       \ifthenelse{\equal{#3}{Contexte du chaos du rire}}{\cleardoublepage\zlabel{chapter}%
       }{%
       }%
diff --git a/Master/texmf-dist/tex/latex/yathesis/yathesis.cls b/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
index 020a0130905..92e1480b383 100644
--- a/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
+++ b/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
@@ -11,10 +11,10 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% See http://www.latex-project.org/lppl.txt
 %% -----------------------------------------------------------------------
-\def\fileversion{v1.0.1}
-\def\filedate{2020/03/28}
+\def\yathesisfileversion{1.0.2}
+\def\yathesisfiledate{2020-04-13}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{yathesis}[\filedate\space\fileversion\space Yet another class for writing thesis (DB)]
+\ProvidesClass{yathesis}[\yathesisfiledate\space v\yathesisfileversion\space Yet another class for writing thesis (DB)]
 \RequirePackage{pgfopts}[2011/06/02]%
 \RequirePackage{etoolbox}[2011/01/03]%
 \RequirePackage{xpatch}[2012/10/02]%
@@ -60,8 +60,10 @@
 \newbool{YAD@valid@month}
 \newbool{YAD@valid@year}
 \newbool{YAD@mainmatter@used}
+\newbool{YAD@mainmatter}
 \newbool{YAD@backmatter}
 \newbool{YAD@localtocs}%
+\newbool{YAD@localbibs@used}%
 \newbool{YAD@nextwithlocaltoc}%
 \newbool{YAD@nonnumbered@chapter}%
 \newbool{YAD@nonnumbered@section}%
@@ -1986,7 +1988,6 @@
       \cleardoublepage%
       \sethead[\thepage][][\nomname]{\nomname}{}{\thepage}\headrule%
       \YAD@ORI@printnomenclature%
-      \pagestyle{preliminary}%
     }%
   }{%
   }%
@@ -2013,14 +2014,13 @@
     \newcommand*{\YAD@setfoot}{}%
   }%
 }%
-\xpretocmd{\pagestyle}{\cleardoublepage}{}{}%
+\pretocmd{\pagestyle}{\cleardoublepage}{}{}%
         \AfterEndPreamble{%
           \let\YAD@ORI@tableofcontents\tableofcontents%
           \let\YAD@ORI@localtableofcontents\localtableofcontents%
           \renewcommand{\tableofcontents}{%
-            \pagestyle{preliminary}%
             \booltrue{YAD@tableofcontents@used}%
-            \cleardoublepage%
+            \pagestyle{preliminary}%
             \YAD@phantomsection%
             % \renewcommand{\contentsname}{\cmdKV@YAD@name}
             \@ifnextchar[{\tableofcontents@YAD@with@argument}{\tableofcontents@YAD@without@argument}%]
@@ -2033,6 +2033,16 @@
             \let\cmdKV@YAD@depth\YAD@tocdepth%
             \let\cmdKV@YAD@name\contentsname%
             \YAD@localstyle % pour les local TOCs qui suivent
+            \ifbool{YAD@mainmatter}%
+            {%
+            \pagestyle{mainmatter}%
+            }{%
+            }%
+            \ifbool{YAD@backmatter}%
+            {%
+              \pagestyle{backmatter}%
+            }{%
+            }%
           }%
           \newcommand\tableofcontents@YAD@with@argument[1][]{%
             \yadsetup{#1}%
@@ -2058,6 +2068,16 @@
             \let\cmdKV@YAD@depth\YAD@tocdepth%
             \let\cmdKV@YAD@name\contentsname%
             \YAD@localstyle % pour les local TOCs qui suivent
+            \ifbool{YAD@mainmatter}%
+            {%
+            \pagestyle{mainmatter}%
+            }{%
+            }%
+            \ifbool{YAD@backmatter}%
+            {%
+              \pagestyle{backmatter}%
+            }{%
+            }%
           }%
         }%
         \newcommand{\YAD@setsecnumdepth}[1]{%
@@ -2129,7 +2149,7 @@
         }
         % \renewcommand{\setcounter}[2]{}%
         %
-\newcommand*{\YAD@chapter@header}{%
+\DeclareRobustCommand{\YAD@chapter@header}{%
   \ifboolexpr{
     ((test {\ifnumcomp{\value{secnumdepth}}{>}{-1}} or (not bool
     {YAD@nonnumbered@chapter})) and test {\ifnumcomp{\value{chapter}}{>}{0}}) and
@@ -2140,11 +2160,20 @@
   }%
   \chaptertitle%
 }%
-\newcommand*{\YAD@section@header}{%
+\DeclareRobustCommand{\YAD@section@header}{%
   \ifboolexpr{
-    ((test {\ifnumcomp{\value{secnumdepth}}{>}{0}} or (not bool
-    {YAD@nonnumbered@section})) and test {\ifnumcomp{\value{chapter}}{>}{0}}) and
-    (not bool {YAD@backmatter})%
+    (
+      (
+        test {\ifnumcomp{\value{secnumdepth}}{>}{0}}
+        or
+        (not bool {YAD@nonnumbered@section})
+      )
+      and
+      test {\ifnumcomp{\value{chapter}}{>}{0}})
+      and
+      (not bool {YAD@backmatter})
+      and
+      (not bool {YAD@localbibs@used})
   }{%
     \thesection.
   }{%
@@ -2195,8 +2224,12 @@
   \setfoot{}{}{}%
 }%
 \newpagestyle{prepreliminary}[]{%
+  \sethead{}{}{}%
+  \setfoot{}{}{}%
+  \setheadrule{0pt}%
+  \setfootrule{0pt}%
   \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
+  % \YAD@setfoot%
 }%
 \newpagestyle{preliminary}[]{%
   \sethead[\thepage]%
@@ -2217,7 +2250,7 @@
   \setcounter{secnumdepth}{-10}%
   \YAD@setfoot%
 }%
-\newpagestyle{ordinary}[]{%
+\newpagestyle{mainmatter}[]{%
   \sethead[\thepage]%
   []%
   [\YAD@chapter@header]%
@@ -2233,10 +2266,18 @@
   {}%
   {\thepage}%
   \headrule%
-  \setcounter{secnumdepth}{-10}%
+  \YAD@setsecnumdepth{\YAD@secnumdepth}%
   \YAD@setfoot%
 }%
-\newpagestyle{mainmatter}[]{%
+\xapptocmd{\mainmatter}{%
+  \booltrue{YAD@mainmatter@used}%
+  \booltrue{YAD@mainmatter}%
+  \pagestyle{mainmatter}%
+  \ifbool{YAD@localtocs@classoption}%
+  {%
+    \booltrue{YAD@localtocs}%
+  }{%
+  }%
   \ifthenelse{\equal{\YAD@interligne}{single}}{%
     \singlespacing%
   }{%
@@ -2246,32 +2287,6 @@
       \onehalfspacing%
     }%
   }%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {%
-    \ifthenelse{%
-      \equal{\sectiontitle}{}%
-    }{%
-      \YAD@chapter@header%
-    }{%
-      \YAD@section@header%
-    }%
-  }%
-  {}%
-  {\thepage}%
-  \headrule%
-  \YAD@setsecnumdepth{\YAD@secnumdepth}%
-  \YAD@setfoot%
-}%
-\xapptocmd{\mainmatter}{%
-  \booltrue{YAD@mainmatter@used}%
-  \ifbool{YAD@localtocs@classoption}%
-  {%
-    \booltrue{YAD@localtocs}%
-  }{%
-  }
-  \pagestyle{mainmatter}%
 }{}{}%
 \AtEndDocument{%
   \ifboolexpr{%
@@ -2287,64 +2302,30 @@
     }%
   }%
 }%
-\newpagestyle{appendix}[]{%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [%
-  \ifthenelse{%
-    \value{secnumdepth}>-1
-    \and
-    \value{chapter}>0
-  }{%
-    \MakeUppercase\appendixname{} \thechapter.\
-  }{%
-  }
-  \chaptertitle%
-  ]%
-  {%
-    \ifthenelse{%
-      \equal{\sectiontitle}{}%
-    }{%
-      \ifthenelse{%
-        \value{secnumdepth}>-1
-        \and
-        \value{chapter}>0
-      }{%
-        \MakeUppercase\appendixname{} \thechapter.\
-      }{%
-      }
-      \chaptertitle%
-    }{%
-      \YAD@section@header%
-    }%
-  }%
-  {}%
-  {\thepage}%
-  \headrule%
-  \YAD@phantomsection%
-  \YAD@setsecnumdepth{\YAD@secnumdepth}%
-  \YAD@bookmarksetup{startatroot}%
-  \YAD@setfoot%
-}%
-\xapptocmd{\appendix}{%
-  \pagestyle{appendix}%
-}{}{}%
-\newpagestyle{biblio}[]{%
-  \setcounter{secnumdepth}{-10}%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {\YAD@chapter@header}%
-  {}%
-  {\thepage}%
-  \headrule%
-  % \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@bookmarksetup{startatroot}%
-  \YAD@setfoot%
-}%
+\AtEndPreamble{%
+  \xpretocmd{\part}{%
+    \printlocalbibs{}%
+  }{}{}%
+  \pretocmd{\mainmatter}{%
+    \printlocalbibs{}%
+    \cleardoublepage%
+  }{}{}%
+  \pretocmd{\appendix}{%
+    \printlocalbibs{}%
+    \cleardoublepage%
+  }{}{}%
+  \pretocmd{\backmatter}{%
+    \printlocalbibs{}%
+    \cleardoublepage%
+  }{}{}%
+  \pretocmd{\enddocument}{%
+    \printlocalbibs{}%
+  }{}{}%
+}
+  \apptocmd{\appendix}{%
+    \renewcommand\chaptername{\appendixname}%
+    \singlespacing%
+  }{}{}%
 \newpagestyle{backmatter}[]{%
   \singlespacing%
   \sethead[\thepage]%
@@ -2372,52 +2353,6 @@
   \booltrue{YAD@backmatter}%
   \boolfalse{YAD@localtocs}%
 }{}{}%
-\newpagestyle{contents}[]{%
-  \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@bookmarksetup{startatroot}%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\cmdKV@YAD@name]%
-  {\cmdKV@YAD@name}%
-  {}%
-  {\thepage}%
-  \headrule%
-  \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
-}%
-\newpagestyle{glossaire}[]{%
-  \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@bookmarksetup{startatroot}%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {\YAD@chapter@header}%
-  {}%
-  {\thepage}%
-  \headrule%
-  \setcounter{secnumdepth}{-10}%
-  \YAD@setfoot%
-}%
-\newpagestyle{index}[]{%
-  \singlespacing%
-  \sethead[\thepage]%
-  []%
-  [\YAD@chapter@header]%
-  {\YAD@chapter@header}%
-  {}%
-  {\thepage}%
-  \headrule%
-  \setcounter{secnumdepth}{-10}%
-  \cleardoublepage%
-  \YAD@phantomsection%
-  \YAD@setsecnumdepth{\YAD@secnumdepth}%
-  \YAD@bookmarksetup{startatroot}%
-  \YAD@setfoot%
-}%
 \newpagestyle{backcover}[]{%
   \singlespacing%
   \setlength{\footskip}{35pt}%
@@ -2486,8 +2421,9 @@
   \yadsetup{#1}
   \setlength{\fboxsep}{10pt}%
   \setlength{\YAD@titleboxwidth}{\linewidth-2\fboxsep-2\fboxrule}%
-  \renewcommand*{\do}[1]{%
   \pagestyle{titles}%
+  \renewcommand*{\do}[1]{%
+    \cleardoublepage%
 \begingroup%
 \expandafter\selectlanguage\expandafter{##1}%
   \begin{lrbox}{\YAD@titlebox}
@@ -2510,7 +2446,7 @@
     }%
     \noindent%
     \begin{minipage}{\linewidth-2\fboxsep-2\fboxrule}
-      \onehalfspacing%
+      % \onehalfspacing%
       \noindent%
       \ifthenelse{\equal{\cmdKV@YAD@frametitle}{none}}{%
       }{%
@@ -2540,8 +2476,10 @@
       }%
       \ifundef{\printsubtitle}{%
       }{%
-        \ifdraft{}{\vspace*{\stretch{.15}}}%
-        % \vspace*{\stretch{.15}}%
+        \ifdraft{}{%
+          \vskip0.5em%
+          % \vspace*{\stretch{.15}}%
+        }%
         \par%
         \centering%
         \Large\printsubtitle%
@@ -2936,7 +2874,6 @@
   \@ifstar{\@tempswatrue\csuse{YAD@starnostar@makekeywords}}{\@tempswafalse\csuse{YAD@starnostar@makekeywords}}%
 }%
 \csdef{YAD@starnostar@makekeywords}{%
-  \cleardoublepage%
   \pagestyle{prepreliminary}%
   % \YAD@astuce@expressioncle%
   \if@tempswa%
@@ -2966,8 +2903,8 @@
   \else%
   \vspace*{\stretch{1}}%
   \fi
-  \expandafter\selectlanguage\expandafter{\YAD@mainlanguage}%
   \pagestyle{preliminary}%
+  \expandafter\selectlanguage\expandafter{\YAD@mainlanguage}%
 }%
 \DTLnewdb{laboratories}%
 \newcommand{\laboratory}[3][]{%
@@ -3055,7 +2992,6 @@
   \@ifstar{\@tempswatrue\csuse{YAD@starnostar@makelaboratory}}{\@tempswafalse\csuse{YAD@starnostar@makelaboratory}}%
 }%
 \csdef{YAD@starnostar@makelaboratory}{%
-  \cleardoublepage%
   \pagestyle{prepreliminary}%
   \if@tempswa%
   \else%
@@ -3374,36 +3310,19 @@
   }%
 }%
 \newcommand{\makeabstract}{%
+  \pagestyle{preliminary}%
+  \bgroup%
   \ifbool{YAD@nomakeabstract}{%
   }{%
     \YAD@alarm@noabstract%
   }%
-  \pagestyle{preliminary}%
   \YAD@phantomsection%
   \addcontentsline{toc}{chapter}{\abstractname}%
-  \booltrue{YAD@makeabstract@used}%
-  \bgroup%
   \addtolength{\footskip}{6pt minus 6pt}%
   \setfootrule{0pt}%
-  \setfoot[][%
-  \ifboolexpr{%
-    bool {YAD@inprogress@work}%
-    or bool {YAD@inprogress@work@star}%
-  }{%
-    \textsc{\translate{lbl-inprogressfoottext} \today}%
-  }{%
-    \ifboolexpr{%
-      bool {YAD@submitted@work@star}%
-    }{%
-      \textsc{\translate{lbl-submittedfoottext} \today}%
-    }{%
-    }%
-  }%
-  ][]{%
-    % \medskip\par%
+  \setfoot[][][]{%
     \YAD@laboratory@abstract@page%
   }{}{}%
-  \cleardoublepage%
   \renewcommand{\YAD@chapter@header}{\abstractname}%
   \renewcommand{\YAD@section@header}{\abstractname}%
   \YAD@abstract@page%
@@ -3411,6 +3330,7 @@
   \egroup%
   \YAD@nolaboratorytrue%
   \YAD@nolaboratoryaddresstrue%
+  \booltrue{YAD@makeabstract@used}%
 }%
 \newcommand{\YAD@abstract@page@rule}[1][black]{\bgroup\color{#1}\noindent\rule[2pt]{\linewidth}{2pt}\egroup}
 \AtEndDocument{%
@@ -3471,6 +3391,7 @@
   }%
 }%
 \newcommand{\makebackcover}{%
+  \printlocalbibs{}%
   \pagestyle{backcover}%
   \ifthenelse{\equal{\YAD@colophon@location}{recto-backcover}}{%
     \newgeometry{centering,nomarginpar,bottom=1cm,top=1cm,headheight=\YAD@max@logoheight,hmargin=2cm,includeall}%
@@ -3486,7 +3407,6 @@
         }%
         \csdef{YAD@starnostar@makededications}{%
         \pagestyle{prepreliminary}%
-        \cleardoublepage%
         \if@tempswa%
         \else%
         \vspace*{\stretch{2}}%
@@ -3535,13 +3455,14 @@
         \else%
         \vspace*{\stretch{2}}%
         \fi
+        \pagestyle{preliminary}%
         }%
 \csdef{makefrontepigraphs}{%
   \@ifstar{\@tempswatrue\csuse{YAD@starnostar@makefrontepigraphs}}{\@tempswafalse\csuse{YAD@starnostar@makefrontepigraphs}}%
 }%
 \csdef{YAD@starnostar@makefrontepigraphs}{%
   \patchcmd{\epigraphs}{\qitemlabel}{\qitemlabel\itemsep=1.5\baselineskip}{}{}%
-  \cleardoublepage%
+  \pagestyle{prepreliminary}%
   \if@tempswa%
   \else%
   \vspace*{\stretch{2}}%
@@ -3604,18 +3525,6 @@
   \else%
   \vspace*{\stretch{2}}%
   \fi
-}%
-\newenvironment{epigraphspage}{%
-  \patchcmd{\epigraphs}{\qitemlabel}{\qitemlabel\itemsep=1.5\baselineskip}{}{}
-  \cleardoublepage%
-  \vspace*{\stretch{1}}%
-}{%
-  \vspace*{\stretch{1}}%
-}%
-\BeforeBeginEnvironment{epigraphspage}{%
-  \pagestyle{prepreliminary}%
-}%
-\AfterEndEnvironment{epigraphspage}{%
   \pagestyle{preliminary}%
 }%
 \def\YAD@leftmargin {0pt}
@@ -3864,17 +3773,26 @@
   }{%
   }%
 }{}{}%
-\LetLtxMacro{\YAD@ORI@chapter}{\chapter}%
-\AfterPreamble{% delay the redefinition when titlesec has done its own
-  \renewcommand\chapter{%
-    \ifbool{YAD@localbibs}{%
+\newcommand{\printlocalbibs}{%
+  \ifbool{YAD@localbibs}{%
+    \ifbool{YAD@localbibs@used}{%
+    }{%
       \let\YAD@ORI@blx@warn@bibempty\blx@warn@bibempty%
       \def\blx@warn@bibempty{}%
       \YAD@printbibliography@ORI[segment=\therefsegment,heading=YAD@localbibs@heading]%
       \let\blx@warn@bibempty\YAD@ORI@blx@warn@bibempty%
-    }{%
-    }
+      \booltrue{YAD@localbibs@used}%
+    }%
+  }{%
+  }%
+}%
+\LetLtxMacro{\YAD@ORI@chapter}{\chapter}%
+\AfterPreamble{% delay the redefinition when titlesec has done its own
+  \renewcommand\chapter{%
+    \printlocalbibs{}%
+    \boolfalse{YAD@localbibs@used}%
     \cleardoublepage%
+    \renewcommand{\sectiontitle}{}%
     \YAD@phantomsection%
     \ifbool{YAD@output@paper}{%
     }{%
@@ -3917,7 +3835,7 @@
     \boolfalse{YAD@nonnumbered@paragraph}%
     \boolfalse{YAD@nonnumbered@subparagraph}%
     \if@mainmatter%
-    \YAD@setsecnumdepth{\YAD@secnumdepth}
+    \YAD@setsecnumdepth{\YAD@secnumdepth}%
     \fi%
     \YAD@tmp@chapter[#1][#2]{#3}%
   }%
@@ -3933,7 +3851,7 @@
 \xapptocmd{\printglossary}{\renewcommand{\YAD@localtoc}{\YAD@default@localtoc}}{}{}%
 \xpretocmd{\printindex}{\renewcommand{\YAD@localtoc}{}}{}{}%
 \xapptocmd{\printindex}{\renewcommand{\YAD@localtoc}{\YAD@default@localtoc}}{}{}%
-\LetLtxMacro{\YAD@ORI@section}{\section}
+\LetLtxMacro{\YAD@ORI@section}{\section}%
 \renewcommand\section{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@chapter}{%
@@ -3942,7 +3860,7 @@
   }%
   \fi%
   \@ifstar{\YAD@starred@section}{\YAD@unstarred@section}%
-}
+}%
 \newcommandtwoopt*{\YAD@tmp@section}[3][][]{%
   \ifthenelse{\isempty{#1}}{%
     \ifthenelse{\isempty{#2}}{%
@@ -3988,7 +3906,7 @@
   \fi%
   \YAD@tmp@section[#1][#2]{#3}%
 }%
-\LetLtxMacro{\YAD@ORI@subsection}{\subsection}
+\LetLtxMacro{\YAD@ORI@subsection}{\subsection}%
 \renewcommand\subsection{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@section}{%
@@ -3997,7 +3915,7 @@
   }%
   \fi%
   \@ifstar{\YAD@starred@subsection}{\YAD@unstarred@subsection}%
-}
+}%
 \newcommand*{\YAD@tmp@subsection}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@subsection{#2}%
@@ -4025,7 +3943,7 @@
   \fi%
   \YAD@tmp@subsection[#1]{#2}%
 }%
-\LetLtxMacro{\YAD@ORI@subsubsection}{\subsubsection}
+\LetLtxMacro{\YAD@ORI@subsubsection}{\subsubsection}%
 \renewcommand\subsubsection{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@subsection}{%
@@ -4034,7 +3952,7 @@
   }%
   \fi%
   \@ifstar{\YAD@starred@subsubsection}{\YAD@unstarred@subsubsection}%
-}
+}%
 \newcommand*{\YAD@tmp@subsubsection}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@subsubsection{#2}%
@@ -4060,7 +3978,7 @@
   \fi%
   \YAD@tmp@subsubsection[#1]{#2}%
 }%
-\LetLtxMacro{\YAD@ORI@paragraph}{\paragraph}
+\LetLtxMacro{\YAD@ORI@paragraph}{\paragraph}%
 \renewcommand\paragraph{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@subsubsection}{%
@@ -4069,7 +3987,7 @@
   }%
   \fi%
   \@ifstar{\YAD@starred@paragraph}{\YAD@unstarred@paragraph}%
-}
+}%
 \newcommand*{\YAD@tmp@paragraph}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@paragraph{#2}%
@@ -4093,7 +4011,7 @@
   \fi%
   \YAD@tmp@paragraph[#1]{#2}%
 }%
-\LetLtxMacro{\YAD@ORI@subparagraph}{\subparagraph}
+\LetLtxMacro{\YAD@ORI@subparagraph}{\subparagraph}%
 \renewcommand\subparagraph{%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@paragraph}{%
@@ -4102,7 +4020,7 @@
   }%
   \fi%
   \@ifstar{\YAD@starred@subparagraph}{\YAD@unstarred@subparagraph}%
-}
+}%
 \newcommand*{\YAD@tmp@subparagraph}[2][]{%
   \ifthenelse{\isempty{#1}}{%
     \YAD@ORI@subparagraph{#2}%
@@ -4209,7 +4127,7 @@
     \defbibheading{YAD@localbibs@heading}[\translate{lbl-localbibname}]{%
       \renewcommand\addcontentsline[3]{}%
       \section*{#1}%
-      \let\addcontentsline\YAD@addcontentsline
+      \let\addcontentsline\YAD@addcontentsline%
     }%
     \@ifpackageloaded{csquotes}{%
       \SetCiteCommand{\autocite}%
@@ -4218,14 +4136,18 @@
     \let\YAD@printbibliography@ORI\printbibliography%
     \renewcommand{\printbibliography}[1][]{%
       \booltrue{YAD@printbibliography@used}%
-      \pagestyle{biblio}%
+      \singlespace%
       \chapter*{\bibname}%
-      \begingroup%
-      \let\cleardoublepage\relax%
       \YAD@printbibliography@ORI[heading=none,#1]%
-      \endgroup%
+      \endsinglespace%
     }%
   }{%
+    \BeforeBeginEnvironment{thebibliography}{%
+      \singlespacing%
+    }%
+    \AtEndEnvironment{thebibliography}{%
+      \clearpage%
+    }%
   }%
 }%
 \AtEndDocument{%
@@ -4319,6 +4241,18 @@
 }%
 }%
 \AtEndPreamble{%
+  \@ifpackageloaded{glossaries}{%
+    \IfLanguageName{english}{%
+      \makeatletter
+      \let\glossariescaptionsenglish\undefined
+      \input{glossaries-english.ldf}
+      \makeatother
+    }{%
+    }%
+  }{%
+  }%
+}%
+\AtEndPreamble{%
   \ifPDFTeX
   \shorthandon{;:!?}%
   \fi