From ff1e02dbf9c33ee832d7f0cb39a42648b376c9c5 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Thu, 15 Oct 2020 03:00:58 +0000
Subject: CTAN sync 202010150300

---
 macros/latex/contrib/yathesis/source/yathesis.dtx | 141 ++++++++++++++--------
 1 file changed, 93 insertions(+), 48 deletions(-)

(limited to 'macros/latex/contrib/yathesis/source/yathesis.dtx')

diff --git a/macros/latex/contrib/yathesis/source/yathesis.dtx b/macros/latex/contrib/yathesis/source/yathesis.dtx
index 9b7a90f18b..581528318b 100644
--- a/macros/latex/contrib/yathesis/source/yathesis.dtx
+++ b/macros/latex/contrib/yathesis/source/yathesis.dtx
@@ -23,7 +23,7 @@
 %<*readme>
 -----------------------------------------------------------------------
 
-- `yathesis` --- Yet Another Thesis Class, version 1.0.3
+- `yathesis` --- Yet Another Thesis Class, version 1.0.4
 - 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
@@ -70,14 +70,14 @@ Typesetting the documentation of the class requires:
 \fi
 %</internal>
 %<*class|install>
-\def\yathesisfileversion{1.0.3}
-\def\yathesisfiledate{2020-06-16}
+\def\yathesisversion{1.0.4}
+\def\yathesisdate{2020-10-14}
 %</class|install>
 %<*install>
 \input docstrip.tex
 \Msg{********************************************************}
 \Msg{* Installation}
-\Msg{* Class: yathesis \yathesisfiledate\space v\yathesisfileversion}
+\Msg{* Class: yathesis \yathesisdate\space v\yathesisversion}
 \Msg{* that helps to write thesis following French rules (DB)}
 \Msg{********************************************************}
 \keepsilent
@@ -361,7 +361,7 @@ This work consists of the file  yathesis.dtx
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{yathesis}[\yathesisfiledate\space v\yathesisfileversion\space Yet another class for writing thesis (DB)]
+\ProvidesClass{yathesis}[\yathesisdate\space v\yathesisversion\space Yet another class for writing thesis (DB)]
 %    \end{macrocode}
 %
 % Pour pouvoir définir des macros dont les arguments puissent être
@@ -610,7 +610,6 @@ This work consists of the file  yathesis.dtx
     #1/false/.code={%
       \boolfalse{YAD@#1}%
     },
-    #1/.initial=false,
     #1/.default=true,
   }%
   % }{%
@@ -755,7 +754,6 @@ This work consists of the file  yathesis.dtx
     \boolfalse{YAD@submitted@work@star}%
     \booltrue{YAD@final@work}%
   },%
-  version/.initial=final%
 }%
 \yadsetup{version=inprogress}%
 %    \end{macrocode}
@@ -775,8 +773,8 @@ This work consists of the file  yathesis.dtx
     \booltrue{YAD@output@paper@star}%
   },%
   output/screen/.code={},%
-  output/.initial=screen%
 }%
+\yadsetup{output=screen}%
 %    \end{macrocode}
 %
 % On définit la clé de classe "localtocs" qui fait que les titres des chapitres
@@ -863,6 +861,7 @@ This work consists of the file  yathesis.dtx
   },%
   localbibs/.code={%
     \YAD@localbibs@common@code{false}%
+    \AtEndPreamble{\BiblatexSplitbibDefernumbersWarningOff}%
   }%
 }
 %    \end{macrocode}
@@ -874,8 +873,8 @@ This work consists of the file  yathesis.dtx
   space/single/.code={\def\YAD@interligne{single}},%
   space/onehalf/.code={\def\YAD@interligne{onehalf}},%
   space/double/.code={\def\YAD@interligne{double}},%
-  space/.initial=single%
 }%
+\yadsetup{space=single}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -892,8 +891,8 @@ This work consists of the file  yathesis.dtx
   colophon-location/nowhere/.code={\def\YAD@colophon@location{nowhere}},%
   colophon-location/verso-frontcover/.code={\def\YAD@colophon@location{verso-frontcover}},%
   colophon-location/recto-backcover/.code={\def\YAD@colophon@location{recto-backcover}},%
