texlive[48172] Master/texmf-dist: yathesis (9jul18)
commits+karl at tug.org
commits+karl at tug.org
Mon Jul 9 23:27:59 CEST 2018
Revision: 48172
http://tug.org/svn/texlive?view=revision&revision=48172
Author: karl
Date: 2018-07-09 23:27:59 +0200 (Mon, 09 Jul 2018)
Log Message:
-----------
yathesis (9jul18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/yathesis/README.md
trunk/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex
trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf
trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex
trunk/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf
trunk/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
trunk/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex
Modified: trunk/Master/texmf-dist/doc/latex/yathesis/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/yathesis/README.md 2018-07-09 21:27:37 UTC (rev 48171)
+++ trunk/Master/texmf-dist/doc/latex/yathesis/README.md 2018-07-09 21:27:59 UTC (rev 48172)
@@ -1,6 +1,6 @@
-----------------------------------------------------------------------
-- `yathesis` --- Yet Another Thesis Class, version 0.99s
+- `yathesis` --- Yet Another Thesis Class, version 0.99t
- E-mail: `denis.bitouze at univ-littoral.fr`
- Released under the LaTeX Project Public License v1.3c or later. See
http://www.latex-project.org/lppl.txt
Modified: trunk/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl
===================================================================
--- trunk/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl 2018-07-09 21:27:37 UTC (rev 48171)
+++ trunk/Master/texmf-dist/doc/latex/yathesis/addons/completion/yathesis.cwl 2018-07-09 21:27:59 UTC (rev 48172)
@@ -71,7 +71,7 @@
noinstitute
nodoctoralschool
nolaboratory
-nolaboratoryadress
+nolaboratoryaddress
nosupervisor
nomaketitle
nokeywords
Modified: trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex 2018-07-09 21:27:37 UTC (rev 48171)
+++ trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/liminaires/titre.tex 2018-07-09 21:27:59 UTC (rev 48172)
@@ -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 at lmpa.univ-littoral.fr]{Denis}{Bitouzé}
%
Added: trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex 2018-07-09 21:27:59 UTC (rev 48172)
@@ -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}%
Property changes on: trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/translations.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex 2018-07-09 21:27:37 UTC (rev 48171)
+++ trunk/Master/texmf-dist/doc/latex/yathesis/french/documentation/yathesis-fr.tex 2018-07-09 21:27:59 UTC (rev 48172)
@@ -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}%
Modified: trunk/Master/texmf-dist/doc/latex/yathesis/french/exemples/specimen/a-plat/these.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/yathesis/yathesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/yathesis/yathesis.dtx 2018-07-09 21:27:37 UTC (rev 48171)
+++ trunk/Master/texmf-dist/source/latex/yathesis/yathesis.dtx 2018-07-09 21:27:59 UTC (rev 48172)
@@ -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 at 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 @@
\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 @@
\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 @@
\YAD at create@boolean{noauthor}%
\YAD at create@boolean{notitle}%
\YAD at create@boolean{noacademicfield}%
+\YAD at create@boolean{noaim}%
\YAD at create@boolean{nodate}%
\YAD at create@boolean{noinstitute}%
\YAD at create@boolean{nodoctoralschool}%
\YAD at create@boolean{nolaboratory}%
-\YAD at create@boolean{nolaboratoryadress}%
+\YAD at create@boolean{nolaboratoryaddress}%
\YAD at create@boolean{nosupervisor}%
\YAD at create@boolean{nomaketitle}%
\YAD at create@boolean{nokeywords}%
@@ -3634,9 +3635,9 @@
\newcommand*{\printlaboratoryaddress}[1]{%
\ifundef{#1}{%
\YAD at reach@file{\YAD at generic@argument at translate{laboratoryaddress}}%
- \ifbool{YAD at nolaboratoryadress}{%
+ \ifbool{YAD at nolaboratoryaddress}{%
}{%
- \YAD at ClassError[nolaboratoryadress]{%
+ \YAD at ClassError[nolaboratoryaddress]{%
Adresse du laboratoire non specifiee ou vide%
}{%
La commande \protect\laboratory\space n'a pas ete utilisee\MessageBreak%
@@ -3778,10 +3779,10 @@
% \begin{minipage}[c][\YAD at otherboxheight][c]{\YAD at titleboxwidth}
% \ifdraft{}{\vspace*{\stretch{.25}}}%
\begin{center}
- \YAD at ifemptyorundef{\printinstitute}{%
- \YAD at generic@argument at translate{institute}%
- \ifbool{YAD at noinstitute}{%
- }{%
+ \ifbool{YAD at noinstitute}{%
+ }{%
+ \YAD at ifemptyorundef{\printinstitute}{%
+ \YAD at generic@argument at translate{institute}%
\YAD at ClassError[noinstitute]{%
Institut de la these non specifie%
}{%
@@ -3791,9 +3792,9 @@
vide\MessageBreak%
(celui-ci doit etre renseigne).%
}%
+ }{%
+ \YAD at translation{institute} \textbf{\textsc{\Large\printinstitute}}%
}%
- }{%
- \YAD at translation{institute} \textbf{\textsc{\Large\printinstitute}}%
}%
\ifundef{\printcoinstitute}{%
}{%
@@ -3809,14 +3810,14 @@
\par%
\YAD at translation{company} \textbf{\textsc{\Large\printcompany}}%
}%
- \ifdraft{}{\vspace*{\stretch{1.5}}}%
- % \vspace*{\stretch{1.5}}%
- \par%
- \YAD at translation{doctoralschool}
- \YAD at ifemptyorundef{\printdoctoralschool}{%
- \YAD at generic@argument at translate{doctoralschool}%
- \ifbool{YAD at nodoctoralschool}{%
- }{%
+ \ifbool{YAD at nodoctoralschool}{%
+ }{%
+ \ifdraft{}{\vspace*{\stretch{1.5}}}%
+ % \vspace*{\stretch{1.5}}%
+ \par%
+ \YAD at translation{doctoralschool}
+ \YAD at ifemptyorundef{\printdoctoralschool}{%
+ \YAD at generic@argument at translate{doctoralschool}%
\YAD at ClassError[nodoctoralschool]{%
Ecole doctorale de la these non specifiee%
}{%
@@ -3826,18 +3827,21 @@
vide\MessageBreak%
(celui-ci doit etre renseigne).%
}%
+ }{%
+ \textbf{\printdoctoralschool}%
}%
- }{%
- \textbf{\printdoctoralschool}%
}%
- \ifdraft{}{\vspace*{\stretch{.5}}}%
- % \vspace*{\stretch{.5}}%
- \par%
- \YAD at translation{universitydepartment}
- \ifdefstring{\YAD at main@laboratory at nonamelink}{true}{%
- \textbf{\printlaboratory{\YAD at main@laboratory at name}}%
+ \ifbool{YAD at nolaboratory}{%
}{%
- \textbf{\printlaboratory[\YAD at main@laboratory at url]{\YAD at main@laboratory at name}}%
+ \ifdraft{}{\vspace*{\stretch{.5}}}%
+ % \vspace*{\stretch{.5}}%
+ \par%
+ \YAD at translation{universitydepartment}
+ \ifdefstring{\YAD at main@laboratory at nonamelink}{true}{%
+ \textbf{\printlaboratory{\YAD at main@laboratory at name}}%
+ }{%
+ \textbf{\printlaboratory[\YAD at main@laboratory at url]{\YAD at main@laboratory at name}}%
+ }%
}%
\ifdraft{}{\vspace*{\stretch{1.5}}}%
% \vspace*{\stretch{1.5}}%
@@ -3864,7 +3868,7 @@
}{%
\textbf{\printauthor}%
}%
- \ifboolexpr{%
+ \ifboolexpr{%
bool {YAD at submitted@work}%
or bool {YAD at submitted@work at star}%
}{%
@@ -3877,33 +3881,39 @@
% \textbf{\printdate}%
% }%
}{%
- \ifdraft{}{\vspace*{\stretch{1}}}%
- % \vspace*{\stretch{1}}%
- \par%
- \YAD at translation{defendedon}
- \YAD at ifemptyorundef{\printdate}{%
- \YAD at generic@argument at translate{date}%
+ \ifbool{YAD at nodate}{%
}{%
- \textbf{\printdate}%
+ \ifdraft{}{\vspace*{\stretch{1}}}%
+ % \vspace*{\stretch{1}}%
+ \par%
+ \YAD at translation{defendedon}
+ \YAD at ifemptyorundef{\printdate}{%
+ \YAD at generic@argument at translate{date}%
+ }{%
+ \textbf{\printdate}%
+ }%
}%
}%
}%
\ifYAD at hdr%
\else%
- \ifdraft{}{\vspace*{\stretch{1}}}%
- % \vspace*{\stretch{1}}%
- \par%
- \YAD at translation{aim}%
- \ifundef{\printinstitute}{%
- \YAD at generic@argument at translate{institute}%
+ \ifbool{YAD at noaim}{%
}{%
- \printinstitute*%
+ \ifdraft{}{\vspace*{\stretch{1}}}%
+ % \vspace*{\stretch{1}}%
+ \par%
+ \YAD at translation{aim}%
+ \ifundef{\printinstitute}{%
+ \YAD at generic@argument at translate{institute}%
+ }{%
+ \printinstitute*%
+ }%
+ \ifundef{\printcoinstitute}{%
+ }{%
+ \YAD at translation{aimand}%
+ \printcoinstitute*%
+ }%
}%
- \ifundef{\printcoinstitute}{%
- }{%
- \YAD at translation{aimand}%
- \printcoinstitute*%
- }%
\fi%
\ifdraft{}{\vspace*{\stretch{1}}}%
% \vspace*{\stretch{1}}%
@@ -4682,7 +4692,7 @@
% désactivent l'émission de ces erreurs.
% \begin{macrocode}
\YAD at nolaboratorytrue%
- \YAD at nolaboratoryadresstrue%
+ \YAD at nolaboratoryaddresstrue%
}%
% \end{macrocode}
% \end{macro}
@@ -4983,11 +4993,19 @@
\newcommand\YAD at setlinestyle [2]{% #1= unit, #2= numwidth as macro
\etocsetstyle{#1}
{\advance\leftskip#2\relax}
- {\vskip \YAD at verysmallvskip\relax
- \leavevmode
+ {%
+ \vskip
+ \YAD at 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 at leaderbox
\hfil\makebox[-\parfillskip][r]{\etocpage}%
@@ -4999,9 +5017,16 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand\YAD at globalstyle {% encapsule le style pour les global TOCs
- \etocsettocstyle {\if at twocolumn \@restonecoltrue \onecolumn \else
- \@restonecolfalse \fi
- \parindent\z@ \leftskip\z at skip \rightskip \z at skip
+ \etocsettocstyle {%
+ \if at twocolumn
+ \@restonecoltrue
+ \onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \parindent\z@
+ \leftskip\z at skip
+ \rightskip\z at skip
\setbox\YAD at leaderbox\hbox to \YAD at leaderboxwidth{\hss.\hss}%
\chapter *[\cmdKV at YAD@name]{\noindent\kern\YAD at leftmargin\relax % uses "pt"...
\cmdKV at YAD@name%
@@ -5008,8 +5033,13 @@
}%
\rightskip \YAD at rightmargin\relax
\parfillskip -\rightskip % or a smaller value if desired
- \leftskip \YAD at leftmargin \relax } {\if at restonecol \twocolumn
- \fi\cleardoublepage}%
+ \leftskip \YAD at leftmargin \relax%
+ }{%
+ \if at restonecol
+ \twocolumn
+ \fi
+ \cleardoublepage%
+ }%
%
\etocsetstyle{part} {} {\addpenalty {-\@highpenalty}%
\addvspace \YAD at bigvskip \leavevmode {\large
@@ -5020,7 +5050,9 @@
%
\etocsetstyle{chapter} {\advance\leftskip\YAD at numwidthB\relax} {\addpenalty
{-\@highpenalty }%
- \vskip \YAD at globalmedvskip\relax \leavevmode {\interlinepenalty\@M \etocifnumbered
+ \vskip \YAD at globalmedvskip\relax
+ \leavevmode%
+ {\interlinepenalty\@M \etocifnumbered
{\llap{\makebox[\YAD at numwidthB][l]{\bfseries\etocnumber}}}
{\advance\leftskip-\YAD at numwidthB\relax}%
\bfseries\etocname
@@ -5103,6 +5135,7 @@
\YAD at setlinestyle {subparagraph}{\YAD at numwidthG}%
}
% \end{macrocode}
+%
% \begin{macrocode}
\newcommand*\YAD at computenumwidths@ [2] {% #1 pour `etoc' ou `local', #2=pour le
% \kern
@@ -5237,13 +5270,6 @@
\LetLtxMacro{\YAD at ORI@chapter}{\chapter}%
\AfterPreamble{% delay the redefinition when titlesec has done its own
\renewcommand\chapter{%
- % \boolfalse{YAD at nonnumbered@chapter}%
- % \boolfalse{YAD at nonnumbered@section}%
- % \boolfalse{YAD at nonnumbered@subsection}%
- % \boolfalse{YAD at nonnumbered@subsubsection}%
- % \boolfalse{YAD at nonnumbered@paragraph}%
- % \boolfalse{YAD at nonnumbered@subparagraph}%
- %
\ifbool{YAD at localbibs}{%
\let\YAD at ORI@blx at warn@bibempty\blx at warn@bibempty%
\def\blx at warn@bibempty{}%
@@ -5370,11 +5396,16 @@
\YAD at tmp@section[#1][#2]{#3}%
}%
\newcommandtwoopt{\YAD at unstarred@section}[3][][]{%
- \boolfalse{YAD at nonnumbered@section}%
- \boolfalse{YAD at nonnumbered@subsection}%
- \boolfalse{YAD at nonnumbered@subsubsection}%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@chapter}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@section}%
+ \boolfalse{YAD at nonnumbered@subsection}%
+ \boolfalse{YAD at nonnumbered@subsubsection}%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@section[#1][#2]{#3}%
}%
% \end{macrocode}
@@ -5409,10 +5440,15 @@
\YAD at tmp@subsection[#1]{#2}%
}%
\newcommand{\YAD at unstarred@subsection}[2][]{%
- \boolfalse{YAD at nonnumbered@subsection}%
- \boolfalse{YAD at nonnumbered@subsubsection}%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@section}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@subsection}%
+ \boolfalse{YAD at nonnumbered@subsubsection}%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@subsection[#1]{#2}%
}%
%
@@ -5441,9 +5477,14 @@
\YAD at tmp@subsubsection[#1]{#2}%
}%
\newcommand{\YAD at unstarred@subsubsection}[2][]{%
- \boolfalse{YAD at nonnumbered@subsubsection}%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@subsection}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@subsubsection}%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@subsubsection[#1]{#2}%
}%
%
@@ -5471,8 +5512,13 @@
\YAD at tmp@paragraph[#1]{#2}%
}%
\newcommand{\YAD at unstarred@paragraph}[2][]{%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@subsubsection}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@paragraph[#1]{#2}%
}%
%
@@ -5499,7 +5545,12 @@
\YAD at tmp@subparagraph[#1]{#2}%
}%
\newcommand{\YAD at unstarred@subparagraph}[2][]{%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@paragraph}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@subparagraph[#1]{#2}%
}%
% \end{macrocode}
@@ -6389,7 +6440,7 @@
noinstitute
nodoctoralschool
nolaboratory
-nolaboratoryadress
+nolaboratoryaddress
nosupervisor
nomaketitle
nokeywords
Modified: trunk/Master/texmf-dist/tex/latex/yathesis/yathesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/yathesis/yathesis.cls 2018-07-09 21:27:37 UTC (rev 48171)
+++ trunk/Master/texmf-dist/tex/latex/yathesis/yathesis.cls 2018-07-09 21:27:59 UTC (rev 48172)
@@ -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 at create@boolean{noauthor}%
\YAD at create@boolean{notitle}%
\YAD at create@boolean{noacademicfield}%
+\YAD at create@boolean{noaim}%
\YAD at create@boolean{nodate}%
\YAD at create@boolean{noinstitute}%
\YAD at create@boolean{nodoctoralschool}%
\YAD at create@boolean{nolaboratory}%
-\YAD at create@boolean{nolaboratoryadress}%
+\YAD at create@boolean{nolaboratoryaddress}%
\YAD at create@boolean{nosupervisor}%
\YAD at create@boolean{nomaketitle}%
\YAD at create@boolean{nokeywords}%
@@ -2381,9 +2382,9 @@
\newcommand*{\printlaboratoryaddress}[1]{%
\ifundef{#1}{%
\YAD at reach@file{\YAD at generic@argument at translate{laboratoryaddress}}%
- \ifbool{YAD at nolaboratoryadress}{%
+ \ifbool{YAD at nolaboratoryaddress}{%
}{%
- \YAD at ClassError[nolaboratoryadress]{%
+ \YAD at 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 at otherboxheight][c]{\YAD at titleboxwidth}
% \ifdraft{}{\vspace*{\stretch{.25}}}%
\begin{center}
- \YAD at ifemptyorundef{\printinstitute}{%
- \YAD at generic@argument at translate{institute}%
- \ifbool{YAD at noinstitute}{%
- }{%
+ \ifbool{YAD at noinstitute}{%
+ }{%
+ \YAD at ifemptyorundef{\printinstitute}{%
+ \YAD at generic@argument at translate{institute}%
\YAD at ClassError[noinstitute]{%
Institut de la these non specifie%
}{%
@@ -2512,9 +2513,9 @@
vide\MessageBreak%
(celui-ci doit etre renseigne).%
}%
+ }{%
+ \YAD at translation{institute} \textbf{\textsc{\Large\printinstitute}}%
}%
- }{%
- \YAD at translation{institute} \textbf{\textsc{\Large\printinstitute}}%
}%
\ifundef{\printcoinstitute}{%
}{%
@@ -2530,14 +2531,14 @@
\par%
\YAD at translation{company} \textbf{\textsc{\Large\printcompany}}%
}%
- \ifdraft{}{\vspace*{\stretch{1.5}}}%
- % \vspace*{\stretch{1.5}}%
- \par%
- \YAD at translation{doctoralschool}
- \YAD at ifemptyorundef{\printdoctoralschool}{%
- \YAD at generic@argument at translate{doctoralschool}%
- \ifbool{YAD at nodoctoralschool}{%
- }{%
+ \ifbool{YAD at nodoctoralschool}{%
+ }{%
+ \ifdraft{}{\vspace*{\stretch{1.5}}}%
+ % \vspace*{\stretch{1.5}}%
+ \par%
+ \YAD at translation{doctoralschool}
+ \YAD at ifemptyorundef{\printdoctoralschool}{%
+ \YAD at generic@argument at translate{doctoralschool}%
\YAD at 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 at translation{universitydepartment}
- \ifdefstring{\YAD at main@laboratory at nonamelink}{true}{%
- \textbf{\printlaboratory{\YAD at main@laboratory at name}}%
+ \ifbool{YAD at nolaboratory}{%
}{%
- \textbf{\printlaboratory[\YAD at main@laboratory at url]{\YAD at main@laboratory at name}}%
+ \ifdraft{}{\vspace*{\stretch{.5}}}%
+ % \vspace*{\stretch{.5}}%
+ \par%
+ \YAD at translation{universitydepartment}
+ \ifdefstring{\YAD at main@laboratory at nonamelink}{true}{%
+ \textbf{\printlaboratory{\YAD at main@laboratory at name}}%
+ }{%
+ \textbf{\printlaboratory[\YAD at main@laboratory at url]{\YAD at main@laboratory at name}}%
+ }%
}%
\ifdraft{}{\vspace*{\stretch{1.5}}}%
% \vspace*{\stretch{1.5}}%
@@ -2585,7 +2589,7 @@
}{%
\textbf{\printauthor}%
}%
- \ifboolexpr{%
+ \ifboolexpr{%
bool {YAD at submitted@work}%
or bool {YAD at submitted@work at star}%
}{%
@@ -2598,33 +2602,39 @@
% \textbf{\printdate}%
% }%
}{%
- \ifdraft{}{\vspace*{\stretch{1}}}%
- % \vspace*{\stretch{1}}%
- \par%
- \YAD at translation{defendedon}
- \YAD at ifemptyorundef{\printdate}{%
- \YAD at generic@argument at translate{date}%
+ \ifbool{YAD at nodate}{%
}{%
- \textbf{\printdate}%
+ \ifdraft{}{\vspace*{\stretch{1}}}%
+ % \vspace*{\stretch{1}}%
+ \par%
+ \YAD at translation{defendedon}
+ \YAD at ifemptyorundef{\printdate}{%
+ \YAD at generic@argument at translate{date}%
+ }{%
+ \textbf{\printdate}%
+ }%
}%
}%
}%
\ifYAD at hdr%
\else%
- \ifdraft{}{\vspace*{\stretch{1}}}%
- % \vspace*{\stretch{1}}%
- \par%
- \YAD at translation{aim}%
- \ifundef{\printinstitute}{%
- \YAD at generic@argument at translate{institute}%
+ \ifbool{YAD at noaim}{%
}{%
- \printinstitute*%
+ \ifdraft{}{\vspace*{\stretch{1}}}%
+ % \vspace*{\stretch{1}}%
+ \par%
+ \YAD at translation{aim}%
+ \ifundef{\printinstitute}{%
+ \YAD at generic@argument at translate{institute}%
+ }{%
+ \printinstitute*%
+ }%
+ \ifundef{\printcoinstitute}{%
+ }{%
+ \YAD at translation{aimand}%
+ \printcoinstitute*%
+ }%
}%
- \ifundef{\printcoinstitute}{%
- }{%
- \YAD at translation{aimand}%
- \printcoinstitute*%
- }%
\fi%
\ifdraft{}{\vspace*{\stretch{1}}}%
% \vspace*{\stretch{1}}%
@@ -3291,7 +3301,7 @@
\cleardoublepage%
\egroup%
\YAD at nolaboratorytrue%
- \YAD at nolaboratoryadresstrue%
+ \YAD at nolaboratoryaddresstrue%
}%
\newcommand{\YAD at abstract@page at rule}[1][black]{\bgroup\color{#1}\noindent\rule[2pt]{\linewidth}{2pt}\egroup}
\AtEndDocument{%
@@ -3511,11 +3521,19 @@
\newcommand\YAD at setlinestyle [2]{% #1= unit, #2= numwidth as macro
\etocsetstyle{#1}
{\advance\leftskip#2\relax}
- {\vskip \YAD at verysmallvskip\relax
- \leavevmode
+ {%
+ \vskip
+ \YAD at 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 at leaderbox
\hfil\makebox[-\parfillskip][r]{\etocpage}%
@@ -3525,9 +3543,16 @@
{\advance\leftskip-#2\relax}%
}
\newcommand\YAD at globalstyle {% encapsule le style pour les global TOCs
- \etocsettocstyle {\if at twocolumn \@restonecoltrue \onecolumn \else
- \@restonecolfalse \fi
- \parindent\z@ \leftskip\z at skip \rightskip \z at skip
+ \etocsettocstyle {%
+ \if at twocolumn
+ \@restonecoltrue
+ \onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \parindent\z@
+ \leftskip\z at skip
+ \rightskip\z at skip
\setbox\YAD at leaderbox\hbox to \YAD at leaderboxwidth{\hss.\hss}%
\chapter *[\cmdKV at YAD@name]{\noindent\kern\YAD at leftmargin\relax % uses "pt"...
\cmdKV at YAD@name%
@@ -3534,8 +3559,13 @@
}%
\rightskip \YAD at rightmargin\relax
\parfillskip -\rightskip % or a smaller value if desired
- \leftskip \YAD at leftmargin \relax } {\if at restonecol \twocolumn
- \fi\cleardoublepage}%
+ \leftskip \YAD at leftmargin \relax%
+ }{%
+ \if at restonecol
+ \twocolumn
+ \fi
+ \cleardoublepage%
+ }%
%
\etocsetstyle{part} {} {\addpenalty {-\@highpenalty}%
\addvspace \YAD at bigvskip \leavevmode {\large
@@ -3546,7 +3576,9 @@
%
\etocsetstyle{chapter} {\advance\leftskip\YAD at numwidthB\relax} {\addpenalty
{-\@highpenalty }%
- \vskip \YAD at globalmedvskip\relax \leavevmode {\interlinepenalty\@M \etocifnumbered
+ \vskip \YAD at globalmedvskip\relax
+ \leavevmode%
+ {\interlinepenalty\@M \etocifnumbered
{\llap{\makebox[\YAD at numwidthB][l]{\bfseries\etocnumber}}}
{\advance\leftskip-\YAD at numwidthB\relax}%
\bfseries\etocname
@@ -3720,13 +3752,6 @@
\LetLtxMacro{\YAD at ORI@chapter}{\chapter}%
\AfterPreamble{% delay the redefinition when titlesec has done its own
\renewcommand\chapter{%
- % \boolfalse{YAD at nonnumbered@chapter}%
- % \boolfalse{YAD at nonnumbered@section}%
- % \boolfalse{YAD at nonnumbered@subsection}%
- % \boolfalse{YAD at nonnumbered@subsubsection}%
- % \boolfalse{YAD at nonnumbered@paragraph}%
- % \boolfalse{YAD at nonnumbered@subparagraph}%
- %
\ifbool{YAD at localbibs}{%
\let\YAD at ORI@blx at warn@bibempty\blx at warn@bibempty%
\def\blx at warn@bibempty{}%
@@ -3836,11 +3861,16 @@
\YAD at tmp@section[#1][#2]{#3}%
}%
\newcommandtwoopt{\YAD at unstarred@section}[3][][]{%
- \boolfalse{YAD at nonnumbered@section}%
- \boolfalse{YAD at nonnumbered@subsection}%
- \boolfalse{YAD at nonnumbered@subsubsection}%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@chapter}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@section}%
+ \boolfalse{YAD at nonnumbered@subsection}%
+ \boolfalse{YAD at nonnumbered@subsubsection}%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@section[#1][#2]{#3}%
}%
\LetLtxMacro{\YAD at ORI@subsection}{\subsection}
@@ -3869,10 +3899,15 @@
\YAD at tmp@subsection[#1]{#2}%
}%
\newcommand{\YAD at unstarred@subsection}[2][]{%
- \boolfalse{YAD at nonnumbered@subsection}%
- \boolfalse{YAD at nonnumbered@subsubsection}%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@section}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@subsection}%
+ \boolfalse{YAD at nonnumbered@subsubsection}%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@subsection[#1]{#2}%
}%
\LetLtxMacro{\YAD at ORI@subsubsection}{\subsubsection}
@@ -3900,9 +3935,14 @@
\YAD at tmp@subsubsection[#1]{#2}%
}%
\newcommand{\YAD at unstarred@subsubsection}[2][]{%
- \boolfalse{YAD at nonnumbered@subsubsection}%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@subsection}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@subsubsection}%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@subsubsection[#1]{#2}%
}%
\LetLtxMacro{\YAD at ORI@paragraph}{\paragraph}
@@ -3929,8 +3969,13 @@
\YAD at tmp@paragraph[#1]{#2}%
}%
\newcommand{\YAD at unstarred@paragraph}[2][]{%
- \boolfalse{YAD at nonnumbered@paragraph}%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@subsubsection}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@paragraph}%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@paragraph[#1]{#2}%
}%
\LetLtxMacro{\YAD at ORI@subparagraph}{\subparagraph}
@@ -3956,7 +4001,12 @@
\YAD at tmp@subparagraph[#1]{#2}%
}%
\newcommand{\YAD at unstarred@subparagraph}[2][]{%
- \boolfalse{YAD at nonnumbered@subparagraph}%
+ \if at mainmatter%
+ \ifbool{YAD at nonnumbered@paragraph}{%
+ }{%
+ \boolfalse{YAD at nonnumbered@subparagraph}%
+ }%
+ \fi%
\YAD at tmp@subparagraph[#1]{#2}%
}%
\@ifpackageloaded{floatrow}{%
More information about the tex-live-commits
mailing list