yathesis (14apr20)

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

1 files changed, 143 insertions, 209 deletions

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