summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl9
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/developpements.tex2
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/usage-avance.tex39
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/introduction.tex24
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-liminaires.tex9
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-titre.tex20
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/personnalisation.tex16
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/proprietes-document.tex33
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/glossaries/acronyms.tex21
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex2
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.bib14
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdfbin6488337 -> 6494376 bytes
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex4
-rw-r--r--Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdfbin1230247 -> 1231592 bytes
-rw-r--r--Master/texmf-dist/source/latex/yathesis/yathesis.dtx343
-rw-r--r--Master/texmf-dist/tex/latex/yathesis/yathesis-translations.tex57
-rw-r--r--Master/texmf-dist/tex/latex/yathesis/yathesis.cls242
18 files changed, 556 insertions, 281 deletions
diff --git a/Master/texmf-dist/doc/latex/yathesis/README.md b/Master/texmf-dist/doc/latex/yathesis/README.md
index 05f008885ac..fdbaeb4727b 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 0.99t
+- `yathesis` --- Yet Another Thesis Class, version 0.99u
- 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 954f8d2b41a..8594c2bbe58 100644
--- a/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
+++ b/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
@@ -144,16 +144,19 @@ url=
logo=
logoheight=
url=
+nologo
#endkeyvals
#keyvals:\coinstitute
logo=
logoheight=
url=
+nologo
#endkeyvals
#keyvals:\company
logo=
logoheight=
url=
+nologo
#endkeyvals
#keyvals:\doctoralschool
logo=
@@ -269,6 +272,12 @@ juniorresearcher*
\ordernumber[%<numéro d'ordre%>]#n
\ordernumber#n*
#
+#keyvals:\maketitle
+nofrontcover
+noaim
+frametitle=#shadowbox,ovalbox,none,fbox
+#endkeyvals
+#
# Preliminary part
#
\disclaimer{clause%text}#n
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/developpements.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/developpements.tex
index 795ece5c71b..678d61e7f5a 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/developpements.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/developpements.tex
@@ -91,7 +91,7 @@
\end{docCommand}
Un exemple d'utilisation serait alors :
-\begin{dbexample}{Nouvelle corporation}{doctor}
+\begin{dbexample}{Nouvelle corporation}{doctor-bis}
\indexex{corporation!non prédéfinie}%
Si on souhaite spécifier que certains membres du jury sont docteurs, il suffit
de définir \aside{une seule fois} la corporation (par exemple) |doctor| :
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/usage-avance.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/usage-avance.tex
index b24feaa366a..58fab83b754 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/usage-avance.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/annexes/usage-avance.tex
@@ -67,31 +67,46 @@ correspondantes, la \yatCl{} propose de désactiver ces erreurs de façon :
\begin{docKey}{noacademicfield}{=\docValue{true}\textbar\docValue{false}}{par
défaut \docValue{true}, initialement \docValue{false}}
Cette option désactive l'erreur émise si la commande \refCom{academicfield}
- est omise (ou à argument obligatoire vide).
+ est omise (ou à argument obligatoire vide). En outre, elle masque sur la ou
+ les pages de titre tout ce qui concerne la discipline \aside{ou champ
+ disciplinaire} et la spécialité.
\end{docKey}
\begin{docKey}{nodate}{=\docValue{true}\textbar\docValue{false}}{par défaut
\docValue{true}, initialement \docValue{false}}
- Cette option désactive l'erreur émise si la commande \refCom{date} est
- omise (ou à arguments obligatoires vides ou incorrects)\footnote{La
- commande \refCom{date} n'est en fait pas \enquote{obligatoire} en
- versions \enquote{à soumettre} (valeurs \docValue{submitted} et
- \docValue{submitted*} de la clé \refKey{version}).}.
+ Cette option désactive l'erreur émise si la commande \refCom{date} est omise
+ (ou à arguments obligatoires vides ou incorrects)\footnote{La commande
+ \refCom{date} n'est en fait pas \enquote{obligatoire} en versions
+ \enquote{à soumettre} (valeurs \docValue{submitted} et
+ \docValue{submitted*} de la clé \refKey{version}).}. En outre, elle masque
+ sur la ou les pages de titre tout ce qui concerne la date de soutenance.
\end{docKey}
\begin{docKey}{noinstitute}{=\docValue{true}\textbar\docValue{false}}{par
défaut \docValue{true}, initialement \docValue{false}}
Cette option désactive l'erreur émise si la commande \refCom{institute} est
- omise (ou à argument obligatoire vide).
+ omise (ou à argument obligatoire vide). En outre, elle masque sur la ou les
+ pages de titre tout ce qui concerne l'institut et, le cas échéant,
+ l'institut de cotutelle.
\end{docKey}
\begin{docKey}{nodoctoralschool}{=\docValue{true}\textbar\docValue{false}}{par
défaut \docValue{true}, initialement \docValue{false}}
- Cette option désactive l'erreur émise si la commande
- \refCom{doctoralschool} est omise (ou à argument obligatoire vide).
+ Cette option désactive l'erreur émise si la commande \refCom{doctoralschool}
+ est omise (ou à argument obligatoire vide). En outre, elle masque sur la ou
+ les pages de titre tout ce qui concerne l'école doctorale.
\end{docKey}
\begin{docKey}{nolaboratory}{=\docValue{true}\textbar\docValue{false}}{par
défaut \docValue{true}, initialement \docValue{false}}
- Cette option désactive l'erreur émise si la commande \refCom{laboratory}
- est omise (ou à 1\ier{} argument obligatoire vide).
- \end{docKey}
+ Cette option désactive l'erreur émise si la commande \refCom{laboratory} est
+ omise (ou à 1\ier{} argument obligatoire vide). En outre, elle masque sur la
+ ou les pages de titre tout ce qui concerne le laboratoire.
+ \end{docKey}
+ %
+ \changes*{v0.99u}{2019-03-28}{Options \protect\refKey*{noinstitute},
+ \protect\refKey*{nodoctoralschool}, \protect\refKey*{nolaboratory},
+ \protect\refKey*{nodate}, \protect\refKey*{noacademicfield} : désormais,
+ désactivent sur les pages de titre l'affichage des éléments correspondants
+ (ainsi que l'institut de cotutelle pour \protect\refKey*{noinstitute} et la
+ spécialité pour \protect\refKey*{noacademicfield})}%
+ %
\begin{docKey}{nolaboratoryadress}{=\docValue{true}\textbar\docValue{false}}{par
défaut \docValue{true}, initialement \docValue{false}}
Cette option désactive l'erreur émise si la commande \refCom{laboratory}
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/introduction.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/introduction.tex
index 9b1e4dd032d..5f25d1d2279 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/introduction.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/introduction.tex
@@ -17,15 +17,19 @@ université donnée.
Parmi les exceptions notables figurent les classes :
\begin{itemize}
-\item \class{droit-fr}, destinée aux thèses en droit préparées en France ;
-\item \class{ulthese}, destinée aux thèses francophones préparées
- à l'Université Laval (Canada) ;
+\item \class{droit-fr} et
+ \class[https://github.com/ienissei/frenchlaw]{frenchlaw}, destinées aux
+thèses en droit préparées en France ;
+\item \class{ulthese}, destinée aux thèses francophones préparées à l'université
+ Laval (Canada) ;
\item \class[http://www.loria.fr/~roegel/TeX/TUL.html]{thesul}, destinée
- initialement aux thèses en informatique préparées à l'Université de Lorraine,
+ initialement aux thèses en informatique préparées à l'université de Lorraine,
mais aisément adaptable à tout autre champ disciplinaire et institut en
- France. Cette classe n'est toutefois pas fournie par les distributions \TeX{}
- et nécessite d'être installée manuellement.
+ France.
\end{itemize}
+Il est à noter que les classes \class{frenchlaw} et \class{thesul} ne sont pas
+fournies par les distributions \TeX{} et nécessitent d'être installées
+manuellement.
\frenchabstract{}
@@ -150,13 +154,13 @@ Elle est aussi \emph{directement utilisable} au moyen d'éditeurs (et compilateu
tels que :
\begin{itemize}
\item \href{https://fr.sharelatex.com/}{ShareLaTeX} par le biais d'un
- \href{https://fr.sharelatex.com/templates/thesis/yathesis-template}{canevas}
+ \href{https://frama.link/sharelatex-yathesis-template}{canevas}
et
- \href{https://fr.sharelatex.com/templates/thesis/yathesis-specimen}{spécimen}\detailsspecimencanevas ;
+ \href{https://frama.link/sharelatex-yathesis-specimen}{spécimen}\detailsspecimencanevas ;
\item \href{https://www.overleaf.com/}{Overleaf} par le biais d'un
- \href{https://www.overleaf.com/latex/templates/template-of-a-thesis-written-with-yathesis-class/nhtmtthnqwtd}{canevas}
+ \href{https://frama.link/overleaf-yathesis-template}{canevas}
et
- \href{https://www.overleaf.com/latex/examples/sample-of-a-thesis-written-with-yathesis-class/nbcfvfqgnjfq}{spécimen}\detailsspecimencanevas ;
+ \href{https://frama.link/overleaf-yathesis-sample}{spécimen}\detailsspecimencanevas ;
\end{itemize}
mais alors dans des versions probablement bien moins à jour que celle livrée
avec les distributions \texlive et \miktex (surtout si ces dernières sont mises
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 61b62b08261..9049a0bdfe7 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
@@ -331,7 +331,7 @@ page.
Ils \index{nom!résumé}%
sont respectivement intitulés \enquote{\abstractname} ou
\enquote{\selectlanguage{english}\abstractname}\selonlangueshort{} mais
- l'argument optionnel permet de spécifier un \meta{titre} (ou \meta{nom}
+ l'argument optionnel permet de spécifier un \meta{titre} (ou \meta{nom})
\meta{alternatif}\redefexprcle.
\end{docEnvironment}
@@ -466,9 +466,10 @@ la \yatCl. Cependant, celle-ci fournit des fonctionnalités propres au
\begin{docCommand}{printsymbols}{\oarg{options}}
\index{symbole!liste de ---s}%
Cette commande, fournie par le \Package{glossaries}, produit la liste des
- symboles saisies (par exemple) au moyen de la \refCom{newglssymbol}. Mais
- elle a été légèrement redéfinie, sa clé \refKey{style} ayant pour valeur par
- défaut \docValue{yadsymbolstyle} (et non \docValue{list}) :
+ symboles saisis au moyen de (par exemple) la commande
+ \refCom{newglssymbol}. Mais elle a été légèrement redéfinie, sa clé
+ \refKey{style} ayant pour valeur par défaut \docValue{yadsymbolstyle} (et non
+ \docValue{list}) :
\begin{docKey}{style}{=\docValue{yadsymbolstyle}\textbar\meta{style}}{pas de valeur
par défaut, initialement \docValue{yadsymbolstyle}}
Cette clé permet de spécifier le style appliqué à la liste des
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-titre.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-titre.tex
index 4cbe4ad5d15..09ac1f92d4d 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-titre.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/pages-titre.tex
@@ -32,12 +32,15 @@ les pages de titre de la thèse.
\end{docCommand}
La commande \refCom{maketitle} admet un argument optionnel permettant de
-personnaliser les pages de titre au moyen des clés \refKey{nofrontcover} et
-\refKey{frametitle}.%
+personnaliser les pages de titre au moyen des clés \refKey{nofrontcover},
+\refKey{noaim} et \refKey{frametitle}.%
%
\changes{v0.99g}{2014-07-13}{Personnalisation des pages de titre possible en
option de \protect\docAuxCommand{maketitle} (\emph{via}
\protect\refKey{frametitle} et \protect\refKey{nofrontcover})}%
+\changes{v0.99u}{2019-03-28}{Sur la ou les pages de titre en français, accord en
+ genre automatique des expressions clés introduisant les groupes de membres du
+ jury}%
\begin{docKey}{nofrontcover}{=\docValue{true}\textbar\docValue{false}}{par défaut
\docValue{true}, initialement \docValue{false}}%
@@ -49,6 +52,19 @@ personnaliser les pages de titre au moyen des clés \refKey{nofrontcover} et
Cette clé permet de désactiver la production de la 1\iere{} de couverture.
\end{docKey}
+\begin{docKey}[][doc new=2019-03-28]{noaim}{=\docValue{true}\textbar\docValue{false}}{par défaut
+ \docValue{true}, initialement \docValue{false}}%
+ %
+ \index{titre!de la thèse!personnalisation}%
+ \changes{v0.99u}{2019-03-28}{Nouvelle option \protect\refKey{noaim} de
+ \protect\docAuxCommand{maketitle} permettant de (légèrement) personnaliser
+ les pages de titre}%
+ %
+ Cette clé permet de désactiver sur les pages de titre l'affichage
+ de\selonlangue{} \enquote{En vue de l’obtention du grade de docteur de ...} ou
+ \enquote{In order to become Doctor from ...}.%
+\end{docKey}
+
{%
\tcbset{before lower=\vspace*{\baselineskip}\par}
\begin{docKey}{frametitle}{=\docValue{fbox}\textbar\docValue{shadowbox}\textbar\docValue{ovalbox}\textbar\docValue{none}\textbar\marg{autre}}{pas de valeur par défaut, initialement \docValue{fbox}}
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 b1a62f1d2ed..dc35647ac35 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
@@ -951,6 +951,15 @@ sont listées\footnote{Et classées par ordre alphabétique des expressions
par un \meta{label} permettant de les redéfinir (voire de les définir, cf.
\vref{ex-doctor}) au moyen de la commande \refCom{expression} suivante.
%
+%
+\changes*{v0.99u}{2019-03-28}{Expressions clés \enquote{Titre de la thèse} et
+ \enquote{Titre de l’habilitation à diriger les recherches} (et équivalents en
+ anglais) désormais vides}%
+\changes*{v0.99u}{2019-03-28}{Les expressions clés \enquote{Directeurs} et
+ \enquote{Supervisors} introduisant la liste des directeurs d'une
+ \protect\acrshort*{hdr} désormais remplacées par \enquote{Habilitation
+ dirig\'ee par} et \enquote{Habilitation supervised by}}%
+%
\begin{docCommand}{expression}{\marg{label}\marg{en français}\marg{en anglais}}
\indexdef{expression!redéfinition}%
Cette commande permet de redéfinir les valeurs \meta{en français} et
@@ -994,11 +1003,10 @@ par un \meta{label} permettant de les redéfinir (voire de les définir, cf.
%
\begin{dbexample}{Suppression d'expression définie par la classe}{}
\indexex{expression!redéfinition}%
- Si on souhaite supprimer des pages de titre les mentions \enquote{Titre de la
- thèse} et \foreignquote{english}{Thesis Title} (expressions dont le label
- est |thesistitle|), il suffit de saisir :
+ Si on souhaite supprimer des pages de titre les mentions \enquote{Thèse présentée par} et \foreignquote{english}{Thesis defended by} (expressions dont le label
+ est |thesisdefendedby|), il suffit de saisir :
\begin{preamblecode}[title=Par exemple dans le \File{\configurationfile}]
-\expression{thesistitle}{}{}
+\expression{thesisdefendedby}{}{}
\end{preamblecode}
\end{dbexample}
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/proprietes-document.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/proprietes-document.tex
index 572dbed2a9a..02829b0cb4e 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/proprietes-document.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/corps/proprietes-document.tex
@@ -71,8 +71,8 @@ pages de 1\iere{} de couverture et de titre de la thèse\footnote{Sauf cas
particulier, ces pages seront dans la suite appelées simplement
\enquote{pages de titre}.}.
-\subsection{Auteur, (sous-)titre, spécialité, sujet,
- date}\label{sec-caracteristiques}
+\subsection{Auteur, (sous-)titre, discipline, spécialité,
+ date, sujet}\label{sec-caracteristiques}
Les commandes suivantes permettent de stipuler les auteur, titre et éventuel
sous-titre, champ disciplinaire, spécialité, date et sujet de la thèse. Toutes
@@ -214,7 +214,7 @@ titre\footnote{En outre, les titres et éventuels sous-titres figureront sur les
apparaît comme métadonnée \enquote{Sujet}.
\end{docCommand}
-\begin{dbexample}{Auteur, (sous-)titre, spécialité, sujet, date}{}
+\begin{dbexample}{Auteur, (sous-)titre, discipline, spécialité, sujet, date}{}
\indexex{caractéristiques de la thèse}%
Les données principales d'une thèse peuvent être les suivantes.
% \tcbset{listing options={deletekeywords={[2]title}}}
@@ -393,12 +393,26 @@ pages de titre, sauf :
\end{dbexample}
\end{docKey}
%
-% \DescribeOption{nologo}
-% L'option |nologo| (qui ne prend pas de valeur) pour que le logo d'un
-% institut ne figure pas, même s'il a été précisé.
+\begin{docKey}[][doc new=2019-03-28]{nologo}{=\docValue{true}\textbar\docValue{false}}{par défaut
+ \docValue{true}, initialement \docValue{false}}%
+ %
+ \indexdef{logo!suppression}%
+ \changes{v0.99u}{2019-03-28}{Nouvelle option \protect\refKey{nologo} des
+ commandes d'instituts et entreprise permettant de (légèrement) personnaliser
+ les pages de titre}%
+ %
+ Si les commandes \refCom{comue}, \refCom{institute}, \refCom{coinstitute} et
+ \refCom{company} sont employées sans l'option \refKey{logo}, les zones des
+ pages de titre réservées aux logos correspondants contiennent les rappels
+ respectivement \enquote{\meta{logo ComUE}}, \enquote{\meta{logo de
+ l’institut}}, \enquote{\meta{logo de l’institut de cotutelle}} et
+ \enquote{\meta{logo de l’entreprise}}. Si l'option \refKey{logo} est absente
+ parce que l'affichage du logo correspondant n'est pas souhaité, l'option
+ \refKey{nologo} permet de supprimer ce rappel.
+\end{docKey}
%
-\begin{docKey}{url}{=\meta{{\normalfont\ttfamily\acrshort*{url}} de l'institut}}{pas de valeur par
- défaut, initialement vide}
+\begin{docKey}{url}{=\meta{{\normalfont\ttfamily\acrshort*{url}} de
+ l'institut}}{pas de valeur par défaut, initialement vide}
\indexdef{url@\acrshort{url}}%
\index{laboratoire!url@\acrshort{url}}%
\index{institut!url@\acrshort{url}}%
@@ -409,7 +423,8 @@ pages de titre, sauf :
\begin{dbexample}{\acrshort*{url} d'institut}{}
Si la thèse a été préparée à l'\gls{ulco}, on pourra recourir à :%
\NoAutoSpacing%
-\begin{preamblecode}[listing options={deletekeywords={url},morekeywords={[2]url},deletekeywords={[5]institute}}]
+\begin{preamblecode}[listing
+options={deletekeywords={url},morekeywords={[2]url},deletekeywords={[5]institute}}]
\institute[url=http://www.univ-littoral.fr/]{ULCO}
\end{preamblecode}
\end{dbexample}
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/glossaries/acronyms.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/glossaries/acronyms.tex
index e9506f2f02c..418a149bef2 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/glossaries/acronyms.tex
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/glossaries/acronyms.tex
@@ -34,12 +34,12 @@
\newacronym{faq}{faq}{%
\href{http://fr.wikipedia.org/wiki/Foire_aux_questions}{foire aux questions}%
}%
-% \newacronym[%
-% \glsshortpluralkey={hdr},%
-% \glslongpluralkey ={habilitations à diriger les recherches}%
-% ]{hdr}{hdr}{%
-% habilitation à diriger les recherches%
-% }%
+\newacronym[%
+\glsshortpluralkey={hdr},%
+\glslongpluralkey ={habilitations à diriger les recherches}%
+]{hdr}{hdr}{%
+ habilitation à diriger les recherches%
+}%
\newacronym[%
\glsshortpluralkey={hdr},%
\glslongpluralkey ={habilités à diriger les recherches}%
@@ -78,6 +78,15 @@
table(s) des matières%
}%
% \newacronym{abes}{abes}{agence bibliographique de l'enseignement supérieur}%
+\newacronym[%
+\glsshortpluralkey={ed},%
+\glslongpluralkey ={écoles doctorales}%
+]{ed}{ed}{%
+ école doctorale%
+}%
+\newacronym{mesr}{mesr}{%
+ ministère de l'enseignement supérieur et de la recherche%
+}%
% Local Variables:
% mode: latex
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 074027cd4e7..36bfaf5feff 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{0.99t}]{\version{0.99t}}
+\subtitle[\version{0.99u}]{\version{0.99u}}
%
\author[denis.bitouze@lmpa.univ-littoral.fr]{Denis}{Bitouzé}
%
diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.bib b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.bib
index 768e5e527d6..e765520dc22 100644
--- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.bib
+++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.bib
@@ -1,9 +1,11 @@
@Manual{guidoct,
title = {Guide pour la rédaction et la présentation des thèses},
subtitle = {À l'usage des doctorants},
- editor = {{Ministère de l'enseignement supérieur et de la recherche}},
+ editor = {{\gls{mesr}}},
+ shorteditor = {mesr},
date = {2007},
- url = {http://www.u-bordeaux1.fr/fileadmin/images-PDF/DOCUMENTATION/mylene/guidoct.pdf},
+ url = {http://ed-histart.univ-paris1.fr/documents/file/guidoct.pdf},
+ urlold = {http://www.u-bordeaux1.fr/fileadmin/images-PDF/DOCUMENTATION/mylene/guidoct.pdf},
urlold = {http://www.sup.adc.education.fr/bib/Acti/These/guidoct.rtf}
}
@@ -72,8 +74,8 @@
@Online{ en-ligne6,
Title = {Conférence \LaTeX{} \no6},
Author = {Bitouzé, Denis},
- Date = {2016-06-08},
- Url = {http://gte.univ-littoral.fr/members/dbitouze/pub/latex/diapositives-cours-d/conference-n-6/downloadFile/file/en-ligne6.pdf},
+ Date = {2019-03-17},
+ Url = {https://frama.link/en-ligne6},
Language = {french},
Organization = {Université du Littoral Côte d'Opale},
Subtitle = {Bibliographie (biber/biblatex), citations d’extraits}
@@ -82,8 +84,8 @@
@Online{ en-ligne7,
Title = {Conférence \LaTeX{} \no7},
Author = {Bitouzé, Denis},
- Date = {2016-05-23},
- Url = {http://gte.univ-littoral.fr/members/dbitouze/pub/latex/diapositives-cours-d/conference-n-7/downloadFile/file/en-ligne7.pdf},
+ Date = {2019-03-17},
+ Url = {https://frama.link/en-ligne7},
Language = {french},
Organization = {Université du Littoral Côte d'Opale},
Subtitle = {Glossaires et (liste d’)acronymes, index}
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 484b32d2b68..1e44bc250d9 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
Binary files differ
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 391e605d764..db37226e897 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
@@ -2,7 +2,7 @@
% peut se faire au moyen de :
% - complètement :
% pdfnup --nup 2x1 --landscape yathesis-fr.pdf --suffix 2x1
-% - partiellement (par exemple, pages 1 à 80 seulement) :
+% - partiellement (par exemple, pages 1 à 79 seulement) :
% pdfnup --nup 2x1 --landscape yathesis-fr.pdf '1-79' --suffix 2x1
%
% Pour une impression papier, on pourra avoir (préalablement à la compilation)
@@ -25,6 +25,8 @@
\makeindex[title=Index des concepts,extout=pdx,extin=pnd,columnseprule]
%
\AtEndPreamble{%
+ \changes{v0.99u}{2019-03-28}{Documentation révisée}%
+ \changes{v0.99u}{2019-03-28}{Correction de bugs}%
\changes{v0.99t}{2018-07-09}{Correction de bug}%
\changes{v0.99s}{2018-06-22}{Correction de bug}%
\changes{v0.99s}{2018-06-21}{Correction de bug}%
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 d6a96677f9f..c15b4c57fb4 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
Binary files differ
diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
index 69c56af84ef..6c9a4414ea9 100644
--- a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
+++ b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2012-2018 by Denis Bitouz'e <denis.bitouze@univ-littoral.fr>
+% Copyright (C) 2012-2019 by Denis Bitouz'e <denis.bitouze@univ-littoral.fr>
% -------------------------------------------------------------------------------
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -23,7 +23,7 @@
%<*readme>
-----------------------------------------------------------------------
-- `yathesis` --- Yet Another Thesis Class, version 0.99t
+- `yathesis` --- Yet Another Thesis Class, version 0.99u
- 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
@@ -73,7 +73,7 @@ Typesetting the documentation of the class requires:
\input docstrip.tex
\Msg{********************************************************}
\Msg{* Installation}
-\Msg{* Class: yathesis 2018-07-09 v0.99t}
+\Msg{* Class: yathesis 2019-03-28 v0.99u}
\Msg{* that helps to write thesis following French rules (DB)}
\Msg{********************************************************}
\keepsilent
@@ -87,7 +87,7 @@ See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------------
\endpreamble
\postamble
-% Copyright (C) 2012-2018 by Denis Bitouzé <denis.bitouze@univ-littoral.fr>
+% Copyright (C) 2012-2019 by Denis Bitouzé <denis.bitouze@univ-littoral.fr>
----------------------------------------------------------------------------------
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -265,14 +265,14 @@ This work consists of the file yathesis.dtx
\fi
%</internal>
% \fi
-% \def\YADnblastversion{0.99t}
+% \def\YADnblastversion{0.99u}
% \def\YADdatelastversion{\today}
% \def\fileversion{v\YADnblastversion}
% \def\filedate{\YADdatelastversion}
% \iffalse
%<*class>
-\def\fileversion{v0.99t}
-\def\filedate{2018/07/09}
+\def\fileversion{v0.99u}
+\def\filedate{2019/03/28}
%</class>
%<*driver>
\ProvidesFile{yathesis.dtx}
@@ -1149,6 +1149,23 @@ This work consists of the file yathesis.dtx
%
% \section{Début du code de la classe}
%
+% Because of some changes in \Package{parskip}, we need to adjust the vertical
+% space before the first rule of the local TOCs, depending on this package is
+% loaded or not (cf. definition of ×\YAD@localstyle× below).
+% \begin{macrocode}
+\newlength{\YAD@vspace@before@localtoc@rule}
+\setlength{\YAD@vspace@before@localtoc@rule}{-1.25\baselineskip}
+\AtEndPreamble{%
+ \@ifpackageloaded{parskip}{%
+ \@ifpackagelater{parskip}{2.0a}{%
+ \setlength{\YAD@vspace@before@localtoc@rule}{-.775\baselineskip}%
+ }{%
+ }%
+ }{%
+ }%
+}
+% \end{macrocode}
+%
% On définit les macros "\YAD@href", "\YAD@hypersetup", "\YAD@url",
% "\YAD@nolinkurl" identiques aux macros "\href", "\hypersetup", "\url",
% "\nolinkurl" du \Package{hyperref} mais sur lesquelles on a plus de
@@ -1584,7 +1601,7 @@ This work consists of the file yathesis.dtx
% (éventuellement vides) de l'expresion respectivement en français et en
% anglais.
% \begin{macrocode}
-\newcommand{\expression}[3]{%
+\newcommand{\YAD@expression}[3]{%
\AtBeginDocument{%
\deftranslation[to=French]{lbl-#1}{#2}%
\deftranslation[to=English]{lbl-#1}{#3}%
@@ -1592,6 +1609,29 @@ This work consists of the file yathesis.dtx
\deftranslation[to=English]{#1}{#3}%
}%
}%
+\newcommand{\YAD@expression@alias}[5]{%
+ \ifthenelse{\equal{#1}{#4}}{%
+ \YAD@expression{#5}{#2}{#3}%
+ }{%
+ }%
+}%
+\newcommand{\expression}[3]{%
+ \YAD@expression@alias{#1}{#2}{#3}{juniorresearcherfem*}{juniorresearcher-female*}%
+ \YAD@expression@alias{#1}{#2}{#3}{mcf}{associateprofessor}%
+ \YAD@expression@alias{#1}{#2}{#3}{mcf*}{associateprofessor*}%
+ \renewcommand*{\do}[1]{\YAD@expression@alias{#1}{#2}{#3}{##1fem}{##1-female}}
+ \docsvlist{%
+ juniorresearcher,%
+ supervisor,%
+ cosupervisor,%
+ comonitor,%
+ seniorresearcher,%
+ committeepresident,%
+ professor,%
+ }
+ %
+ \YAD@expression{#1}{#2}{#3}%
+}
% \end{macrocode}
% \end{macro}
%
@@ -1648,7 +1688,7 @@ This work consists of the file yathesis.dtx
% \end{macrocode}
% On crée un style de réinitialisation des caractéristiques des personnes.
% \begin{macrocode}
-\yadsetup{reinitialize person/.style={%
+\yadsetup{reset person/.style={%
corps=,%
role=,%
affiliation=,%
@@ -1687,6 +1727,15 @@ This work consists of the file yathesis.dtx
\DTLnewdb{dedications}%
\DTLnewdb{frontepigraphs}%
% \end{macrocode}
+% Booléens testant la présence de femmes uniquement dans chacun des groupes de
+% membres du jury, globalement fixés à \enquote{vrai} par défaut.
+% \begin{macrocode}
+\DTLforeach{YAD@staffs}{%
+ \YAD@the@staff=YAD@the@staff}{%
+ \YAD@create@boolean{only@female@\YAD@the@staff}%
+ \global\booltrue{YAD@only@female@\YAD@the@staff}%
+}%
+% \end{macrocode}
%
% \begin{macrocode}
\newcommand*{\YAD@staff}[4][]{%
@@ -1696,13 +1745,31 @@ This work consists of the file yathesis.dtx
\dtlexpandnewvalue%
%
\yadsetup{#1}%
- %
+% \end{macrocode}
+% Pour chacun des groupes de membres du jury, le booléen testant la présence de
+% femmes uniquement est globalement fixés à \enquote{faux} si au moins une
+% personne n'est pas une femme.
+% \begin{macrocode}
+\DTLforeach{YAD@staffs}{%
+ \YAD@the@staff=YAD@the@staff}{%
+ \ifthenelse{\equal{#4}{\YAD@the@staff}}{%
+ \ifboolexpr{%
+ bool {YAD@female} or %
+ not bool {YAD@male}%
+ }{%
+ }{%
+ \global\boolfalse{YAD@only@female@#4}%
+ }%
+ }{%
+ }
+}%
+%
\ifbool{YAD@professor}{%
\ifboolexpr{%
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=professorfem,#1}%
+ \yadsetup{corps=professor-female,#1}%
}{%
\yadsetup{corps=professor,#1}%
}%
@@ -1729,7 +1796,7 @@ This work consists of the file yathesis.dtx
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=juniorresearcherfem,#1}%
+ \yadsetup{corps=juniorresearcher-female,#1}%
}{%
\yadsetup{corps=juniorresearcher,#1}%
}%
@@ -1740,7 +1807,7 @@ This work consists of the file yathesis.dtx
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=juniorresearcherfem*,#1}%
+ \yadsetup{corps=juniorresearcher-female*,#1}%
}{%
\yadsetup{corps=juniorresearcher*,#1}%
}%
@@ -1751,7 +1818,7 @@ This work consists of the file yathesis.dtx
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=seniorresearcherfem,#1}%
+ \yadsetup{corps=seniorresearcher-female,#1}%
}{%
\yadsetup{corps=seniorresearcher,#1}%
}%
@@ -1814,7 +1881,7 @@ This work consists of the file yathesis.dtx
% \end{macrocode}
% On réinitialise les caractéristiques pour la personne suivante.
% \begin{macrocode}
- \yadsetup{reinitialize person}%
+ \yadsetup{reset person}%
}%
% \end{macrocode}
%
@@ -1854,7 +1921,7 @@ This work consists of the file yathesis.dtx
% \begin{macro}{\supervisor}
% \begin{macrocode}
\newcommand{\supervisor}{%
- \@ifstar{\@tempswatrue\YAD@supervisor}{\@tempswafalse\YAD@supervisor}%
+ \@ifstar{\@tempswafalse\YAD@supervisor}{\@tempswatrue\YAD@supervisor}%
}
\newcommand*{\YAD@supervisor}[3][]{%
\booltrue{YAD@supervisor@specified}%
@@ -1864,13 +1931,12 @@ This work consists of the file yathesis.dtx
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la directrice de these}{#2}{#3}{\supervisor}%
- \YAD@staff[role=supervisorfem,#1]{#2}{#3}{YAD@supervisors}%
+ \YAD@staff[role=supervisor-female,#1]{#2}{#3}{YAD@supervisors}%
}{%
\YAD@error@firstlastnames@empty{du directeur de these}{#2}{#3}{\supervisor}%
\YAD@staff[role=supervisor,#1]{#2}{#3}{YAD@supervisors}%
}%
\if@tempswa%
- \else%
\YAD@staff[role=supervisor,#1]{#2}{#3}{supervisors-in-committee}%
\fi%
}%
@@ -1891,7 +1957,7 @@ This work consists of the file yathesis.dtx
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la co-directrice de these}{#2}{#3}{\cosupervisor}%
- \YAD@staff[role=cosupervisorfem,#1]{#2}{#3}{YAD@supervisors}%
+ \YAD@staff[role=cosupervisor-female,#1]{#2}{#3}{YAD@supervisors}%
}{%
\YAD@error@firstlastnames@empty{du co-directeur de these}{#2}{#3}{\cosupervisor}%
\YAD@staff[role=cosupervisor,#1]{#2}{#3}{YAD@supervisors}%
@@ -1918,7 +1984,7 @@ This work consists of the file yathesis.dtx
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la co-encadrante de these}{#2}{#3}{\comonitor}%
- \YAD@staff[role=comonitorfem,#1]{#2}{#3}{YAD@supervisors}%
+ \YAD@staff[role=comonitor-female,#1]{#2}{#3}{YAD@supervisors}%
}{%
\YAD@error@firstlastnames@empty{de co-encadrant de these}{#2}{#3}{\comonitor}%
\YAD@staff[role=comonitor,#1]{#2}{#3}{YAD@supervisors}%
@@ -1964,7 +2030,7 @@ This work consists of the file yathesis.dtx
\YAD@staff[#1]{#2}{#3}{examiners}%
\ifboolexpr{%
test {\ifdefstring{\cmdKV@YAD@role}{committeepresident}} or %
- test {\ifdefstring{\cmdKV@YAD@role}{committeepresidentfem}}%
+ test {\ifdefstring{\cmdKV@YAD@role}{committeepresident-female}}%
}{%
}{%
\ifboolexpr{%
@@ -1989,7 +2055,7 @@ This work consists of the file yathesis.dtx
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la presidente du jury}{#2}{#3}{\committeepresident}%
- \examiner[role=committeepresidentfem,#1]{#2}{#3}%
+ \examiner[role=committeepresident-female,#1]{#2}{#3}%
}{%
\YAD@error@firstlastnames@empty{du president du jury}{#2}{#3}{\committeepresident}%
\examiner[role=committeepresident,#1]{#2}{#3}%
@@ -2087,17 +2153,41 @@ This work consists of the file yathesis.dtx
\ifboolexpr{%
bool {YAD@hdr} and test {\ifdefstring{\YAD@the@staff}{supervisors-in-committee}}%
}{%
- \YAD@translation{\YAD@the@staff-pl-hdr}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl-hdr-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl-hdr}%
+ }
}{%
- \YAD@translation{\YAD@the@staff-pl}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl}%
+ }
}%
}{%
\ifboolexpr{%
bool {YAD@hdr} and test {\ifdefstring{\YAD@the@staff}{supervisors-in-committee}}%
}{%
- \YAD@translation{\YAD@the@staff-hdr}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-hdr-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff-hdr}%
+ }
}{%
- \YAD@translation{\YAD@the@staff}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff}%
+ }
}%
}%
}{%
@@ -2492,7 +2582,7 @@ This work consists of the file yathesis.dtx
% \end{macrocode}
% Création de la commande affichant le logo de l'entité (sauf si "nologo" est demandé).
% \begin{macrocode}
- \ifbool{YAD@nologo}{%
+\ifbool{YAD@nologo}{%
}{%
\csdef{print#2logo}{%
% % \end{macrocode}
@@ -2502,7 +2592,7 @@ This work consists of the file yathesis.dtx
% \ifthenelse{\equal{#2}{doctoralschool}}{%
% \YAD@ClassWarningNoLine{%
% Le logo de l'ecole doctorale a ete fourni mais\MessageBreak%
-% il n'apparaitra nulle part. Veuillez le supprimer%
+% il n'apparaitra nulle part. Le mieux est de le supprimer%
% }%
% }{%
% }%
@@ -2515,31 +2605,40 @@ This work consists of the file yathesis.dtx
}%
}%
\csdef{YAD@starnostar@print#2logo}{%
- \yadsetup{url=,##1}%
- \renewcommand*\YAD@logo{%
- \ifthenelse{\equal{\cmdKV@YAD@logo}{}}{%
- \YAD@reach@file{\YAD@generic@argument@translate{logo#2}}%
+ \yadsetup{url=,nologo=false,##1}%
+ \ifbool{YAD@nologo}{%
+ }{%
+ \ifbool{YAD@logo@before}{%
+ \hspace{\stretch{1}}%
}{%
- \YAD@reach@file{%
- \includegraphics[height=\cmdKV@YAD@logoheight]{\cmdKV@YAD@logo}%
+ }%
+ \renewcommand*\YAD@logo{%
+ \ifthenelse{\equal{\cmdKV@YAD@logo}{}}{%
+ \YAD@reach@file{\YAD@generic@argument@translate{logo#2}}%
+ }{%
+ \YAD@reach@file{%
+ \includegraphics[height=\cmdKV@YAD@logoheight]{\cmdKV@YAD@logo}%
+ }%
}%
}%
- }%
- \if@tempswa%
- \else%
- % \ifbool{YAD@nolink}{%
- % \YAD@logo%
- % }{%
+ \if@tempswa%
+ \else%
+ % \ifbool{YAD@nolink}{%
+ % \YAD@logo%
+ % }{%
\ifthenelse{\equal{\cmdKV@YAD@url}{}}{%
% \YAD@href{www.#2.fr}{
- \YAD@logo%
+ \YAD@logo%
% }%
}{%
\YAD@href{\cmdKV@YAD@url}{\YAD@logo}%
}%
- % }%
- \fi%
- \setlength\cmdKV@YAD@logoheight{\YAD@default@logoheight}%
+ % }%
+ \fi%
+ \setlength\cmdKV@YAD@logoheight{\YAD@default@logoheight}%
+ \boolfalse{YAD@nologo}
+ \booltrue{YAD@logo@before}%
+ }%
}%
}%
}%
@@ -3202,37 +3301,21 @@ This work consists of the file yathesis.dtx
{%
\ifdef{\printpreslogo}{%
\printpreslogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printcomuelogo}{%
\printcomuelogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printinstitutelogo}{%
- \ifbool{YAD@logo@before}{%
- \hspace{\stretch{1}}%
- }{%
- }%
\printinstitutelogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printcoinstitutelogo}{%
- \ifbool{YAD@logo@before}{%
- \hspace{\stretch{1}}%
- }{%
- }%
\printcoinstitutelogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printcompanylogo}{%
- \ifbool{YAD@logo@before}{%
- \hspace{\stretch{1}}%
- }{%
- }%
\printcompanylogo%
}{%
}%
@@ -3795,13 +3878,13 @@ This work consists of the file yathesis.dtx
}{%
\YAD@translation{institute} \textbf{\textsc{\Large\printinstitute}}%
}%
- }%
- \ifundef{\printcoinstitute}{%
- }{%
- \ifdraft{}{\vspace*{\stretch{.5}}}%
- % \vspace*{\stretch{.5}}%
- \par%
- \YAD@translation{coinstitute} \textbf{\textsc{\Large\printcoinstitute}}%
+ \ifundef{\printcoinstitute}{%
+ }{%
+ \ifdraft{}{\vspace*{\stretch{.5}}}%
+ % \vspace*{\stretch{.5}}%
+ \par%
+ \YAD@translation{coinstitute} \textbf{\textsc{\Large\printcoinstitute}}%
+ }%
}%
\ifundef{\printcompany}{%
}{%
@@ -3917,32 +4000,35 @@ This work consists of the file yathesis.dtx
\fi%
\ifdraft{}{\vspace*{\stretch{1}}}%
% \vspace*{\stretch{1}}%
- \par%
- \large%
- \YAD@translation{academicfield}
- %
- \YAD@ifemptyorundef{\printacademicfield}{%
- \YAD@generic@argument@translate{academicfield}%
- \ifbool{YAD@noacademicfield}{%
- }{%
- \YAD@ClassError[noacademicfield]{%
- Champ disciplinaire de la these non specifie%
- }{%
- La commande \protect\academicfield\space n'a pas ete utilisee
- (celle-ci est requise)\MessageBreak%
- ou son argument obligatoire est vide (celui-ci doit etre renseigne).%
- }%
- }%
+ \ifbool{YAD@noacademicfield}{%
}{%
- \textbf{\printacademicfield}%
- }%
- \ifundef{\printspeciality}{%
- }{%
- \ifdraft{}{\vspace*{\stretch{.5}}}%
- % \vspace*{\stretch{.5}}%
\par%
\large%
- \YAD@translation{speciality} \textbf{\printspeciality}%
+ \YAD@translation{academicfield}
+ %
+ \YAD@ifemptyorundef{\printacademicfield}{%
+ \YAD@generic@argument@translate{academicfield}%
+ \ifbool{YAD@noacademicfield}{%
+ }{%
+ \YAD@ClassError[noacademicfield]{%
+ Champ disciplinaire de la these non specifie%
+ }{%
+ La commande \protect\academicfield\space n'a pas ete utilisee
+ (celle-ci est requise)\MessageBreak%
+ ou son argument obligatoire est vide (celui-ci doit etre renseigne).%
+ }%
+ }%
+ }{%
+ \textbf{\printacademicfield}%
+ }%
+ \ifundef{\printspeciality}{%
+ }{%
+ \ifdraft{}{\vspace*{\stretch{.5}}}%
+ % \vspace*{\stretch{.5}}%
+ \par%
+ \large%
+ \YAD@translation{speciality} \textbf{\printspeciality}%
+ }%
}
\end{center}
% \end{minipage}%
@@ -5094,7 +5180,15 @@ This work consists of the file yathesis.dtx
% We restore the original behavior of "\addcontentsline".
% \begin{macrocode}
\let\addcontentsline\YAD@addcontentsline
- \parskip \z@skip \vspace{-1.25\baselineskip}% somewhat ad hoc
+ \parskip \z@skip
+% \end{macrocode}
+%
+% Because of some changes in \Package{parskip}, we need to adjust the vertical
+% space before the first rule of the local TOCs, depending on this package is
+% loaded or not (cf. definition of ×\YAD@vspace@before@localtoc@rule× above).
+%
+% \begin{macrocode}
+ \vspace{\YAD@vspace@before@localtoc@rule}% somewhat ad hoc
\leftskip 2.25em \rightskip 4.5em \advance\rightskip-\YAD@rightmargin\relax
\leavevmode\leaders\hrule\@height\p@\hfill\kern\z@\par
\rightskip 4.5em
@@ -6215,6 +6309,7 @@ This work consists of the file yathesis.dtx
\expression{meta-institute}{institut principal}{institut principal}
\expression{meta-coinstitute}{institut de cotutelle}{institut de cotutelle}
\expression{meta-logocoinstitute}{logo de l'institut de cotutelle}{logo de l'institut de cotutelle}
+\expression{meta-logocompany}{logo de l'entreprise}{logo de l'entreprise}
\expression{meta-doctoralschool}{\'ecole doctorale}{\'ecole doctorale}
\expression{meta-laboratory}{nom du laboratoire}{nom du laboratoire}
\expression{meta-logolaboratory}{logo du laboratoire}{logo du laboratoire}
@@ -6289,36 +6384,48 @@ This work consists of the file yathesis.dtx
les laboratoires suivants.}{This habilitation to conduct research has been
prepared at the following research units.}%
\expression{juniorresearcher}{charg\'e de recherche}{Junior Researcher}%
-\expression{juniorresearcherfem}{charg\'ee de recherche}{Junior Researcher}%
-\expression{juniorresearcher*}{charg\'e de recherche
- \textsc{hdr}}{\textsc{hdr} Junior Researcher}%
-\expression{juniorresearcherfem*}{charg\'ee de recherche
- \textsc{hdr}}{\textsc{hdr} Junior Researcher}%
+\expression{juniorresearcher-female}{charg\'ee de recherche}{\translate[to=English]{lbl-juniorresearcher}}%
+\expression{juniorresearcher*}{\translate[to=French]{lbl-juniorresearcher}
+ \textsc{hdr}}{\textsc{hdr} \translate[to=English]{lbl-juniorresearcher}}%
+\expression{juniorresearcher-female*}{\translate[to=French]{lbl-juniorresearcher-female}
+ \textsc{hdr}}{\translate[to=English]{lbl-juniorresearcher*}}%
\expression{cosupervisor}{co-directeur}{Co-Supervisor}%
-\expression{cosupervisorfem}{co-directrice}{Co-Supervisor}
+\expression{cosupervisor-female}{co-directrice}{\translate[to=English]{lbl-cosupervisor}}
\expression{comonitor}{co-encadrant}{Co-Monitor}%
-\expression{comonitorfem}{co-encadrante}{Co-Monitor}
+\expression{comonitor-female}{\translate[to=French]{lbl-comonitor}e}{\translate[to=English]{lbl-comonitor}}
\expression{committeemembers}{Composition du jury}{Committee members}%
% \expression{conclusion}{Conclusion}{Conclusion}%
\expression{estimateddefensedate}{Date de soutenance pr\'evue le}{Defense
date scheduled on}%
\expression{supervisor}{directeur}{Supervisor}%
-\expression{supervisorfem}{directrice}{Supervisor}
+\expression{supervisor-female}{directrice}{\translate[to=English]{lbl-supervisor}}
\expression{seniorresearcher}{directeur de recherche}{Senior Researcher}%
-\expression{seniorresearcherfem}{directrice de recherche}{Senior Researcher}%
-\expression{supervisors-in-committee}{Directeur de th\`ese}{Supervisor}%
-\expression{supervisors-in-committee-pl}{Directeurs de th\`ese}{Supervisors}%
-\expression{supervisors-in-committee-hdr}{Directeur}{Supervisor}%
-\expression{supervisors-in-committee-pl-hdr}{Directeurs}{Supervisors}%
+\expression{seniorresearcher-female}{directrice de recherche}{\translate[to=English]{lbl-seniorresearcher}}%
+\expression{supervisors-in-committee}{Directeur de th\`ese}{\translate[to=English]{lbl-supervisor}}%
+\expression{supervisors-in-committee-pl}{Directeurs de th\`ese}{\translate[to=English]{lbl-supervisors-in-committee}s}%
+\expression{supervisors-in-committee-female}{Directrice de th\`ese}{\translate[to=English]{lbl-supervisors-in-committee}}%
+\expression{supervisors-in-committee-pl-female}{Directrices de th\`ese}{\translate[to=English]{lbl-supervisors-in-committee-pl}}%
+\expression{supervisors-in-committee-hdr}{Directeur}{\translate[to=English]{lbl-supervisors-in-committee}}%
+\expression{supervisors-in-committee-pl-hdr}{\translate[to=French]{lbl-supervisors-in-committee-hdr}s}{\translate[to=English]{lbl-supervisors-in-committee-pl}}%
+\expression{supervisors-in-committee-hdr-female}{Directrice}{\translate[to=English]{lbl-supervisors-in-committee}}%
+\expression{supervisors-in-committee-pl-hdr-female}{\translate[to=French]{lbl-supervisors-in-committee-hdr-female}s}{\translate[to=English]{lbl-supervisors-in-committee-pl}}%
\expression{academicfield}{Discipline}{Academic Field}%
\expression{doctoralschool}{\'Ecole doctorale}{Doctoral School}%
\expression{aim}{En vue de l'obtention du grade de docteur de l'}{In order
to become Doctor from }%
\expression{aimand}{ et de l'}{ and from }%
\expression{examiners}{Examinateur}{Examiner}%
-\expression{examiners-pl}{Examinateurs}{Examiners}%
+\expression{examiners-pl}{\translate[to=French]{lbl-examiners}s}{\translate[to=English]{lbl-examiners}s}%
+\expression{examiners-female}{Examinatrice}{\translate[to=English]{lbl-examiners}}%
+\expression{examiners-pl-female}{\translate[to=French]{lbl-examiners-female}s}{\translate[to=English]{lbl-examiners-pl}}%
\expression{guests}{Invit\'e}{Guest}%
-\expression{guests-pl}{Invit\'es}{Guests}%
+\expression{guests-pl}{\translate[to=French]{lbl-guests}s}{\translate[to=English]{lbl-guests}s}%
+\expression{guests-female}{\translate[to=French]{lbl-guests}e}{\translate[to=English]{lbl-guests}}%
+\expression{guests-pl-female}{\translate[to=French]{lbl-guests-female}s}{\translate[to=English]{lbl-guests-pl}}%
+\expression{referees}{Rapporteur}{Referee}%
+\expression{referees-pl}{\translate[to=French]{lbl-referees}s}{\translate[to=English]{lbl-referees}s}%
+\expression{referees-female}{\translate[to=French]{lbl-referees}e}{\translate[to=English]{lbl-referees}}%
+\expression{referees-pl-female}{\translate[to=French]{lbl-referees-female}s}{\translate[to=English]{lbl-referees-pl}}%
% \expression{introduction}{Introduction}{Introduction}%
% \expression{mcf}{\textsc{mcf}}{Associate Professor}%
% \expression{mcf*}{\textsc{mcf} \textsc{hdr}}{\textsc{hdr} Associate Professor}%
@@ -6328,29 +6435,26 @@ This work consists of the file yathesis.dtx
\expression{ordernumber}{Num\'ero d'ordre}{Order Number}%
% \expression{preface}{Pr\'eface}{Preface}%
\expression{committeepresident}{pr\'esident du jury}{Committee President}%
-\expression{committeepresidentfem}{pr\'esidente du jury}{Committee President}%
+\expression{committeepresident-female}{pr\'esidente du jury}{\translate[to=English]{lbl-committeepresident}}%
\expression{professor}{professeur}{Professor}%
-\expression{professorfem}{professeure}{Professor}%
-\expression{referees}{Rapporteur}{Referee}%
-\expression{referees-pl}{Rapporteurs}{Referees}%
+\expression{professor-female}{\translate[to=French]{lbl-professor}e}{\translate[to=English]{lbl-professor}}%
\expression{website}{Site}{Web Site}%
\expression{localtocname}{Sommaire du pr\'esent chapitre}{Outline of the current
chapter}%
\expression{defendedon}{Soutenue le}{Defended on}%
\expression{speciality}{Sp\'ecialit\'e}{Speciality}%
\expression{supervisedby}{Th\`ese dirig\'ee par}{Thesis supervised by}%
-\expression{supervisedby-hdr}{Directeurs}{Supervisors}%
+\expression{supervisedby-hdr}{Habilitation dirig\'ee par}{Habilitation supervised by}%
\expression{thesisdefendedby}{Th\`ese pr\'esent\'ee par}{Thesis defended by}%
\expression{thesisdefendedby-hdr}{Habilitation \`a diriger les recherches
pr\'esent\'ee par}{Habilitation to conduct research defended by}%
-\expression{thesistitle}{Titre de la th\`ese}{Thesis Title}%
-\expression{thesistitle-hdr}{Titre de l'habilitation \`a diriger les
- recherches}{Habilitation to conduct research's Title}%
+\expression{thesistitle}{}{}%
+\expression{thesistitle-hdr}{}{}%
\expression{inprogress}{travail en cours}{work in progress}%
\expression{universitydepartment}{Unit\'e de recherche}{University Department}%
\expression{versiondate}{Version interm\'ediaire en date du}{Work in progress as
of}%
-\expression{inprogressfoottext}{\translate{lbl-versiondate}}{\translate{lbl-versiondate}}%
+\expression{inprogressfoottext}{\translate[to=French]{lbl-versiondate}}{\translate[to=English]{lbl-versiondate}}%
\expression{submittedfoottext}{Version soumise en date du}{Submitted work as
of}%
% \end{macrocode}
@@ -6513,16 +6617,19 @@ url=
logo=
logoheight=
url=
+nologo
#endkeyvals
#keyvals:\coinstitute
logo=
logoheight=
url=
+nologo
#endkeyvals
#keyvals:\company
logo=
logoheight=
url=
+nologo
#endkeyvals
#keyvals:\doctoralschool
logo=
@@ -6638,6 +6745,12 @@ juniorresearcher*
\ordernumber[%<numéro d'ordre%>]#n
\ordernumber#n*
#
+#keyvals:\maketitle
+nofrontcover
+noaim
+frametitle=#shadowbox,ovalbox,none,fbox
+#endkeyvals
+#
# Preliminary part
#
\disclaimer{clause%text}#n
diff --git a/Master/texmf-dist/tex/latex/yathesis/yathesis-translations.tex b/Master/texmf-dist/tex/latex/yathesis/yathesis-translations.tex
index c70634d2f4a..c8652dea346 100644
--- a/Master/texmf-dist/tex/latex/yathesis/yathesis-translations.tex
+++ b/Master/texmf-dist/tex/latex/yathesis/yathesis-translations.tex
@@ -31,63 +31,72 @@
les laboratoires suivants.}{This habilitation to conduct research has been
prepared at the following research units.}%
\expression{juniorresearcher}{charg\'e de recherche}{Junior Researcher}%
-\expression{juniorresearcherfem}{charg\'ee de recherche}{Junior Researcher}%
-\expression{juniorresearcher*}{charg\'e de recherche
- \textsc{hdr}}{\textsc{hdr} Junior Researcher}%
-\expression{juniorresearcherfem*}{charg\'ee de recherche
- \textsc{hdr}}{\textsc{hdr} Junior Researcher}%
+\expression{juniorresearcher-female}{charg\'ee de recherche}{\translate[to=English]{lbl-juniorresearcher}}%
+\expression{juniorresearcher*}{\translate[to=French]{lbl-juniorresearcher}
+ \textsc{hdr}}{\textsc{hdr} \translate[to=English]{lbl-juniorresearcher}}%
+\expression{juniorresearcher-female*}{\translate[to=French]{lbl-juniorresearcher-female}
+ \textsc{hdr}}{\translate[to=English]{lbl-juniorresearcher*}}%
\expression{cosupervisor}{co-directeur}{Co-Supervisor}%
-\expression{cosupervisorfem}{co-directrice}{Co-Supervisor}
+\expression{cosupervisor-female}{co-directrice}{\translate[to=English]{lbl-cosupervisor}}
\expression{comonitor}{co-encadrant}{Co-Monitor}%
-\expression{comonitorfem}{co-encadrante}{Co-Monitor}
+\expression{comonitor-female}{\translate[to=French]{lbl-comonitor}e}{\translate[to=English]{lbl-comonitor}}
\expression{committeemembers}{Composition du jury}{Committee members}%
\expression{estimateddefensedate}{Date de soutenance pr\'evue le}{Defense
date scheduled on}%
\expression{supervisor}{directeur}{Supervisor}%
-\expression{supervisorfem}{directrice}{Supervisor}
+\expression{supervisor-female}{directrice}{\translate[to=English]{lbl-supervisor}}
\expression{seniorresearcher}{directeur de recherche}{Senior Researcher}%
-\expression{seniorresearcherfem}{directrice de recherche}{Senior Researcher}%
-\expression{supervisors-in-committee}{Directeur de th\`ese}{Supervisor}%
-\expression{supervisors-in-committee-pl}{Directeurs de th\`ese}{Supervisors}%
-\expression{supervisors-in-committee-hdr}{Directeur}{Supervisor}%
-\expression{supervisors-in-committee-pl-hdr}{Directeurs}{Supervisors}%
+\expression{seniorresearcher-female}{directrice de recherche}{\translate[to=English]{lbl-seniorresearcher}}%
+\expression{supervisors-in-committee}{Directeur de th\`ese}{\translate[to=English]{lbl-supervisor}}%
+\expression{supervisors-in-committee-pl}{Directeurs de th\`ese}{\translate[to=English]{lbl-supervisors-in-committee}s}%
+\expression{supervisors-in-committee-female}{Directrice de th\`ese}{\translate[to=English]{lbl-supervisors-in-committee}}%
+\expression{supervisors-in-committee-pl-female}{Directrices de th\`ese}{\translate[to=English]{lbl-supervisors-in-committee-pl}}%
+\expression{supervisors-in-committee-hdr}{Directeur}{\translate[to=English]{lbl-supervisors-in-committee}}%
+\expression{supervisors-in-committee-pl-hdr}{\translate[to=French]{lbl-supervisors-in-committee-hdr}s}{\translate[to=English]{lbl-supervisors-in-committee-pl}}%
+\expression{supervisors-in-committee-hdr-female}{Directrice}{\translate[to=English]{lbl-supervisors-in-committee}}%
+\expression{supervisors-in-committee-pl-hdr-female}{\translate[to=French]{lbl-supervisors-in-committee-hdr-female}s}{\translate[to=English]{lbl-supervisors-in-committee-pl}}%
\expression{academicfield}{Discipline}{Academic Field}%
\expression{doctoralschool}{\'Ecole doctorale}{Doctoral School}%
\expression{aim}{En vue de l'obtention du grade de docteur de l'}{In order
to become Doctor from }%
\expression{aimand}{ et de l'}{ and from }%
\expression{examiners}{Examinateur}{Examiner}%
-\expression{examiners-pl}{Examinateurs}{Examiners}%
+\expression{examiners-pl}{\translate[to=French]{lbl-examiners}s}{\translate[to=English]{lbl-examiners}s}%
+\expression{examiners-female}{Examinatrice}{\translate[to=English]{lbl-examiners}}%
+\expression{examiners-pl-female}{\translate[to=French]{lbl-examiners-female}s}{\translate[to=English]{lbl-examiners-pl}}%
\expression{guests}{Invit\'e}{Guest}%
-\expression{guests-pl}{Invit\'es}{Guests}%
+\expression{guests-pl}{\translate[to=French]{lbl-guests}s}{\translate[to=English]{lbl-guests}s}%
+\expression{guests-female}{\translate[to=French]{lbl-guests}e}{\translate[to=English]{lbl-guests}}%
+\expression{guests-pl-female}{\translate[to=French]{lbl-guests-female}s}{\translate[to=English]{lbl-guests-pl}}%
+\expression{referees}{Rapporteur}{Referee}%
+\expression{referees-pl}{\translate[to=French]{lbl-referees}s}{\translate[to=English]{lbl-referees}s}%
+\expression{referees-female}{\translate[to=French]{lbl-referees}e}{\translate[to=English]{lbl-referees}}%
+\expression{referees-pl-female}{\translate[to=French]{lbl-referees-female}s}{\translate[to=English]{lbl-referees-pl}}%
\expression{associateprofessor}{\textsc{mcf}}{Associate Professor}%
\expression{associateprofessor*}{\textsc{mcf} \textsc{hdr}}{\textsc{hdr} Associate Professor}%
\expression{keywords}{Mots cl\'es}{Keywords}%
\expression{ordernumber}{Num\'ero d'ordre}{Order Number}%
\expression{committeepresident}{pr\'esident du jury}{Committee President}%
-\expression{committeepresidentfem}{pr\'esidente du jury}{Committee President}%
+\expression{committeepresident-female}{pr\'esidente du jury}{\translate[to=English]{lbl-committeepresident}}%
\expression{professor}{professeur}{Professor}%
-\expression{professorfem}{professeure}{Professor}%
-\expression{referees}{Rapporteur}{Referee}%
-\expression{referees-pl}{Rapporteurs}{Referees}%
+\expression{professor-female}{\translate[to=French]{lbl-professor}e}{\translate[to=English]{lbl-professor}}%
\expression{website}{Site}{Web Site}%
\expression{localtocname}{Sommaire du pr\'esent chapitre}{Outline of the current
chapter}%
\expression{defendedon}{Soutenue le}{Defended on}%
\expression{speciality}{Sp\'ecialit\'e}{Speciality}%
\expression{supervisedby}{Th\`ese dirig\'ee par}{Thesis supervised by}%
-\expression{supervisedby-hdr}{Directeurs}{Supervisors}%
+\expression{supervisedby-hdr}{Habilitation dirig\'ee par}{Habilitation supervised by}%
\expression{thesisdefendedby}{Th\`ese pr\'esent\'ee par}{Thesis defended by}%
\expression{thesisdefendedby-hdr}{Habilitation \`a diriger les recherches
pr\'esent\'ee par}{Habilitation to conduct research defended by}%
-\expression{thesistitle}{Titre de la th\`ese}{Thesis Title}%
-\expression{thesistitle-hdr}{Titre de l'habilitation \`a diriger les
- recherches}{Habilitation to conduct research's Title}%
+\expression{thesistitle}{}{}%
+\expression{thesistitle-hdr}{}{}%
\expression{inprogress}{travail en cours}{work in progress}%
\expression{universitydepartment}{Unit\'e de recherche}{University Department}%
\expression{versiondate}{Version interm\'ediaire en date du}{Work in progress as
of}%
-\expression{inprogressfoottext}{\translate{lbl-versiondate}}{\translate{lbl-versiondate}}%
+\expression{inprogressfoottext}{\translate[to=French]{lbl-versiondate}}{\translate[to=English]{lbl-versiondate}}%
\expression{submittedfoottext}{Version soumise en date du}{Submitted work as
of}%
%% ----------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/yathesis/yathesis.cls b/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
index a0c049f583d..f2718f07b40 100644
--- a/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
+++ b/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
@@ -11,8 +11,8 @@
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% -----------------------------------------------------------------------
-\def\fileversion{v0.99t}
-\def\filedate{2018/07/09}
+\def\fileversion{v0.99u}
+\def\filedate{2019/03/28}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{yathesis}[\filedate\space\fileversion\space Yet another class for writing thesis (DB)]
\RequirePackage{pgfopts}[2011/06/02]%
@@ -509,6 +509,17 @@
}{%
}%
}%
+\newlength{\YAD@vspace@before@localtoc@rule}
+\setlength{\YAD@vspace@before@localtoc@rule}{-1.25\baselineskip}
+\AtEndPreamble{%
+ \@ifpackageloaded{parskip}{%
+ \@ifpackagelater{parskip}{2.0a}{%
+ \setlength{\YAD@vspace@before@localtoc@rule}{-.775\baselineskip}%
+ }{%
+ }%
+ }{%
+ }%
+}
\AtEndPreamble{%
\@ifpackageloaded{hyperref}{%
\newcommand{\YAD@href}[3][]{\href[#1]{#2}{#3}}%
@@ -755,7 +766,7 @@
}{%
}%
}%
-\newcommand{\expression}[3]{%
+\newcommand{\YAD@expression}[3]{%
\AtBeginDocument{%
\deftranslation[to=French]{lbl-#1}{#2}%
\deftranslation[to=English]{lbl-#1}{#3}%
@@ -763,6 +774,29 @@
\deftranslation[to=English]{#1}{#3}%
}%
}%
+\newcommand{\YAD@expression@alias}[5]{%
+ \ifthenelse{\equal{#1}{#4}}{%
+ \YAD@expression{#5}{#2}{#3}%
+ }{%
+ }%
+}%
+\newcommand{\expression}[3]{%
+ \YAD@expression@alias{#1}{#2}{#3}{juniorresearcherfem*}{juniorresearcher-female*}%
+ \YAD@expression@alias{#1}{#2}{#3}{mcf}{associateprofessor}%
+ \YAD@expression@alias{#1}{#2}{#3}{mcf*}{associateprofessor*}%
+ \renewcommand*{\do}[1]{\YAD@expression@alias{#1}{#2}{#3}{##1fem}{##1-female}}
+ \docsvlist{%
+ juniorresearcher,%
+ supervisor,%
+ cosupervisor,%
+ comonitor,%
+ seniorresearcher,%
+ committeepresident,%
+ professor,%
+ }
+ %
+ \YAD@expression{#1}{#2}{#3}%
+}
\newcommand*{\YAD@generic@argument@translate}[1]{%
\YAD@texorpdfstring{\YAD@generic@argument{\translate{meta-#1}}}{<#1>}%
}%
@@ -799,7 +833,7 @@
\yadsetup{sepcorpaffilenglish=\YAD@global@sepcorpaffil@english}%
\yadsetup{name=\contentsname}%
\yadsetup{depth=subsubsection}%
-\yadsetup{reinitialize person/.style={%
+\yadsetup{reset person/.style={%
corps=,%
role=,%
affiliation=,%
@@ -832,17 +866,34 @@
\DTLnewdb{YAD@supervisors}%
\DTLnewdb{dedications}%
\DTLnewdb{frontepigraphs}%
+\DTLforeach{YAD@staffs}{%
+ \YAD@the@staff=YAD@the@staff}{%
+ \YAD@create@boolean{only@female@\YAD@the@staff}%
+ \global\booltrue{YAD@only@female@\YAD@the@staff}%
+}%
\newcommand*{\YAD@staff}[4][]{%
\dtlexpandnewvalue%
%
\yadsetup{#1}%
- %
+\DTLforeach{YAD@staffs}{%
+ \YAD@the@staff=YAD@the@staff}{%
+ \ifthenelse{\equal{#4}{\YAD@the@staff}}{%
+ \ifboolexpr{%
+ bool {YAD@female} or %
+ not bool {YAD@male}%
+ }{%
+ }{%
+ \global\boolfalse{YAD@only@female@#4}%
+ }%
+ }{%
+ }
+}%
\ifbool{YAD@professor}{%
\ifboolexpr{%
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=professorfem,#1}%
+ \yadsetup{corps=professor-female,#1}%
}{%
\yadsetup{corps=professor,#1}%
}%
@@ -869,7 +920,7 @@
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=juniorresearcherfem,#1}%
+ \yadsetup{corps=juniorresearcher-female,#1}%
}{%
\yadsetup{corps=juniorresearcher,#1}%
}%
@@ -880,7 +931,7 @@
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=juniorresearcherfem*,#1}%
+ \yadsetup{corps=juniorresearcher-female*,#1}%
}{%
\yadsetup{corps=juniorresearcher*,#1}%
}%
@@ -891,7 +942,7 @@
bool {YAD@female} or %
not bool {YAD@male}%
}{%
- \yadsetup{corps=seniorresearcherfem,#1}%
+ \yadsetup{corps=seniorresearcher-female,#1}%
}{%
\yadsetup{corps=seniorresearcher,#1}%
}%
@@ -944,7 +995,7 @@
}{%
\DTLnewdbentry{#4}{affiliationsecondary}{\cmdKV@YAD@affiliationsecondary}%
}%
- \yadsetup{reinitialize person}%
+ \yadsetup{reset person}%
}%
\newcommand{\YAD@error@firstlastnames@empty}[4]{%
\ifthenelse{\isempty{#2}}{%
@@ -970,7 +1021,7 @@
\YAD@staff[#1]{#2}{#3}{supervisors-in-committee}%
}%
\newcommand{\supervisor}{%
- \@ifstar{\@tempswatrue\YAD@supervisor}{\@tempswafalse\YAD@supervisor}%
+ \@ifstar{\@tempswafalse\YAD@supervisor}{\@tempswatrue\YAD@supervisor}%
}
\newcommand*{\YAD@supervisor}[3][]{%
\booltrue{YAD@supervisor@specified}%
@@ -980,13 +1031,12 @@
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la directrice de these}{#2}{#3}{\supervisor}%
- \YAD@staff[role=supervisorfem,#1]{#2}{#3}{YAD@supervisors}%
+ \YAD@staff[role=supervisor-female,#1]{#2}{#3}{YAD@supervisors}%
}{%
\YAD@error@firstlastnames@empty{du directeur de these}{#2}{#3}{\supervisor}%
\YAD@staff[role=supervisor,#1]{#2}{#3}{YAD@supervisors}%
}%
\if@tempswa%
- \else%
\YAD@staff[role=supervisor,#1]{#2}{#3}{supervisors-in-committee}%
\fi%
}%
@@ -1002,7 +1052,7 @@
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la co-directrice de these}{#2}{#3}{\cosupervisor}%
- \YAD@staff[role=cosupervisorfem,#1]{#2}{#3}{YAD@supervisors}%
+ \YAD@staff[role=cosupervisor-female,#1]{#2}{#3}{YAD@supervisors}%
}{%
\YAD@error@firstlastnames@empty{du co-directeur de these}{#2}{#3}{\cosupervisor}%
\YAD@staff[role=cosupervisor,#1]{#2}{#3}{YAD@supervisors}%
@@ -1024,7 +1074,7 @@
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la co-encadrante de these}{#2}{#3}{\comonitor}%
- \YAD@staff[role=comonitorfem,#1]{#2}{#3}{YAD@supervisors}%
+ \YAD@staff[role=comonitor-female,#1]{#2}{#3}{YAD@supervisors}%
}{%
\YAD@error@firstlastnames@empty{de co-encadrant de these}{#2}{#3}{\comonitor}%
\YAD@staff[role=comonitor,#1]{#2}{#3}{YAD@supervisors}%
@@ -1055,7 +1105,7 @@
\YAD@staff[#1]{#2}{#3}{examiners}%
\ifboolexpr{%
test {\ifdefstring{\cmdKV@YAD@role}{committeepresident}} or %
- test {\ifdefstring{\cmdKV@YAD@role}{committeepresidentfem}}%
+ test {\ifdefstring{\cmdKV@YAD@role}{committeepresident-female}}%
}{%
}{%
\ifboolexpr{%
@@ -1075,7 +1125,7 @@
not bool {YAD@male}%
}{%
\YAD@error@firstlastnames@empty{de la presidente du jury}{#2}{#3}{\committeepresident}%
- \examiner[role=committeepresidentfem,#1]{#2}{#3}%
+ \examiner[role=committeepresident-female,#1]{#2}{#3}%
}{%
\YAD@error@firstlastnames@empty{du president du jury}{#2}{#3}{\committeepresident}%
\examiner[role=committeepresident,#1]{#2}{#3}%
@@ -1165,17 +1215,41 @@
\ifboolexpr{%
bool {YAD@hdr} and test {\ifdefstring{\YAD@the@staff}{supervisors-in-committee}}%
}{%
- \YAD@translation{\YAD@the@staff-pl-hdr}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl-hdr-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl-hdr}%
+ }
}{%
- \YAD@translation{\YAD@the@staff-pl}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff-pl}%
+ }
}%
}{%
\ifboolexpr{%
bool {YAD@hdr} and test {\ifdefstring{\YAD@the@staff}{supervisors-in-committee}}%
}{%
- \YAD@translation{\YAD@the@staff-hdr}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-hdr-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff-hdr}%
+ }
}{%
- \YAD@translation{\YAD@the@staff}%
+ \ifboolexpr{%
+ bool {YAD@only@female@\YAD@the@staff}%
+ }{%
+ \YAD@translation{\YAD@the@staff-female}%
+ }{%
+ \YAD@translation{\YAD@the@staff}%
+ }
}%
}%
}{%
@@ -1500,7 +1574,7 @@
}%
}%
}%
- \ifbool{YAD@nologo}{%
+\ifbool{YAD@nologo}{%
}{%
\csdef{print#2logo}{%
\@ifstar{%
@@ -1512,31 +1586,40 @@
}%
}%
\csdef{YAD@starnostar@print#2logo}{%
- \yadsetup{url=,##1}%
- \renewcommand*\YAD@logo{%
- \ifthenelse{\equal{\cmdKV@YAD@logo}{}}{%
- \YAD@reach@file{\YAD@generic@argument@translate{logo#2}}%
+ \yadsetup{url=,nologo=false,##1}%
+ \ifbool{YAD@nologo}{%
+ }{%
+ \ifbool{YAD@logo@before}{%
+ \hspace{\stretch{1}}%
}{%
- \YAD@reach@file{%
- \includegraphics[height=\cmdKV@YAD@logoheight]{\cmdKV@YAD@logo}%
+ }%
+ \renewcommand*\YAD@logo{%
+ \ifthenelse{\equal{\cmdKV@YAD@logo}{}}{%
+ \YAD@reach@file{\YAD@generic@argument@translate{logo#2}}%
+ }{%
+ \YAD@reach@file{%
+ \includegraphics[height=\cmdKV@YAD@logoheight]{\cmdKV@YAD@logo}%
+ }%
}%
}%
- }%
- \if@tempswa%
- \else%
- % \ifbool{YAD@nolink}{%
- % \YAD@logo%
- % }{%
+ \if@tempswa%
+ \else%
+ % \ifbool{YAD@nolink}{%
+ % \YAD@logo%
+ % }{%
\ifthenelse{\equal{\cmdKV@YAD@url}{}}{%
% \YAD@href{www.#2.fr}{
- \YAD@logo%
+ \YAD@logo%
% }%
}{%
\YAD@href{\cmdKV@YAD@url}{\YAD@logo}%
}%
- % }%
- \fi%
- \setlength\cmdKV@YAD@logoheight{\YAD@default@logoheight}%
+ % }%
+ \fi%
+ \setlength\cmdKV@YAD@logoheight{\YAD@default@logoheight}%
+ \boolfalse{YAD@nologo}
+ \booltrue{YAD@logo@before}%
+ }%
}%
}%
}%
@@ -2069,37 +2152,21 @@
{%
\ifdef{\printpreslogo}{%
\printpreslogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printcomuelogo}{%
\printcomuelogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printinstitutelogo}{%
- \ifbool{YAD@logo@before}{%
- \hspace{\stretch{1}}%
- }{%
- }%
\printinstitutelogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printcoinstitutelogo}{%
- \ifbool{YAD@logo@before}{%
- \hspace{\stretch{1}}%
- }{%
- }%
\printcoinstitutelogo%
- \booltrue{YAD@logo@before}%
}{%
}%
\ifdef{\printcompanylogo}{%
- \ifbool{YAD@logo@before}{%
- \hspace{\stretch{1}}%
- }{%
- }%
\printcompanylogo%
}{%
}%
@@ -2516,13 +2583,13 @@
}{%
\YAD@translation{institute} \textbf{\textsc{\Large\printinstitute}}%
}%
- }%
- \ifundef{\printcoinstitute}{%
- }{%
- \ifdraft{}{\vspace*{\stretch{.5}}}%
- % \vspace*{\stretch{.5}}%
- \par%
- \YAD@translation{coinstitute} \textbf{\textsc{\Large\printcoinstitute}}%
+ \ifundef{\printcoinstitute}{%
+ }{%
+ \ifdraft{}{\vspace*{\stretch{.5}}}%
+ % \vspace*{\stretch{.5}}%
+ \par%
+ \YAD@translation{coinstitute} \textbf{\textsc{\Large\printcoinstitute}}%
+ }%
}%
\ifundef{\printcompany}{%
}{%
@@ -2638,32 +2705,35 @@
\fi%
\ifdraft{}{\vspace*{\stretch{1}}}%
% \vspace*{\stretch{1}}%
- \par%
- \large%
- \YAD@translation{academicfield}
- %
- \YAD@ifemptyorundef{\printacademicfield}{%
- \YAD@generic@argument@translate{academicfield}%
- \ifbool{YAD@noacademicfield}{%
- }{%
- \YAD@ClassError[noacademicfield]{%
- Champ disciplinaire de la these non specifie%
- }{%
- La commande \protect\academicfield\space n'a pas ete utilisee
- (celle-ci est requise)\MessageBreak%
- ou son argument obligatoire est vide (celui-ci doit etre renseigne).%
- }%
- }%
- }{%
- \textbf{\printacademicfield}%
- }%
- \ifundef{\printspeciality}{%
+ \ifbool{YAD@noacademicfield}{%
}{%
- \ifdraft{}{\vspace*{\stretch{.5}}}%
- % \vspace*{\stretch{.5}}%
\par%
\large%
- \YAD@translation{speciality} \textbf{\printspeciality}%
+ \YAD@translation{academicfield}
+ %
+ \YAD@ifemptyorundef{\printacademicfield}{%
+ \YAD@generic@argument@translate{academicfield}%
+ \ifbool{YAD@noacademicfield}{%
+ }{%
+ \YAD@ClassError[noacademicfield]{%
+ Champ disciplinaire de la these non specifie%
+ }{%
+ La commande \protect\academicfield\space n'a pas ete utilisee
+ (celle-ci est requise)\MessageBreak%
+ ou son argument obligatoire est vide (celui-ci doit etre renseigne).%
+ }%
+ }%
+ }{%
+ \textbf{\printacademicfield}%
+ }%
+ \ifundef{\printspeciality}{%
+ }{%
+ \ifdraft{}{\vspace*{\stretch{.5}}}%
+ % \vspace*{\stretch{.5}}%
+ \par%
+ \large%
+ \YAD@translation{speciality} \textbf{\printspeciality}%
+ }%
}
\end{center}
% \end{minipage}%
@@ -3610,7 +3680,8 @@
\large\textbf{\translate{lbl-localtocname}}%
}%
\let\addcontentsline\YAD@addcontentsline
- \parskip \z@skip \vspace{-1.25\baselineskip}% somewhat ad hoc
+ \parskip \z@skip
+ \vspace{\YAD@vspace@before@localtoc@rule}% somewhat ad hoc
\leftskip 2.25em \rightskip 4.5em \advance\rightskip-\YAD@rightmargin\relax
\leavevmode\leaders\hrule\@height\p@\hfill\kern\z@\par
\rightskip 4.5em
@@ -4247,6 +4318,7 @@
\expression{meta-institute}{institut principal}{institut principal}
\expression{meta-coinstitute}{institut de cotutelle}{institut de cotutelle}
\expression{meta-logocoinstitute}{logo de l'institut de cotutelle}{logo de l'institut de cotutelle}
+\expression{meta-logocompany}{logo de l'entreprise}{logo de l'entreprise}
\expression{meta-doctoralschool}{\'ecole doctorale}{\'ecole doctorale}
\expression{meta-laboratory}{nom du laboratoire}{nom du laboratoire}
\expression{meta-logolaboratory}{logo du laboratoire}{logo du laboratoire}