ulthese (30mar16)

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

1 files changed, 32 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
index 3d0f5597eb8..fb403b4b469 100644
--- a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
+++ b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
@@ -30,13 +30,16 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesClass{ulthese}%
-  [2016/02/13 v4.1 Classe pour les theses et memoires de l'Universite Laval]
+  [2016/03/29 v4.2 Classe pour les theses et memoires de l'Universite Laval]
 \RequirePackage{ifthen}
 \RequirePackage{ifxetex}
-\newboolean{UL@natbib}
+\newboolean{UL@babel}           % charger babel ou non
+\newboolean{UL@natbib}          % charger natbib ou non
+\newboolean{UL@isprogmasc}      % nom de programme masculin ou non
+\newboolean{UL@isexam}          % examen de doctorat ou non
+\newboolean{UL@hassubtitle}     % document a un sous-titre ou non
 \setboolean{UL@natbib}{true}
 \DeclareOption{nonatbib}{\setboolean{UL@natbib}{false}}
-\newboolean{UL@babel}
 \setboolean{UL@babel}{true}
 \DeclareOption{nobabel}{\setboolean{UL@babel}{false}}
 \newcommand*{\UL@ptsize}{}
@@ -49,7 +52,6 @@
 \DeclareOption{12pt}{%
   \PassOptionsToClass{12pt}{memoir}
   \renewcommand*{\UL@ptsize}{12}}
-\newboolean{UL@isprogmasc}
 \newcommand*{\UL@typenum}{}
 \DeclareOption{LLD}{%
   \renewcommand*{\UL@typenum}{0}
@@ -126,12 +128,20 @@
   \renewcommand*{\UL@typenum}{3}
   \newcommand*{\UL@extensionat}{Universit\'e du Qu\'ebec \`a Chicoutimi}
   \newcommand*{\UL@extensionloc}{Chicoutimi, Qu\'ebec}}
+\setboolean{UL@isexam}{false}
+\DeclareOption{examen}{%
+  \ifthenelse{\equal{\UL@typeofdoc}{Th\`ese}}{%
+    \setboolean{UL@isexam}{true}
+    \renewcommand*{\UL@typeofdoc}{Examen de doctorat}}{%
+    \ClassError{ulthese}{%
+      Incompatible option examen}
+    {Use this option with a thesis type only.}}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
 \ExecuteOptions{11pt,letterpaper}
 \ProcessOptions
 \ifx\UL@typenum\empty
   \ClassError{ulthese}{%
-    No thesis type specified.}
+    No thesis type specified}
     {Declare the thesis type as a class option.}
 \fi
 \LoadClass[oneside]{memoir}
@@ -202,7 +212,6 @@
 \newcommand*{\UL@degreeother}{}
 \newcommand*{\UL@facUL}{}
 \newcommand*{\UL@facother}{}
-\newboolean{UL@hassubtitle}
 \newcommand{\titre}[1]{\renewcommand{\UL@maintitle}{#1}}
 \newcommand{\soustitre}[1]{%
   \setboolean{UL@hassubtitle}{true}
@@ -326,24 +335,25 @@
     \UL@details
     \vfill
     {\textcopyright} \UL@author, \UL@year\par
-    \clearpage
-    \ifnum\UL@typenum>1\relax
+    \ifthenelse{\boolean{UL@isexam}}{}{%
+      \clearpage
+      \ifnum\UL@typenum>1\relax
       \vspace*{0pt}\par
-    \else
+      \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
+      \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}
     \clearpage}}
 \newcommand{\pagetitre}{
   \ClassWarning{ulthese}{Command \protect\pagetitre\space is obsolete.\MessageBreak