ulthese (13sep18)

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

1 files changed, 64 insertions, 41 deletions

diff --git a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
index 7f738a6da49..5ada1363624 100644
--- a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
+++ b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
@@ -30,16 +30,18 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesClass{ulthese}%
-  [2017/06/01 v4.4 Universite Laval thesis and memoir class]
+  [2018/08/11 v5.0 Universite Laval thesis and memoir class]
 \RequirePackage{ifxetex}
-\newif\ifUL@babel       \UL@babeltrue        % charger babel?
-\newif\ifUL@natbib      \UL@natbibtrue       % charger natbib?
-\newif\ifUL@chapterbib  \UL@chapterbibfalse  % charger chapterbib?
-\newif\ifUL@sectionbib  \UL@sectionbibfalse  % option sectionbib de chapterbib?
-\newif\ifUL@isthesis                         % programme est une thèse?
-\newif\ifUL@iscotutelle \UL@iscotutellefalse % thèse en cotutelle?
-\newif\ifUL@isexam      \UL@isexamfalse      % examen de doctorat?
-\newif\ifUL@hassubtitle \UL@hassubtitlefalse % document a un sous-titre?
+\newif\ifUL@babel        \UL@babeltrue         % charger babel?
+\newif\ifUL@natbib       \UL@natbibtrue        % charger natbib?
+\newif\ifUL@chapterbib   \UL@chapterbibfalse   % charger chapterbib?
+\newif\ifUL@sectionbib   \UL@sectionbibfalse   % option sectionbib de chapterbib?
+\newif\ifUL@isthesis                           % programme est une thèse?
+\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@hassubtitle  \UL@hassubtitlefalse  % document a un sous-titre?
+\newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisée?
 \DeclareOption{nonatbib}{\UL@natbibfalse}
 \DeclareOption{bibchapitre}{\UL@chapterbibtrue}
 \DeclareOption{bibsection}{\UL@chapterbibtrue\UL@sectionbibtrue}
@@ -186,6 +188,14 @@
       Incompatible option examen}
     {Use this option with a thesis type only.}
   \fi}
+\DeclareOption{essai}{%
+  \ifUL@isthesis
+    \ClassError{ulthese}{%
+      Incompatible option essai}
+    {Use this option with a Master's type only.}
+  \else
+    \UL@isessaytrue
+  \fi}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
 \ExecuteOptions{11pt,letterpaper}
 \ProcessOptions\relax
@@ -197,7 +207,6 @@
 \LoadClass[oneside]{memoir}
 \ifxetex
   \RequirePackage{fontspec}
-  \RequirePackage{unicode-math}
   \defaultfontfeatures{Ligatures=TeX}
 \else
   \RequirePackage[T1]{fontenc}
@@ -220,6 +229,8 @@
   \RequirePackage{babel}
   \RequirePackage[autolanguage]{numprint}
 \fi
+\RequirePackage{etoolbox}
+\AtEndPreamble{\RequirePackage[colorlinks,allcolors=ULlinkcolor]{hyperref}}
 \RequirePackage{graphicx}
 \RequirePackage{xcolor}
 \RequirePackage{textcomp}
@@ -320,6 +331,9 @@
 \ifUL@isexam
   \renewcommand*{\UL@typeofdoc}{Examen de doctorat}
 \fi
+\ifUL@isessay
+  \renewcommand*{\UL@typeofdoc}{Essai}
+\fi
 \newcommand{\UL@docid}{%
   {\UL@fontprogram\UL@typeofdoc\par
   \ifnum\UL@typenum=2 \UL@program\par \fi}}
@@ -383,19 +397,51 @@
 \setlength{\UL@docidspacing}{82pt}
 \newlength{\UL@authorspacing}
 \setlength{\UL@authorspacing}{72pt}
-\newcommand{\pagestitre}{{%
+\newcommand{\UL@settitledims}{%
+  \UL@measuretitle
+  \addtolength{\UL@docidspacing}{-\UL@titleboxtotht}
+  \addtolength{\UL@docidspacing}{-\UL@subtitleboxtotht}
+  \ifdim\UL@docidspacing<\baselineskip\relax
+  \setlength{\UL@docidspacing}{\baselineskip}
+  \addtolength{\UL@authorspacing}{-\baselineskip}
+  \fi}
+\newcommand{\frontispice}{{%
+    \ifUL@isexam\else\ifUL@isessay\else
+      \clearpage
+      \pagestyle{empty}
+      \SingleSpacing\setlength{\parskip}{0pt}
+      \centering
+      \UL@fontbase
+      \ifUL@hastitlepage\else
+        \UL@settitledims
+      \fi
+      \ifnum\UL@typenum>1\relax
+        \vspace*{0pt}\par
+      \else
+        \rule{0mm}{15mm}\par    % strut
+      \fi
+      \vspace{82pt}
+      \box\UL@titlebox
+      \box\UL@subtitlebox
+      \vspace{\UL@docidspacing}
+      \UL@docid
+      \vspace{\UL@authorspacing}
+      {\UL@fontauthor\UL@author}\par
+      \vspace{72pt}
+      Sous la direction de:\par
+      \vspace{\baselineskip}
+      \UL@director\par
+      \UL@codirector
+    \fi\fi
+    \clearpage}}
+\newcommand{\pagetitre}{{%
+    \UL@hastitlepagetrue
     \clearpage
     \pagestyle{empty}
     \SingleSpacing\setlength{\parskip}{0pt}
     \centering
     \UL@fontbase
-    \UL@measuretitle
-    \addtolength{\UL@docidspacing}{-\UL@titleboxtotht}
-    \addtolength{\UL@docidspacing}{-\UL@subtitleboxtotht}
-    \ifdim\UL@docidspacing<\baselineskip\relax
-      \setlength{\UL@docidspacing}{\baselineskip}
-      \addtolength{\UL@authorspacing}{-\baselineskip}
-    \fi
+    \UL@settitledims
     \ifnum\UL@typenum>1\relax
       \vspace*{0pt}\par
     \else
@@ -411,30 +457,7 @@
     \UL@details
     \vfill
     {\textcopyright} \UL@author, \UL@year\par
-    \ifUL@isexam\else
-      \clearpage
-      \ifnum\UL@typenum>1\relax
-        \vspace*{0pt}\par
-      \else
-        \rule{0mm}{15mm}\par    % strut
-      \fi
-      \vspace{82pt}
-      \box\UL@titlebox
-      \box\UL@subtitlebox
-      \vspace{\UL@docidspacing}
-      \UL@docid
-      \vspace{\UL@authorspacing}
-      {\UL@fontauthor\UL@author}\par
-      \vspace{72pt}
-      Sous la direction de:\par
-      \vspace{\baselineskip}
-      \UL@director\par
-      \UL@codirector
-    \fi
     \clearpage}}
-\newcommand{\pagetitre}{
-  \ClassWarning{ulthese}{Command \protect\pagetitre\space is obsolete.\MessageBreak
-    Using \protect\pagestitre\space instead}\pagestitre}
 \ifUL@babel
   \addto\captionsfrench{\renewcommand{\listfigurename}{Liste des figures}}
 \fi