diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex | 78 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf | bin | 6488354 -> 6488337 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf | bin | 1230680 -> 1230247 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/yathesis/yathesis.dtx | 219 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/yathesis/yathesis.cls | 210 |
9 files changed, 347 insertions, 167 deletions
diff --git a/Master/texmf-dist/doc/latex/yathesis/README.md b/Master/texmf-dist/doc/latex/yathesis/README.md index 47accdaffbf..05f008885ac 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.99s +- `yathesis` --- Yet Another Thesis Class, version 0.99t - 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 58c5c6bbce2..954f8d2b41a 100644 --- a/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl +++ b/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl @@ -71,7 +71,7 @@ nodate noinstitute nodoctoralschool nolaboratory -nolaboratoryadress +nolaboratoryaddress nosupervisor nomaketitle nokeywords 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 ed266858e79..074027cd4e7 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.99s}]{\version{0.99s}} +\subtitle[\version{0.99t}]{\version{0.99t}} % \author[denis.bitouze@lmpa.univ-littoral.fr]{Denis}{Bitouzé} % diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex new file mode 100644 index 00000000000..4f9bc2303fd --- /dev/null +++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex @@ -0,0 +1,78 @@ +\expression{coinstitute}{}{}% +\expression{company}{}{}% +\expression{institute}{}{}% +\expression{email}{\Email}{\Email}% +\expression{phone}{\Telefon}{\Telefon}% +\expression{fax}{\Fax}{\Fax}% +\expression{caution}{Avertissement}{Caution}% +\expression{localbibname}{Bibliographie du pr\'esent chapitre}{Bibliography of the current chapter}% +\expression{draft}{brouillon}{draft}% +\expression{prepared-at}{Cette th\`ese a \'et\'e pr\'epar\'ee au}{This + thesis has been prepared at}% +\expression{prepared-at-pl}{Cette th\`ese a \'et\'e pr\'epar\'ee dans les + laboratoires suivants.}{This thesis has been prepared at the following + research units.}% +\expression{prepared-at-hdr}{Cette \textsc{hdr} a \'et\'e pr\'epar\'ee au}{This + habilitation to conduct research has been prepared at}% +\expression{prepared-at-pl-hdr}{Cette \textsc{hdr} a \'et\'e pr\'epar\'ee dans + 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{cosupervisor}{co-directeur}{Co-Supervisor}% +\expression{cosupervisorfem}{co-directrice}{Co-Supervisor} +\expression{comonitor}{co-encadrant}{Co-Monitor}% +\expression{comonitorfem}{co-encadrante}{Co-Monitor} +\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{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{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{guests}{Invit\'e}{Guest}% +\expression{guests-pl}{Invit\'es}{Guests}% +\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{professor}{professeur}{Professor}% +\expression{professorfem}{professeure}{Professor}% +\expression{referees}{Rapporteur}{Referee}% +\expression{referees-pl}{Rapporteurs}{Referees}% +\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{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{inprogress}{travail en cours}{work in progress}% +\expression{universitydepartment}{Unit\'e de recherche}{University + Department}% +\expression{inprogressfoottext}{Version interm\'ediaire en +date du}{Work in progress as of}% +\expression{submittedfoottext}{Version soumise en date du}{Submitted work + as of}% 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 Binary files differindex 16979534970..484b32d2b68 100644 --- a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf +++ b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf diff --git a/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex b/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex index 01f0ea46726..391e605d764 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 @@ -25,6 +25,7 @@ \makeindex[title=Index des concepts,extout=pdx,extin=pnd,columnseprule] % \AtEndPreamble{% + \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}% \changes{v0.99r}{2018-06-02}{Correction de bugs}% 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 Binary files differindex f91cbd81d9f..d6a96677f9f 100644 --- a/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf +++ b/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx index cf436104b64..69c56af84ef 100644 --- a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx +++ b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx @@ -23,7 +23,7 @@ %<*readme> ----------------------------------------------------------------------- -- `yathesis` --- Yet Another Thesis Class, version 0.99s +- `yathesis` --- Yet Another Thesis Class, version 0.99t - 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-06-22 v0.99s} +\Msg{* Class: yathesis 2018-07-09 v0.99t} \Msg{* that helps to write thesis following French rules (DB)} \Msg{********************************************************} \keepsilent @@ -265,14 +265,14 @@ This work consists of the file yathesis.dtx \fi %</internal> % \fi -% \def\YADnblastversion{0.99s} +% \def\YADnblastversion{0.99t} % \def\YADdatelastversion{\today} % \def\fileversion{v\YADnblastversion} % \def\filedate{\YADdatelastversion} % \iffalse %<*class> -\def\fileversion{v0.99s} -\def\filedate{2018/06/22} +\def\fileversion{v0.99t} +\def\filedate{2018/07/09} %</class> %<*driver> \ProvidesFile{yathesis.dtx} @@ -626,11 +626,12 @@ This work consists of the file yathesis.dtx \YAD@create@boolean{noauthor}% \YAD@create@boolean{notitle}% \YAD@create@boolean{noacademicfield}% +\YAD@create@boolean{noaim}% \YAD@create@boolean{nodate}% \YAD@create@boolean{noinstitute}% \YAD@create@boolean{nodoctoralschool}% \YAD@create@boolean{nolaboratory}% -\YAD@create@boolean{nolaboratoryadress}% +\YAD@create@boolean{nolaboratoryaddress}% \YAD@create@boolean{nosupervisor}% \YAD@create@boolean{nomaketitle}% \YAD@create@boolean{nokeywords}% @@ -3634,9 +3635,9 @@ This work consists of the file yathesis.dtx \newcommand*{\printlaboratoryaddress}[1]{% \ifundef{#1}{% \YAD@reach@file{\YAD@generic@argument@translate{laboratoryaddress}}% - \ifbool{YAD@nolaboratoryadress}{% + \ifbool{YAD@nolaboratoryaddress}{% }{% - \YAD@ClassError[nolaboratoryadress]{% + \YAD@ClassError[nolaboratoryaddress]{% Adresse du laboratoire non specifiee ou vide% }{% La commande \protect\laboratory\space n'a pas ete utilisee\MessageBreak% @@ -3778,10 +3779,10 @@ This work consists of the file yathesis.dtx % \begin{minipage}[c][\YAD@otherboxheight][c]{\YAD@titleboxwidth} % \ifdraft{}{\vspace*{\stretch{.25}}}% \begin{center} - \YAD@ifemptyorundef{\printinstitute}{% - \YAD@generic@argument@translate{institute}% - \ifbool{YAD@noinstitute}{% - }{% + \ifbool{YAD@noinstitute}{% + }{% + \YAD@ifemptyorundef{\printinstitute}{% + \YAD@generic@argument@translate{institute}% \YAD@ClassError[noinstitute]{% Institut de la these non specifie% }{% @@ -3791,9 +3792,9 @@ This work consists of the file yathesis.dtx vide\MessageBreak% (celui-ci doit etre renseigne).% }% + }{% + \YAD@translation{institute} \textbf{\textsc{\Large\printinstitute}}% }% - }{% - \YAD@translation{institute} \textbf{\textsc{\Large\printinstitute}}% }% \ifundef{\printcoinstitute}{% }{% @@ -3809,14 +3810,14 @@ This work consists of the file yathesis.dtx \par% \YAD@translation{company} \textbf{\textsc{\Large\printcompany}}% }% - \ifdraft{}{\vspace*{\stretch{1.5}}}% - % \vspace*{\stretch{1.5}}% - \par% - \YAD@translation{doctoralschool} - \YAD@ifemptyorundef{\printdoctoralschool}{% - \YAD@generic@argument@translate{doctoralschool}% - \ifbool{YAD@nodoctoralschool}{% - }{% + \ifbool{YAD@nodoctoralschool}{% + }{% + \ifdraft{}{\vspace*{\stretch{1.5}}}% + % \vspace*{\stretch{1.5}}% + \par% + \YAD@translation{doctoralschool} + \YAD@ifemptyorundef{\printdoctoralschool}{% + \YAD@generic@argument@translate{doctoralschool}% \YAD@ClassError[nodoctoralschool]{% Ecole doctorale de la these non specifiee% }{% @@ -3826,18 +3827,21 @@ This work consists of the file yathesis.dtx vide\MessageBreak% (celui-ci doit etre renseigne).% }% + }{% + \textbf{\printdoctoralschool}% }% - }{% - \textbf{\printdoctoralschool}% }% - \ifdraft{}{\vspace*{\stretch{.5}}}% - % \vspace*{\stretch{.5}}% - \par% - \YAD@translation{universitydepartment} - \ifdefstring{\YAD@main@laboratory@nonamelink}{true}{% - \textbf{\printlaboratory{\YAD@main@laboratory@name}}% + \ifbool{YAD@nolaboratory}{% }{% - \textbf{\printlaboratory[\YAD@main@laboratory@url]{\YAD@main@laboratory@name}}% + \ifdraft{}{\vspace*{\stretch{.5}}}% + % \vspace*{\stretch{.5}}% + \par% + \YAD@translation{universitydepartment} + \ifdefstring{\YAD@main@laboratory@nonamelink}{true}{% + \textbf{\printlaboratory{\YAD@main@laboratory@name}}% + }{% + \textbf{\printlaboratory[\YAD@main@laboratory@url]{\YAD@main@laboratory@name}}% + }% }% \ifdraft{}{\vspace*{\stretch{1.5}}}% % \vspace*{\stretch{1.5}}% @@ -3864,7 +3868,7 @@ This work consists of the file yathesis.dtx }{% \textbf{\printauthor}% }% - \ifboolexpr{% + \ifboolexpr{% bool {YAD@submitted@work}% or bool {YAD@submitted@work@star}% }{% @@ -3877,32 +3881,38 @@ This work consists of the file yathesis.dtx % \textbf{\printdate}% % }% }{% - \ifdraft{}{\vspace*{\stretch{1}}}% - % \vspace*{\stretch{1}}% - \par% - \YAD@translation{defendedon} - \YAD@ifemptyorundef{\printdate}{% - \YAD@generic@argument@translate{date}% + \ifbool{YAD@nodate}{% }{% - \textbf{\printdate}% + \ifdraft{}{\vspace*{\stretch{1}}}% + % \vspace*{\stretch{1}}% + \par% + \YAD@translation{defendedon} + \YAD@ifemptyorundef{\printdate}{% + \YAD@generic@argument@translate{date}% + }{% + \textbf{\printdate}% + }% }% }% }% \ifYAD@hdr% \else% - \ifdraft{}{\vspace*{\stretch{1}}}% - % \vspace*{\stretch{1}}% - \par% - \YAD@translation{aim}% - \ifundef{\printinstitute}{% - \YAD@generic@argument@translate{institute}% - }{% - \printinstitute*% - }% - \ifundef{\printcoinstitute}{% + \ifbool{YAD@noaim}{% }{% - \YAD@translation{aimand}% - \printcoinstitute*% + \ifdraft{}{\vspace*{\stretch{1}}}% + % \vspace*{\stretch{1}}% + \par% + \YAD@translation{aim}% + \ifundef{\printinstitute}{% + \YAD@generic@argument@translate{institute}% + }{% + \printinstitute*% + }% + \ifundef{\printcoinstitute}{% + }{% + \YAD@translation{aimand}% + \printcoinstitute*% + }% }% \fi% \ifdraft{}{\vspace*{\stretch{1}}}% @@ -4682,7 +4692,7 @@ This work consists of the file yathesis.dtx % désactivent l'émission de ces erreurs. % \begin{macrocode} \YAD@nolaboratorytrue% - \YAD@nolaboratoryadresstrue% + \YAD@nolaboratoryaddresstrue% }% % \end{macrocode} % \end{macro} @@ -4983,11 +4993,19 @@ This work consists of the file yathesis.dtx \newcommand\YAD@setlinestyle [2]{% #1= unit, #2= numwidth as macro \etocsetstyle{#1} {\advance\leftskip#2\relax} - {\vskip \YAD@verysmallvskip\relax - \leavevmode + {% + \vskip + \YAD@verysmallvskip\relax + \leavevmode% {\interlinepenalty\@M \etocifnumbered - {\llap{\makebox[#2][l]{\etocnumber}}}{\advance\leftskip-#2\relax}% + {% + \llap{% + \makebox[#2][l]{% + \etocnumber% + }% + }% + }{\advance\leftskip-#2\relax}% \etocname \nobreak\leaders \copy\YAD@leaderbox \hfil\makebox[-\parfillskip][r]{\etocpage}% @@ -4999,17 +5017,29 @@ This work consists of the file yathesis.dtx % \end{macrocode} % \begin{macrocode} \newcommand\YAD@globalstyle {% encapsule le style pour les global TOCs - \etocsettocstyle {\if@twocolumn \@restonecoltrue \onecolumn \else - \@restonecolfalse \fi - \parindent\z@ \leftskip\z@skip \rightskip \z@skip + \etocsettocstyle {% + \if@twocolumn + \@restonecoltrue + \onecolumn + \else + \@restonecolfalse + \fi + \parindent\z@ + \leftskip\z@skip + \rightskip\z@skip \setbox\YAD@leaderbox\hbox to \YAD@leaderboxwidth{\hss.\hss}% \chapter *[\cmdKV@YAD@name]{\noindent\kern\YAD@leftmargin\relax % uses "pt"... \cmdKV@YAD@name% }% \rightskip \YAD@rightmargin\relax \parfillskip -\rightskip % or a smaller value if desired - \leftskip \YAD@leftmargin \relax } {\if@restonecol \twocolumn - \fi\cleardoublepage}% + \leftskip \YAD@leftmargin \relax% + }{% + \if@restonecol + \twocolumn + \fi + \cleardoublepage% + }% % \etocsetstyle{part} {} {\addpenalty {-\@highpenalty}% \addvspace \YAD@bigvskip \leavevmode {\large @@ -5020,7 +5050,9 @@ This work consists of the file yathesis.dtx % \etocsetstyle{chapter} {\advance\leftskip\YAD@numwidthB\relax} {\addpenalty {-\@highpenalty }% - \vskip \YAD@globalmedvskip\relax \leavevmode {\interlinepenalty\@M \etocifnumbered + \vskip \YAD@globalmedvskip\relax + \leavevmode% + {\interlinepenalty\@M \etocifnumbered {\llap{\makebox[\YAD@numwidthB][l]{\bfseries\etocnumber}}} {\advance\leftskip-\YAD@numwidthB\relax}% \bfseries\etocname @@ -5103,6 +5135,7 @@ This work consists of the file yathesis.dtx \YAD@setlinestyle {subparagraph}{\YAD@numwidthG}% } % \end{macrocode} +% % \begin{macrocode} \newcommand*\YAD@computenumwidths@ [2] {% #1 pour `etoc' ou `local', #2=pour le % \kern @@ -5237,13 +5270,6 @@ This work consists of the file yathesis.dtx \LetLtxMacro{\YAD@ORI@chapter}{\chapter}% \AfterPreamble{% delay the redefinition when titlesec has done its own \renewcommand\chapter{% - % \boolfalse{YAD@nonnumbered@chapter}% - % \boolfalse{YAD@nonnumbered@section}% - % \boolfalse{YAD@nonnumbered@subsection}% - % \boolfalse{YAD@nonnumbered@subsubsection}% - % \boolfalse{YAD@nonnumbered@paragraph}% - % \boolfalse{YAD@nonnumbered@subparagraph}% - % \ifbool{YAD@localbibs}{% \let\YAD@ORI@blx@warn@bibempty\blx@warn@bibempty% \def\blx@warn@bibempty{}% @@ -5370,11 +5396,16 @@ This work consists of the file yathesis.dtx \YAD@tmp@section[#1][#2]{#3}% }% \newcommandtwoopt{\YAD@unstarred@section}[3][][]{% - \boolfalse{YAD@nonnumbered@section}% - \boolfalse{YAD@nonnumbered@subsection}% - \boolfalse{YAD@nonnumbered@subsubsection}% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@chapter}{% + }{% + \boolfalse{YAD@nonnumbered@section}% + \boolfalse{YAD@nonnumbered@subsection}% + \boolfalse{YAD@nonnumbered@subsubsection}% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@section[#1][#2]{#3}% }% % \end{macrocode} @@ -5409,10 +5440,15 @@ This work consists of the file yathesis.dtx \YAD@tmp@subsection[#1]{#2}% }% \newcommand{\YAD@unstarred@subsection}[2][]{% - \boolfalse{YAD@nonnumbered@subsection}% - \boolfalse{YAD@nonnumbered@subsubsection}% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@section}{% + }{% + \boolfalse{YAD@nonnumbered@subsection}% + \boolfalse{YAD@nonnumbered@subsubsection}% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@subsection[#1]{#2}% }% % @@ -5441,9 +5477,14 @@ This work consists of the file yathesis.dtx \YAD@tmp@subsubsection[#1]{#2}% }% \newcommand{\YAD@unstarred@subsubsection}[2][]{% - \boolfalse{YAD@nonnumbered@subsubsection}% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@subsection}{% + }{% + \boolfalse{YAD@nonnumbered@subsubsection}% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@subsubsection[#1]{#2}% }% % @@ -5471,8 +5512,13 @@ This work consists of the file yathesis.dtx \YAD@tmp@paragraph[#1]{#2}% }% \newcommand{\YAD@unstarred@paragraph}[2][]{% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@subsubsection}{% + }{% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@paragraph[#1]{#2}% }% % @@ -5499,7 +5545,12 @@ This work consists of the file yathesis.dtx \YAD@tmp@subparagraph[#1]{#2}% }% \newcommand{\YAD@unstarred@subparagraph}[2][]{% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@paragraph}{% + }{% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@subparagraph[#1]{#2}% }% % \end{macrocode} @@ -6389,7 +6440,7 @@ nodate noinstitute nodoctoralschool nolaboratory -nolaboratoryadress +nolaboratoryaddress nosupervisor nomaketitle nokeywords diff --git a/Master/texmf-dist/tex/latex/yathesis/yathesis.cls b/Master/texmf-dist/tex/latex/yathesis/yathesis.cls index 6a1b2a37034..a0c049f583d 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.99s} -\def\filedate{2018/06/22} +\def\fileversion{v0.99t} +\def\filedate{2018/07/09} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{yathesis}[\filedate\space\fileversion\space Yet another class for writing thesis (DB)] \RequirePackage{pgfopts}[2011/06/02]% @@ -196,11 +196,12 @@ \YAD@create@boolean{noauthor}% \YAD@create@boolean{notitle}% \YAD@create@boolean{noacademicfield}% +\YAD@create@boolean{noaim}% \YAD@create@boolean{nodate}% \YAD@create@boolean{noinstitute}% \YAD@create@boolean{nodoctoralschool}% \YAD@create@boolean{nolaboratory}% -\YAD@create@boolean{nolaboratoryadress}% +\YAD@create@boolean{nolaboratoryaddress}% \YAD@create@boolean{nosupervisor}% \YAD@create@boolean{nomaketitle}% \YAD@create@boolean{nokeywords}% @@ -2381,9 +2382,9 @@ \newcommand*{\printlaboratoryaddress}[1]{% \ifundef{#1}{% \YAD@reach@file{\YAD@generic@argument@translate{laboratoryaddress}}% - \ifbool{YAD@nolaboratoryadress}{% + \ifbool{YAD@nolaboratoryaddress}{% }{% - \YAD@ClassError[nolaboratoryadress]{% + \YAD@ClassError[nolaboratoryaddress]{% Adresse du laboratoire non specifiee ou vide% }{% La commande \protect\laboratory\space n'a pas ete utilisee\MessageBreak% @@ -2499,10 +2500,10 @@ % \begin{minipage}[c][\YAD@otherboxheight][c]{\YAD@titleboxwidth} % \ifdraft{}{\vspace*{\stretch{.25}}}% \begin{center} - \YAD@ifemptyorundef{\printinstitute}{% - \YAD@generic@argument@translate{institute}% - \ifbool{YAD@noinstitute}{% - }{% + \ifbool{YAD@noinstitute}{% + }{% + \YAD@ifemptyorundef{\printinstitute}{% + \YAD@generic@argument@translate{institute}% \YAD@ClassError[noinstitute]{% Institut de la these non specifie% }{% @@ -2512,9 +2513,9 @@ vide\MessageBreak% (celui-ci doit etre renseigne).% }% + }{% + \YAD@translation{institute} \textbf{\textsc{\Large\printinstitute}}% }% - }{% - \YAD@translation{institute} \textbf{\textsc{\Large\printinstitute}}% }% \ifundef{\printcoinstitute}{% }{% @@ -2530,14 +2531,14 @@ \par% \YAD@translation{company} \textbf{\textsc{\Large\printcompany}}% }% - \ifdraft{}{\vspace*{\stretch{1.5}}}% - % \vspace*{\stretch{1.5}}% - \par% - \YAD@translation{doctoralschool} - \YAD@ifemptyorundef{\printdoctoralschool}{% - \YAD@generic@argument@translate{doctoralschool}% - \ifbool{YAD@nodoctoralschool}{% - }{% + \ifbool{YAD@nodoctoralschool}{% + }{% + \ifdraft{}{\vspace*{\stretch{1.5}}}% + % \vspace*{\stretch{1.5}}% + \par% + \YAD@translation{doctoralschool} + \YAD@ifemptyorundef{\printdoctoralschool}{% + \YAD@generic@argument@translate{doctoralschool}% \YAD@ClassError[nodoctoralschool]{% Ecole doctorale de la these non specifiee% }{% @@ -2547,18 +2548,21 @@ vide\MessageBreak% (celui-ci doit etre renseigne).% }% + }{% + \textbf{\printdoctoralschool}% }% - }{% - \textbf{\printdoctoralschool}% }% - \ifdraft{}{\vspace*{\stretch{.5}}}% - % \vspace*{\stretch{.5}}% - \par% - \YAD@translation{universitydepartment} - \ifdefstring{\YAD@main@laboratory@nonamelink}{true}{% - \textbf{\printlaboratory{\YAD@main@laboratory@name}}% + \ifbool{YAD@nolaboratory}{% }{% - \textbf{\printlaboratory[\YAD@main@laboratory@url]{\YAD@main@laboratory@name}}% + \ifdraft{}{\vspace*{\stretch{.5}}}% + % \vspace*{\stretch{.5}}% + \par% + \YAD@translation{universitydepartment} + \ifdefstring{\YAD@main@laboratory@nonamelink}{true}{% + \textbf{\printlaboratory{\YAD@main@laboratory@name}}% + }{% + \textbf{\printlaboratory[\YAD@main@laboratory@url]{\YAD@main@laboratory@name}}% + }% }% \ifdraft{}{\vspace*{\stretch{1.5}}}% % \vspace*{\stretch{1.5}}% @@ -2585,7 +2589,7 @@ }{% \textbf{\printauthor}% }% - \ifboolexpr{% + \ifboolexpr{% bool {YAD@submitted@work}% or bool {YAD@submitted@work@star}% }{% @@ -2598,32 +2602,38 @@ % \textbf{\printdate}% % }% }{% - \ifdraft{}{\vspace*{\stretch{1}}}% - % \vspace*{\stretch{1}}% - \par% - \YAD@translation{defendedon} - \YAD@ifemptyorundef{\printdate}{% - \YAD@generic@argument@translate{date}% + \ifbool{YAD@nodate}{% }{% - \textbf{\printdate}% + \ifdraft{}{\vspace*{\stretch{1}}}% + % \vspace*{\stretch{1}}% + \par% + \YAD@translation{defendedon} + \YAD@ifemptyorundef{\printdate}{% + \YAD@generic@argument@translate{date}% + }{% + \textbf{\printdate}% + }% }% }% }% \ifYAD@hdr% \else% - \ifdraft{}{\vspace*{\stretch{1}}}% - % \vspace*{\stretch{1}}% - \par% - \YAD@translation{aim}% - \ifundef{\printinstitute}{% - \YAD@generic@argument@translate{institute}% - }{% - \printinstitute*% - }% - \ifundef{\printcoinstitute}{% + \ifbool{YAD@noaim}{% }{% - \YAD@translation{aimand}% - \printcoinstitute*% + \ifdraft{}{\vspace*{\stretch{1}}}% + % \vspace*{\stretch{1}}% + \par% + \YAD@translation{aim}% + \ifundef{\printinstitute}{% + \YAD@generic@argument@translate{institute}% + }{% + \printinstitute*% + }% + \ifundef{\printcoinstitute}{% + }{% + \YAD@translation{aimand}% + \printcoinstitute*% + }% }% \fi% \ifdraft{}{\vspace*{\stretch{1}}}% @@ -3291,7 +3301,7 @@ \cleardoublepage% \egroup% \YAD@nolaboratorytrue% - \YAD@nolaboratoryadresstrue% + \YAD@nolaboratoryaddresstrue% }% \newcommand{\YAD@abstract@page@rule}[1][black]{\bgroup\color{#1}\noindent\rule[2pt]{\linewidth}{2pt}\egroup} \AtEndDocument{% @@ -3511,11 +3521,19 @@ \newcommand\YAD@setlinestyle [2]{% #1= unit, #2= numwidth as macro \etocsetstyle{#1} {\advance\leftskip#2\relax} - {\vskip \YAD@verysmallvskip\relax - \leavevmode + {% + \vskip + \YAD@verysmallvskip\relax + \leavevmode% {\interlinepenalty\@M \etocifnumbered - {\llap{\makebox[#2][l]{\etocnumber}}}{\advance\leftskip-#2\relax}% + {% + \llap{% + \makebox[#2][l]{% + \etocnumber% + }% + }% + }{\advance\leftskip-#2\relax}% \etocname \nobreak\leaders \copy\YAD@leaderbox \hfil\makebox[-\parfillskip][r]{\etocpage}% @@ -3525,17 +3543,29 @@ {\advance\leftskip-#2\relax}% } \newcommand\YAD@globalstyle {% encapsule le style pour les global TOCs - \etocsettocstyle {\if@twocolumn \@restonecoltrue \onecolumn \else - \@restonecolfalse \fi - \parindent\z@ \leftskip\z@skip \rightskip \z@skip + \etocsettocstyle {% + \if@twocolumn + \@restonecoltrue + \onecolumn + \else + \@restonecolfalse + \fi + \parindent\z@ + \leftskip\z@skip + \rightskip\z@skip \setbox\YAD@leaderbox\hbox to \YAD@leaderboxwidth{\hss.\hss}% \chapter *[\cmdKV@YAD@name]{\noindent\kern\YAD@leftmargin\relax % uses "pt"... \cmdKV@YAD@name% }% \rightskip \YAD@rightmargin\relax \parfillskip -\rightskip % or a smaller value if desired - \leftskip \YAD@leftmargin \relax } {\if@restonecol \twocolumn - \fi\cleardoublepage}% + \leftskip \YAD@leftmargin \relax% + }{% + \if@restonecol + \twocolumn + \fi + \cleardoublepage% + }% % \etocsetstyle{part} {} {\addpenalty {-\@highpenalty}% \addvspace \YAD@bigvskip \leavevmode {\large @@ -3546,7 +3576,9 @@ % \etocsetstyle{chapter} {\advance\leftskip\YAD@numwidthB\relax} {\addpenalty {-\@highpenalty }% - \vskip \YAD@globalmedvskip\relax \leavevmode {\interlinepenalty\@M \etocifnumbered + \vskip \YAD@globalmedvskip\relax + \leavevmode% + {\interlinepenalty\@M \etocifnumbered {\llap{\makebox[\YAD@numwidthB][l]{\bfseries\etocnumber}}} {\advance\leftskip-\YAD@numwidthB\relax}% \bfseries\etocname @@ -3720,13 +3752,6 @@ \LetLtxMacro{\YAD@ORI@chapter}{\chapter}% \AfterPreamble{% delay the redefinition when titlesec has done its own \renewcommand\chapter{% - % \boolfalse{YAD@nonnumbered@chapter}% - % \boolfalse{YAD@nonnumbered@section}% - % \boolfalse{YAD@nonnumbered@subsection}% - % \boolfalse{YAD@nonnumbered@subsubsection}% - % \boolfalse{YAD@nonnumbered@paragraph}% - % \boolfalse{YAD@nonnumbered@subparagraph}% - % \ifbool{YAD@localbibs}{% \let\YAD@ORI@blx@warn@bibempty\blx@warn@bibempty% \def\blx@warn@bibempty{}% @@ -3836,11 +3861,16 @@ \YAD@tmp@section[#1][#2]{#3}% }% \newcommandtwoopt{\YAD@unstarred@section}[3][][]{% - \boolfalse{YAD@nonnumbered@section}% - \boolfalse{YAD@nonnumbered@subsection}% - \boolfalse{YAD@nonnumbered@subsubsection}% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@chapter}{% + }{% + \boolfalse{YAD@nonnumbered@section}% + \boolfalse{YAD@nonnumbered@subsection}% + \boolfalse{YAD@nonnumbered@subsubsection}% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@section[#1][#2]{#3}% }% \LetLtxMacro{\YAD@ORI@subsection}{\subsection} @@ -3869,10 +3899,15 @@ \YAD@tmp@subsection[#1]{#2}% }% \newcommand{\YAD@unstarred@subsection}[2][]{% - \boolfalse{YAD@nonnumbered@subsection}% - \boolfalse{YAD@nonnumbered@subsubsection}% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@section}{% + }{% + \boolfalse{YAD@nonnumbered@subsection}% + \boolfalse{YAD@nonnumbered@subsubsection}% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@subsection[#1]{#2}% }% \LetLtxMacro{\YAD@ORI@subsubsection}{\subsubsection} @@ -3900,9 +3935,14 @@ \YAD@tmp@subsubsection[#1]{#2}% }% \newcommand{\YAD@unstarred@subsubsection}[2][]{% - \boolfalse{YAD@nonnumbered@subsubsection}% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@subsection}{% + }{% + \boolfalse{YAD@nonnumbered@subsubsection}% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@subsubsection[#1]{#2}% }% \LetLtxMacro{\YAD@ORI@paragraph}{\paragraph} @@ -3929,8 +3969,13 @@ \YAD@tmp@paragraph[#1]{#2}% }% \newcommand{\YAD@unstarred@paragraph}[2][]{% - \boolfalse{YAD@nonnumbered@paragraph}% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@subsubsection}{% + }{% + \boolfalse{YAD@nonnumbered@paragraph}% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@paragraph[#1]{#2}% }% \LetLtxMacro{\YAD@ORI@subparagraph}{\subparagraph} @@ -3956,7 +4001,12 @@ \YAD@tmp@subparagraph[#1]{#2}% }% \newcommand{\YAD@unstarred@subparagraph}[2][]{% - \boolfalse{YAD@nonnumbered@subparagraph}% + \if@mainmatter% + \ifbool{YAD@nonnumbered@paragraph}{% + }{% + \boolfalse{YAD@nonnumbered@subparagraph}% + }% + \fi% \YAD@tmp@subparagraph[#1]{#2}% }% \@ifpackageloaded{floatrow}{% |