summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/yathesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-28 20:59:36 +0000
committerKarl Berry <karl@freefriends.org>2019-03-28 20:59:36 +0000
commit7f136489a7ab1eaaadaaba538e2305d9b3e67065 (patch)
tree9c9aaa5ec5a4998859b1540650f8ac63975517f5 /Master/texmf-dist/tex/latex/yathesis
parent482d7e0f22e7d207a3043b5a711ebbaad3bd9f24 (diff)
yathesis (28mar19)
git-svn-id: svn://tug.org/texlive/trunk@50630 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/yathesis')
-rw-r--r--Master/texmf-dist/tex/latex/yathesis/yathesis-translations.tex57
-rw-r--r--Master/texmf-dist/tex/latex/yathesis/yathesis.cls242
2 files changed, 190 insertions, 109 deletions
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}