yathesis (11apr18)

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

1 files changed, 31 insertions, 48 deletions

diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
index 8c1309da9e9..a1b82c77702 100644
--- a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
+++ b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
@@ -1,13 +1,13 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2012-2016 by Denis Bitouz'e <denis.bitouze@lmpa.univ-littoral.fr>
+% Copyright (C) 2012-2018 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.3
+% conditions of the LaTeX Project Public License, either version 1.3c
 % of this license or (at your option) any later version.
 % The latest version of this license is in
 %   http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status `maintained'.
@@ -23,8 +23,8 @@
 %<*readme>
 -----------------------------------------------------------------------
 
-- `yathesis` --- Yet Another Thesis Class, version 0.99p
-- E-mail: `denis.bitouze@lmpa.univ-littoral.fr`
+- `yathesis` --- Yet Another Thesis Class, version 0.99q
+- 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
 
@@ -51,14 +51,14 @@ Typesetting the documentation of the class requires:
    others, my personal (dirty) package `denisbdoc` for documenting the classes
    I've written.
 - a complete `pdflatex` run of `these.tex` to be found in the
-  `.../yathesis/doc/latex/yathesis/french/exemples/specimen/a-plat` directory,
+  `.../doc/latex/yathesis/french/exemples/specimen/a-plat` directory,
   with `yathesis-demo` package load at first place. If `latexmk` is available,
   it is easier to run:
 
       latexmk -g -norc -r ./latexmkrc  -jobname=these -pdflatex="pdflatex %O '\RequirePackage{etoolbox}\AtEndPreamble{\RequirePackage{yathesis-demo}}\input{%S}'" these.tex
 
-- to compile `yathesis.tex` to be found in the
-  `.../yathesis/doc/latex/yathesis/documentation/french` directory as follows:
+- to compile `yathesis-fr.tex` to be found in the
+  `.../doc/latex/yathesis/french/documentation` directory as follows:
 
       latexmk -norc -r ./latexmkrc yathesis-fr
 %</readme>
@@ -73,7 +73,7 @@ Typesetting the documentation of the class requires:
 \input docstrip.tex
 \Msg{********************************************************}
 \Msg{* Installation}
-\Msg{* Class: yathesis 2016-12-08 v0.99p}
+\Msg{* Class: yathesis 2018-04-10 v0.99q}
 \Msg{* that helps to write thesis following French rules (DB)}
 \Msg{********************************************************}
 \keepsilent
@@ -81,20 +81,20 @@ Typesetting the documentation of the class requires:
 \preamble
 -----------------------------------------------------------------------
 yathesis --- Yet Another Thesis Class
-E-mail: denis.bitouze@lmpa.univ-littoral.fr
+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
 -----------------------------------------------------------------------
 \endpreamble
 \postamble
-% Copyright (C) 2012-2016 by Denis Bitouzé <denis.bitouze@lmpa.univ-littoral.fr>
+% Copyright (C) 2012-2018 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.3
+conditions of the LaTeX Project Public License, either version 1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in
   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
+and version 1.3c or later is part of all distributions of LaTeX
 version 2005/12/01 or later.
 
 This work has the LPPL maintenance status `maintained'.
@@ -265,14 +265,14 @@ This work consists of the file  yathesis.dtx
 \fi
 %</internal>
 % \fi
-% \def\YADnblastversion{0.99p}
+% \def\YADnblastversion{0.99q}
 % \def\YADdatelastversion{\today}
 % \def\fileversion{v\YADnblastversion}
 % \def\filedate{\YADdatelastversion}
 % \iffalse
 %<*class>
-\def\fileversion{v0.99p}
-\def\filedate{2016/12/08}
+\def\fileversion{v0.99q}
+\def\filedate{2018/04/10}
 %</class>
 %<*driver>
 \ProvidesFile{yathesis.dtx}