-  colophon-location/.initial=verso-frontcover%
 }%
+\yadsetup{colophon-location=verso-frontcover}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -930,7 +929,7 @@ This work consists of the file  yathesis.dtx
 %
 %    \begin{macrocode}
 \PassOptionsToPackage{a4paper}{geometry}%
-\PassOptionsToPackage{nodayofweek}{datetime}%
+% \PassOptionsToPackage{nodayofweek}{datetime}%
 \PassOptionsToPackage{export}{adjustbox}%
 \PassOptionsToPackage{numbered}{bookmark}%
 % \PassOptionsToPackage{pagestyles}{titlesec}%
@@ -958,7 +957,7 @@ This work consists of the file  yathesis.dtx
   titlesec/.code={\PassOptionsToPackage{#1}{titlesec}},%
   draftwatermark/.code={\PassOptionsToPackage{#1}{draftwatermark}},%
   babel/.code={\PassOptionsToPackage{#1}{babel}},%
-  datetime/.code={\PassOptionsToPackage{#1}{datetime}}%
+  datetime2/.code={\PassOptionsToPackage{useregional,#1}{datetime2}}%
 }%
 %    \end{macrocode}
 %
@@ -1138,7 +1137,7 @@ This work consists of the file  yathesis.dtx
 %    \end{macrocode}
 % Pour générer les dates (sans affichage du jour de la semaine).
 %    \begin{macrocode}
-\RequirePackage{datetime}[2013/09/10]%
+\RequirePackage[useregional]{datetime2}[2020-03-02]%
 %    \end{macrocode}
 % Pour faire pointer les hyperliens au début des flottants plutôt qu'au
 % début des légendes
@@ -1332,6 +1331,13 @@ This work consists of the file  yathesis.dtx
   \tcbuselibrary{skins}%
 %    \end{macrocode}
 %
+% Afin de préserver la compatibilité ascendante, on demande le comportement
+% original du \Package{tcolorbox} en ce qui concerne les espaces verticaux avant
+% et après les boîtes de couleur de ce package.
+%    \begin{macrocode}
+  \tcbsetforeverylayer{autoparskip}
+%    \end{macrocode}
+%
 % Par défaut, les listings sont composés en fonte à châsse fixe
 %    \begin{macrocode}
 % \lstset{basicstyle=\ttfamily}
@@ -2184,7 +2190,7 @@ This work consists of the file  yathesis.dtx
             \YAD@translation{\YAD@the@staff-pl-hdr-female}%
           }{%
             \YAD@translation{\YAD@the@staff-pl-hdr}%
-          }
+          }%
         }{%
           \ifboolexpr{%
             bool {YAD@only@female@\YAD@the@staff}%
@@ -2192,7 +2198,7 @@ This work consists of the file  yathesis.dtx
             \YAD@translation{\YAD@the@staff-pl-female}%
           }{%
             \YAD@translation{\YAD@the@staff-pl}%
-          }
+          }%
         }%
       }{%
         \ifboolexpr{%
@@ -2204,7 +2210,7 @@ This work consists of the file  yathesis.dtx
             \YAD@translation{\YAD@the@staff-hdr-female}%
           }{%
             \YAD@translation{\YAD@the@staff-hdr}%
-          }
+          }%
         }{%
           \ifboolexpr{%
             bool {YAD@only@female@\YAD@the@staff}%
@@ -2212,7 +2218,7 @@ This work consists of the file  yathesis.dtx
             \YAD@translation{\YAD@the@staff-female}%
           }{%
             \YAD@translation{\YAD@the@staff}%
-          }
+          }%
         }%
       }%
     }{%
@@ -2700,16 +2706,16 @@ This work consists of the file  yathesis.dtx
 }{%
 }%
 \ifthenelse{\equal{#2}{title}}{%
-  \YAD@hypersetup{pdftitle=\YAD@metatitle}%
+  \AtEndPreamble{\YAD@hypersetup{pdftitle=\YAD@metatitle}}%
 }{%
 }%
 \ifundef{\YAD@metasubject}{%
   \ifundef{\YAD@metaacademicfield}{%
   }{%
-    \YAD@hypersetup{pdfsubject=\YAD@metaacademicfield}%
+    \AtEndPreamble{\YAD@hypersetup{pdfsubject=\YAD@metaacademicfield}}%
   }%
 }{%
-  \YAD@hypersetup{pdfsubject=\YAD@metasubject}%
+  \AtEndPreamble{\YAD@hypersetup{pdfsubject=\YAD@metasubject}}%
 }%
 %    \end{macrocode}
 % Création de la commande affichant le résultat de la commande bilingue
@@ -2838,7 +2844,7 @@ This work consists of the file  yathesis.dtx
     }%
   }%
   \YAD@error@firstlastnames@empty{de l'auteur de la thèse}{#2}{#3}{\author}%
-  \YAD@hypersetup{pdfauthor=\YAD@firstname@author{} \YAD@lastname@author}%
+  \AtEndPreamble{\YAD@hypersetup{pdfauthor=\YAD@firstname@author{} \YAD@lastname@author}}%
   \newcommand*\YAD@email@author{%
     #1%
   }%
@@ -2992,7 +2998,7 @@ This work consists of the file  yathesis.dtx
       and bool {YAD@valid@year}%
     }{%
       \csdef{printdate}{%
-        \formatdate{#1}{#2}{#3}%
+        \DTMdisplaydate{#3}{#2}{#1}{}%
       }%
     }{%
       \csdef{printdate}{%
@@ -3013,7 +3019,7 @@ This work consists of the file  yathesis.dtx
       and bool {YAD@valid@year}%
     }{%
       \csdef{printsubmissiondate}{%
-        \formatdate{#1}{#2}{#3}%
+        \DTMdisplaydate{#3}{#2}{#1}{}%
       }%
     }{%
       \csdef{printsubmissiondate}{%
@@ -3202,9 +3208,9 @@ This work consists of the file  yathesis.dtx
 %    \end{macrocode}
 % \end{macro}
 %
-% On crée la macro "\YAD@setsecnumdepth", analogue à "\@setseccntt@c" du \Package{tocvsec2}, qui fixe
-% la valeur du compteur "secnumdepth" selon l'argument donné sous la forme du
-% nom d'une commande de sectionnement
+% On crée la macro "\YAD@setsecnumdepth", analogue à "\@setseccntt@c" du
+% \Package{tocvsec2}, qui fixe la valeur du compteur "secnumdepth" selon
+% l'argument donné sous la forme du nom d'une commande de sectionnement
 %    \begin{macrocode}
         \newcommand{\YAD@setsecnumdepth}[1]{%
         \newif\if@YAD@knownsect%
@@ -3825,7 +3831,10 @@ This work consists of the file  yathesis.dtx
         \par%
         \YAD@translation{company} \textbf{\textsc{\Large\printcompany}}%
       }%
-      \ifbool{YAD@nodoctoralschool}{%
+      \ifboolexpr{%
+        bool {YAD@nodoctoralschool}%
+        or bool {YAD@hdr}%
+      }{%
       }{%
         \ifdraft{}{\vspace*{\stretch{1.5}}}%
         % \vspace*{\stretch{1.5}}%
@@ -3846,6 +3855,26 @@ This work consists of the file  yathesis.dtx
           \textbf{\printdoctoralschool}%
         }%
       }%
+%    \end{macrocode}
+%
+% Si une école doctorale est spécifiée alors que la thèse est une HDR, un
+% warning est émis.
+%    \begin{macrocode}
+      \ifbool{YAD@hdr}{%
+        \YAD@ifemptyorundef{\printdoctoralschool}{%
+        }{%
+          \YAD@ClassWarningNoLine{%
+            Une école doctorale a été spécifiée mais elle ne\MessageBreak%
+            figurera nulle part : les HDR ne sont pas préparées\MessageBreak%
+            sous l'égide d'écoles doctorales (cf. \MessageBreak%
+            https://www.legifrance.gouv.fr/loda/id/JORFTEXT000000298904)%
+          }%
+        }%
+      }{%
+      }%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
       \ifbool{YAD@nolaboratory}{%
       }{%
         \ifdraft{}{\vspace*{\stretch{.5}}}%
@@ -3961,7 +3990,7 @@ This work consists of the file  yathesis.dtx
           \large%
           \YAD@translation{speciality} \textbf{\printspeciality}%
         }%
-      }
+      }%
     \end{center}
   % \end{minipage}%
   \vspace*{\stretch{1}}%
@@ -4123,9 +4152,9 @@ This work consists of the file  yathesis.dtx
   \ifthenelse{\isempty{#1}}{%
   }{%
     \ifthenelse{\isempty{#2}}{%
-      \YAD@hypersetup{pdfkeywords={#1}}%
+      \AtEndPreamble{\YAD@hypersetup{pdfkeywords={#1}}}%
     }{%
-      \YAD@hypersetup{pdfkeywords={#1} ({#2})}%
+      \AtEndPreamble{\YAD@hypersetup{pdfkeywords={#1} ({#2})}}%
     }%
   }%
 }%
@@ -5761,21 +5790,37 @@ This work consists of the file  yathesis.dtx
 % On définit la valeur, en anglais et en français, de la macro "\colophon" du colophon.
 %
 %    \begin{macrocode}
-\colophontext{%
-  \IfLanguageName{french}{%
-    Mémoire de thèse 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.%
-  }{%
-    Doctoral dissertation entitled “\printtitle”, written by \printauthor{},
-    completed on \today{}, typeset with the document preparation system
-    \href{https://en.wikipedia.org/wiki/LaTeX}{\LaTeX{}} and the
-    \href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} class dedicated
-    to theses prepared in France.%
+\AtEndPreamble{%
+  \colophontext{%
+    \IfLanguageName{french}{%
+      Mémoire de thèse intitulé \YAD@ifemptyorundef{\printtitle}{%
+        \YAD@generic@argument@translate{title}%
+      }{%
+        \frquote{\printtitle}%
+      }, écrit par \YAD@ifemptyorundef{\printauthor}{%
+        \YAD@generic@argument@translate{author}%
+      }{%
+        \printauthor%
+      }, achevé le \today{}, composé au moyen du système de préparation de
+      document \YAD@href{https://fr.wikipedia.org/wiki/LaTeX}{\LaTeX{}} et de la
+      classe \YAD@href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}}
+      dédiée aux thèses préparées en France.%
+    }{%
+      Doctoral dissertation entitled \YAD@ifemptyorundef{\printtitle}{%
+        \YAD@generic@argument@translate{title}%
+      }{%
+        “\printtitle”%
+      }, written by \YAD@ifemptyorundef{\printauthor}{%
+        \YAD@generic@argument@translate{author}%
+      }{%
+        \printauthor%
+      }, completed on \today{}, typeset with the document preparation system
+      \YAD@href{https://en.wikipedia.org/wiki/LaTeX}{\LaTeX{}} and the
+      \YAD@href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} class
+      dedicated to theses prepared in France.%
+    }%
   }%
-}%
+}
 %    \end{macrocode}
 %
 % % Le contenu de l'environnement "introduction" est collecté dans la macro
@@ -6521,7 +6566,7 @@ This work consists of the file  yathesis.dtx
 #include:colophon
 #include:csquotes
 #include:datatool
-#include:datetime
+#include:datetime2
 #include:draftwatermark
 #include:environ
 #include:epigraph
@@ -6600,7 +6645,7 @@ datatool
 titlesec
 draftwatermark
 babel
-datetime
+datetime2
 #endkeyvals
 #
 \yadsetup{%<options%>}#n
@@ -6936,10 +6981,10 @@ 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}%
       }{%
       }%
-      \ifthenelse{\equal{#3}{Contexte du chaos du rire}}{\cleardoublepage\zlabel{chapter}%
+      \ifthenelse{\equal{#3}{Développement du chaos du rire}}{\zlabel{localbib}%
       }{%
       }%
       \ifthenelse{\equal{#3}{Documents juridiques}}{\cleardoublepage\zlabel{appendix}%
-- 
cgit v1.2.3

