diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/yathesis/yathesis.dtx | 92 |
2 files changed, 72 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx index 8c8ec7cc9f0..ae8059bcb33 100644 --- a/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx +++ b/Master/texmf-dist/source/latex/yathesis/yathesis-samples-templates.dtx @@ -627,10 +627,6 @@ \listoffigures %<<COMMENT % -% (Facultatif) Table des listings (nécessite que le package « listings » soit -% chargé) -% \lstlistoflistings -% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Début de la partie principale (du « corps ») de la thèse %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1328,7 +1324,7 @@ int factorielle(int n) editor = {O'Connor, Arhur and Arago, François}, title = {Discours prononcé à l'Assemblée Nationale au nom de l'Académie des Sciences à la séance du - \DTMdate{1790-06-12}}, + 12 juin 1790}, booktitle = {Œuvres de Condorcet}, publisher = {Firmin Didot Frères}, address = {Paris}, diff --git a/Master/texmf-dist/source/latex/yathesis/yathesis.dtx b/Master/texmf-dist/source/latex/yathesis/yathesis.dtx index 025220931df..fe8586af303 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 1.0.5 +- `yathesis` --- Yet Another Thesis Class, version 1.0.7 - 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 @@ -70,8 +70,8 @@ Typesetting the documentation of the class requires: \fi %</internal> %<*class|install> -\def\yathesisversion{1.0.5} -\def\yathesisdate{2021-02-05} +\def\yathesisversion{1.0.7} +\def\yathesisdate{2021-03-24} %</class|install> %<*install> \input docstrip.tex @@ -433,6 +433,7 @@ This work consists of the file yathesis.dtx \newbool{YAD@two@titles} \newbool{YAD@cover@page} \newbool{YAD@supervisor@specified} +\newbool{YAD@committeepresident@specified} \newbool{YAD@symbols@isolated} \newbool{YAD@logo@before} \newbool{YAD@valid@day} @@ -1045,6 +1046,10 @@ This work consists of the file yathesis.dtx % \begin{macrocode} \RequirePackage{array}[2008/09/09]% % \end{macrocode} +% Pour des tableaux de largeur déterminée +% \begin{macrocode} +\RequirePackage{tabularx}[2020/01/15]% +% \end{macrocode} % Pour effectuer des manipulations sur des chaîne de caractères % \begin{macrocode} \RequirePackage{xstring}[2013/10/13]% @@ -2062,6 +2067,7 @@ This work consists of the file yathesis.dtx % \begin{macro}{\committeepresident} % \begin{macrocode} \newcommand*{\committeepresident}[3][]{% + \booltrue{YAD@committeepresident@specified} \yadsetup{#1}% \ifboolexpr{% bool {YAD@female} or % @@ -2260,8 +2266,9 @@ This work consists of the file yathesis.dtx }% }% }% + \ifbool{YAD@committeepresident@specified}{% & -% Fonction + % Fonction \YAD@reach@file{% \ifthenelse{\DTLiseq{\YAD@committeemember@role}{}}{% \ifdraft{% @@ -2275,9 +2282,11 @@ This work consists of the file yathesis.dtx }% }% }% - \DTLiflastrow{% - \\[.15cm] - }{% + }{% + }% + \DTLiflastrow{% + \\[.15cm] + }{% \\ }% }% @@ -2287,11 +2296,10 @@ This work consists of the file yathesis.dtx \small% \DTLifdbempty{YAD@staffs}{}{% \ifthenelse{\DTLrowcount{YAD@supervisors}>1}{% - \newcolumntype{u}{>{\itshape}lll}% + \begin{tabular}[t]{>{\itshape}lll} }{% - \newcolumntype{u}{>{\itshape}l@{ }ll}% + \begin{tabular}[t]{>{\itshape}l@{ }ll} }% - \begin{tabular}[t]{u} \DTLforeach*{YAD@supervisors}{% \YAD@committeemember@lastname=lastname,% \YAD@committeemember@firstname=firstname,% @@ -2358,8 +2366,16 @@ This work consists of the file yathesis.dtx % \newcommand*{\YAD@committee@tabular}{% \small% - \begin{tabular}[t]{>{\itshape}llp{5cm}l} - \multicolumn{4}{@{}l}{\bfseries\YAD@translation{committeemembers}}% + \ifbool{YAD@committeepresident@specified}{% + \begin{tabularx}{\textwidth}[t]{>{\itshape}ll>{\raggedright\arraybackslash}Xl} + }{% + \begin{tabularx}{\textwidth}[t]{>{\itshape}ll>{\raggedright\arraybackslash}X} + }% + \ifbool{YAD@committeepresident@specified}{% + \multicolumn{4}{@{}l}{\bfseries\YAD@translation{committeemembers}}% + }{% + \multicolumn{3}{@{}l}{\bfseries\YAD@translation{committeemembers}}% + }% \\[.25cm] \DTLforeach*{YAD@staffs}{% \YAD@the@staff=YAD@the@staff% @@ -2367,7 +2383,7 @@ This work consists of the file yathesis.dtx % \YAD@display@staff{\YAD@the@staff}% }% - \end{tabular}% + \end{tabularx}% }% % \end{macrocode} % @@ -3993,7 +4009,7 @@ This work consists of the file yathesis.dtx % Affichage des directeurs de thèse et du jury % \begin{macrocode} \noindent% - \begin{minipage}[c][\YAD@otherboxheight][c]{\YAD@titleboxwidth} + \begin{minipage}[c][\YAD@otherboxheight][c]{\textwidth} \YAD@supervisors@tabular% \par% \ifboolexpr{% @@ -5107,11 +5123,19 @@ This work consists of the file yathesis.dtx % \begin{macrocode} \renewcommand\addcontentsline[3]{}% \begingroup - \titlespacing*{\section}{\dimen@}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex} - \section*{% - \large% - \translate{lbl-localtocname}% - }% +% \end{macrocode} +% In order to avoid the issue +% \url|https://github.com/dbitouze/yathesis/issues/81|, we don't rely on an +% unumbered section anymore and instead simulate it. +% \begin{macrocode} + \vspace{3.5ex plus 1ex minus .2ex}% + \noindent\hspace{\dimen@}% + {% + \normalfont\large\bfseries% + \translate{lbl-localtocname}% + } + \vspace{2.3ex plus .2ex}% + \par% \endgroup % \end{macrocode} % We don't want the header contain the title of the previous (dummy) section in case @@ -5171,6 +5195,13 @@ This work consists of the file yathesis.dtx \YAD@setlinestyle {subparagraph}{\YAD@numwidthG}% } % \end{macrocode} +% Because we don't rely anymore on an unumbered section for the local ToCs, any +% ×\label× added after a ×\chapter× refers to the \package{etoc}'s counter +% ×etoc@tocid× attached to the local ToCs and, in case \package{etoc} is used, +% we have to tell ×\autoref× to refer to the underlying chapter instead. +% \begin{macrocode} +\newcommand*{\etoc@tocidautorefname}{\MakeLowercase{\chaptername}}% +% \end{macrocode} % % \begin{macrocode} \newcommand*\YAD@computenumwidths@ [2] {% #1 pour `etoc' ou `local', #2=pour le @@ -5225,6 +5256,16 @@ This work consists of the file yathesis.dtx % % \section{Machinerie pour les tables des matières locales} % +% On fournit une commande permettant de définir un \enquote{chapeau} qui sera +% inséré entre les têtes de chapitres et leurs éventuelles tables des matières +% automatiques. +% +% \begin{macrocode} +\newcommand{\leadchapter}[1]{% + \def\YAD@leadchapter{#1}% +} +% \end{macrocode} +% % Les tables des matières locales ne sont pas imprimées si elles sont vides. % \begin{macrocode} \etocchecksemptiness @@ -5270,8 +5311,13 @@ This work consists of the file yathesis.dtx \booltrue{YAD@nextwithlocaltoc}% } \apptocmd{\@makechapterhead}{% + \YAD@ifemptyorundef{\YAD@leadchapter}{% + }{% + \YAD@leadchapter% + \let\YAD@leadchapter\relax + } \ifbool{YAD@localtocs}% - {% + {% \YAD@localtoc% \renewcommand{\YAD@localtoc}{\YAD@default@localtoc}% \ifbool{YAD@nextwithlocaltoc}% @@ -6539,8 +6585,9 @@ This work consists of the file yathesis.dtx % % \begin{macrocode} # mode: yathesis.cls -# denisbitouze, 2020-04-05 +# denisbitouze, 2021-03-23 # +#include:class-book #include:adjustbox #include:array #include:babel @@ -6570,6 +6617,7 @@ This work consists of the file yathesis.dtx #include:nonumonpart #include:pgfopts #include:setspace +#include:tabularx #include:tcolorbox #include:textcase #include:titlesec @@ -6799,6 +6847,7 @@ frametitle=#shadowbox,ovalbox,none,fbox # # Preliminary part # +\colophontext{texte%text}#n* \disclaimer{clause%text}#n \makedisclaimer#n \makedisclaimer*#n @@ -6913,6 +6962,7 @@ name= \stoplocaltocs \nextwithlocaltoc \nextwithoutlocaltoc +\leadchapter{texte%text} # # Customization # |