yathesis (9jul18)

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

1 files changed, 135 insertions, 84 deletions

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