@@ -3145,14 +3145,13 @@ This work consists of the file  yathesis.dtx
 % Définition de titres courants
 %    \begin{macrocode}
 \newcommand*{\YAD@chapter@header}{%
-  \ifthenelse{%
-    \value{secnumdepth}>-1
-    \and
-    \value{chapter}>0
+  \ifboolexpr{
+    (test {\ifnumcomp{\value{secnumdepth}}{>}{-1}} or (not bool
+    {YAD@nonnumbered@chapter})) and test {\ifnumcomp{\value{chapter}}{>}{0}}
   }{%
     \MakeUppercase\chaptername{}\ \thechapter.%
   }{%
-  }
+  }%
   \chaptertitle%
 }%
 %    \end{macrocode}
@@ -3161,14 +3160,13 @@ This work consists of the file  yathesis.dtx
 % \begin{macro}{\YAD@section@header}
 %    \begin{macrocode}
 \newcommand*{\YAD@section@header}{%
-  \ifthenelse{%
-    \value{secnumdepth}>0
-    \and
-    \value{chapter}>0
+  \ifboolexpr{
+    (test {\ifnumcomp{\value{secnumdepth}}{>}{0}} or (not bool
+    {YAD@nonnumbered@section})) and test {\ifnumcomp{\value{chapter}}{>}{0}}
   }{%
     \thesection.%
   }{%
-  }
+  }%
   \sectiontitle%
 }%
 %    \end{macrocode}
@@ -3249,7 +3247,6 @@ This work consists of the file  yathesis.dtx
 % géométrie restaurée mais toujours pas de titres courants
 %    \begin{macrocode}
 \newpagestyle{prepreliminary}[]{%
-  \restoregeometry%
 %    \end{macrocode}
 % Dans la partie pré-préliminaire, aucun élément de structuration n'est
 % numéroté, les titres courants sont absents et la profondeur de la table des
@@ -4028,6 +4025,7 @@ This work consists of the file  yathesis.dtx
 }{%
 }%
 \expandafter\selectlanguage\expandafter{\YAD@mainlanguage}%
+\restoregeometry%
 \pagestyle{preliminary}%
 }%
 %    \end{macrocode}
@@ -5234,12 +5232,12 @@ 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}%
+    % \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%
@@ -5320,11 +5318,6 @@ This work consists of the file  yathesis.dtx
 %    \begin{macrocode}
 \LetLtxMacro{\YAD@ORI@section}{\section}
 \renewcommand\section{%
-  % \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}{%
   }{%
@@ -5376,10 +5369,6 @@ This work consists of the file  yathesis.dtx
 %    \begin{macrocode}
 \LetLtxMacro{\YAD@ORI@subsection}{\subsection}
 \renewcommand\subsection{%
-  % \boolfalse{YAD@nonnumbered@subsection}%
-  % \boolfalse{YAD@nonnumbered@subsubsection}%
-  % \boolfalse{YAD@nonnumbered@paragraph}%
-  % \boolfalse{YAD@nonnumbered@subparagraph}%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@section}{%
   }{%
@@ -5409,9 +5398,6 @@ This work consists of the file  yathesis.dtx
 %
 \LetLtxMacro{\YAD@ORI@subsubsection}{\subsubsection}
 \renewcommand\subsubsection{%
-  % \boolfalse{YAD@nonnumbered@subsubsection}%
-  % \boolfalse{YAD@nonnumbered@paragraph}%
-  % \boolfalse{YAD@nonnumbered@subparagraph}%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@subsection}{%
   }{%
@@ -5440,8 +5426,6 @@ This work consists of the file  yathesis.dtx
 %
 \LetLtxMacro{\YAD@ORI@paragraph}{\paragraph}
 \renewcommand\paragraph{%
-  % \boolfalse{YAD@nonnumbered@paragraph}%
-  % \boolfalse{YAD@nonnumbered@subparagraph}%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@subsubsection}{%
   }{%
@@ -5469,7 +5453,6 @@ This work consists of the file  yathesis.dtx
 %
 \LetLtxMacro{\YAD@ORI@subparagraph}{\subparagraph}
 \renewcommand\subparagraph{%
-  % \boolfalse{YAD@nonnumbered@subparagraph}%
   \if@mainmatter%
   \ifbool{YAD@nonnumbered@paragraph}{%
   }{%