From 0e91b46bf592af5742c7a0520be86797d944687d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 29 Nov 2019 21:56:43 +0000 Subject: ulthese (29nov19) git-svn-id: svn://tug.org/texlive/trunk@52972 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ulthese/ulthese.cls | 37 +++++++++++++++++-------- 1 file changed, 26 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ulthese') diff --git a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls index 646babe406a..bc559f8629d 100644 --- a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls +++ b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2009/09/24] \ProvidesClass{ulthese}% - [2019/05/06 v5.2 Universite Laval thesis and memoir class] + [2019/11/29 v5.3 Universite Laval thesis and memoir class] \RequirePackage{ifxetex} \newif\ifUL@babel \UL@babeltrue % charger babel? \newif\ifUL@natbib \UL@natbibtrue % charger natbib? @@ -41,7 +41,8 @@ \newif\ifUL@iscotutelle \UL@iscotutellefalse % thèse en cotutelle? \newif\ifUL@isexam \UL@isexamfalse % examen de doctorat? \newif\ifUL@isessay \UL@isessayfalse % essai de maîtrise? -\newif\ifUL@isproject \UL@isprojectfalse % projet de recherche? +\newif\ifUL@isresearch \UL@isresearchfalse % projet de recherche? +\newif\ifUL@isworkterm \UL@isworktermfalse % rapport de stage? \newif\ifUL@hassubtitle \UL@hassubtitlefalse % document a un sous-titre? \newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisée? \DeclareOption{nonatbib}{\UL@natbibfalse} @@ -200,18 +201,24 @@ \UL@isessaytrue \fi} \DeclareOption{projet}{% - \UL@isprojecttrue + \UL@isresearchtrue + \renewcommand*{\UL@typenum}{0} + \def\UL@degree{\mbox{}}} +\DeclareOption{stage}{% + \UL@isworktermtrue \renewcommand*{\UL@typenum}{0} \def\UL@degree{\mbox{}}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}} \ExecuteOptions{11pt,letterpaper} \ProcessOptions\relax \ifx\UL@typenum\empty - \ifUL@isproject\else - \ClassError{ulthese}{% - No thesis type specified} - {Declare the thesis type as a class option.} + \ifUL@isresearch\else + \ifUL@isworkterm\else + \ClassError{ulthese}{% + No thesis type specified} + {Declare the thesis type as a class option.} \fi + \fi \fi \LoadClass[oneside]{memoir} \ifxetex @@ -352,9 +359,12 @@ \ifUL@isessay \renewcommand*{\UL@typeofdoc}{Essai} \fi -\ifUL@isproject +\ifUL@isresearch \renewcommand*{\UL@typeofdoc}{Projet de recherche} \fi +\ifUL@isworkterm + \renewcommand*{\UL@typeofdoc}{Rapport de stage} +\fi \newcommand{\UL@docid}{% {\UL@fontprogram\UL@typeofdoc\par \ifnum\UL@typenum=2 \UL@program\par \fi}} @@ -362,7 +372,12 @@ \ifcase\UL@typenum\relax% 0 standard \vspace{96pt} {\UL@fontprogram\UL@program}\par - \ifUL@isproject\vspace{\baselineskip}\else\UL@degree\fi\par + \ifnum\ifUL@isresearch 1\else\ifUL@isworkterm 1\else 0\fi\fi + =1 % + \vspace{\baselineskip} + \else + \UL@degree + \fi\par \vspace{112pt} Qu\'ebec, Canada\par \or% 1 multifacultaire @@ -427,7 +442,7 @@ \addtolength{\UL@authorspacing}{-\baselineskip} \fi} \newcommand{\frontispice}{{% - \ifUL@isexam\else + \ifUL@isexam\else\ifUL@isworkterm\else \clearpage \pagestyle{empty} \SingleSpacing\setlength{\parskip}{0pt} @@ -453,7 +468,7 @@ \vspace{\baselineskip} \UL@director\par \UL@codirector - \fi + \fi\fi \clearpage}} \newcommand{\pagetitre}{{% \UL@hastitlepagetrue -- cgit v1.2.3