summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ulthese
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-02-01 23:36:56 +0000
committerKarl Berry <karl@freefriends.org>2013-02-01 23:36:56 +0000
commit079ee03ea57935d1695ea2fc98113dcc923adaa5 (patch)
tree90c0af2c23b50c30c4bcc4703d15f3a907c55748 /Master/texmf-dist/tex/latex/ulthese
parentedcae2ae187a55f3a5684bbdac32b8b15e2f0492 (diff)
ulthese (1feb13)
git-svn-id: svn://tug.org/texlive/trunk@29004 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ulthese')
-rw-r--r--Master/texmf-dist/tex/latex/ulthese/ulthese.cls63
1 files changed, 45 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/ulthese/ulthese.cls b/Master/texmf-dist/tex/latex/ulthese/ulthese.cls
index 99ed5a4360c..0a7dece4b5d 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}%
- [2012/09/30 v1.0 Classe pour les theses et memoires de l'Universite Laval]
+ [2013/01/13 v2.0 Classe pour les theses et memoires de l'Universite Laval]
\RequirePackage{ifthen}
\newboolean{UL@natbib}
\setboolean{UL@natbib}{true}
@@ -73,24 +73,27 @@
\makeoddfoot{ul}{}{}{\thepage}
\aliaspagestyle{plain}{ul}
\pagestyle{ul}
-\ifthenelse{\UL@ptsize=10}{%
+\ifnum\UL@ptsize=10\relax
\newcommand*{\UL@fonttitle}{\normalfont\Huge\bfseries\sffamily}
\newcommand*{\UL@fontsubtitle}{\normalfont\huge\bfseries\sffamily}
\newcommand*{\UL@fontauthor}{\normalfont\LARGE\bfseries\sffamily}
\newcommand*{\UL@fontprogram}{\UL@fontauthor}
- \newcommand*{\UL@fontbase}{\normalfont\LARGE\sffamily}}{}
-\ifthenelse{\UL@ptsize=11}{%
+ \newcommand*{\UL@fontbase}{\normalfont\LARGE\sffamily}
+\fi
+\ifnum\UL@ptsize=11\relax
\newcommand*{\UL@fonttitle}{\normalfont\huge\bfseries\sffamily}
\newcommand*{\UL@fontsubtitle}{\normalfont\LARGE\bfseries\sffamily}
\newcommand*{\UL@fontauthor}{\normalfont\Large\bfseries\sffamily}
\newcommand*{\UL@fontprogram}{\UL@fontauthor}
- \newcommand*{\UL@fontbase}{\normalfont\Large\sffamily}}{}
-\ifthenelse{\UL@ptsize=12}{%
+ \newcommand*{\UL@fontbase}{\normalfont\Large\sffamily}
+\fi
+\ifnum\UL@ptsize=12\relax
\newcommand*{\UL@fonttitle}{\normalfont\LARGE\bfseries\sffamily}
\newcommand*{\UL@fontsubtitle}{\normalfont\Large\bfseries\sffamily}
\newcommand*{\UL@fontauthor}{\normalfont\large\bfseries\sffamily}
\newcommand*{\UL@fontprogram}{\UL@fontauthor}
- \newcommand*{\UL@fontbase}{\normalfont\large\sffamily}}{}
+ \newcommand*{\UL@fontbase}{\normalfont\large\sffamily}
+\fi
\newboolean{UL@hassubtitle}
\newboolean{UL@isprogmasc}
\newcommand{\UL@maintitle}{}
@@ -190,11 +193,20 @@
\newcommand*{\faculteUdeS}[1]{\renewcommand*{\UL@facother}{#1}}
\newcommand*{\faculteUQO}[1]{\renewcommand*{\UL@facother}{#1}}
\newcommand*{\faculteUQAC}[1]{\renewcommand*{\UL@facother}{#1}}
-\newcommand{\UL@title}{%
- {\UL@fonttitle\UL@maintitle\par}
- {\UL@fontsubtitle
- \ifthenelse{\boolean{UL@hassubtitle}}{\UL@subtitle}{%
- \vspace*{\baselineskip}}\par}}
+\newsavebox{\UL@titlebox}
+\newsavebox{\UL@subtitlebox}
+\newlength{\UL@titleboxtotht}
+\newlength{\UL@subtitleboxtotht}
+\newcommand{\UL@measuretitle}{%
+ \setbox\UL@titlebox=\vbox{%
+ \centering\UL@fonttitle\UL@maintitle}
+ \setlength{\UL@titleboxtotht}{%
+ \dimexpr\ht\UL@titlebox+\dp\UL@titlebox}
+ \ifthenelse{\boolean{UL@hassubtitle}}{%
+ \setbox\UL@subtitlebox=\vbox{%
+ \centering\vspace*{0.5\baselineskip}\UL@fontsubtitle\UL@subtitle}
+ \setlength{\UL@subtitleboxtotht}{%
+ \dimexpr\ht\UL@subtitlebox+\dp\UL@subtitlebox}}{}}
\newcommand{\UL@docid}{%
{\UL@fontprogram\UL@typeofdoc\par
\ifnum\UL@typenum=2 \UL@program\par \fi}}
@@ -232,19 +244,34 @@
\vspace{\baselineskip}
\UL@facUL\par Universit\'e Laval\par Qu\'ebec, Canada\par
\fi}
+\newlength{\UL@docidspacing}
+\setlength{\UL@docidspacing}{82pt}
+\newlength{\UL@authorspacing}
+\setlength{\UL@authorspacing}{72pt}
\newcommand{\pagetitre}{{%
\clearpage
\thispagestyle{empty}
\SingleSpacing\setlength{\parskip}{0pt}
\centering
\UL@fontbase
- \ifthenelse{\UL@typenum > 1}{\vspace*{0pt}\par}{%
- \includegraphics[height=40px,keepaspectratio=true]{ul_p}\par}
- \vspace{72pt}
- \UL@title
- \vspace{48pt}
+ \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
+ \ifnum\UL@typenum>1\relax
+ \vspace*{0pt}\par
+ \else
+ \includegraphics[height=40px,keepaspectratio=true]{ul_p}\par
+ \fi
+ \vspace{82pt}
+ \box\UL@titlebox
+ \box\UL@subtitlebox
+ \vspace{\UL@docidspacing}
\UL@docid
- \vspace{72pt}
+ \vspace{\UL@authorspacing}
{\UL@fontauthor\UL@author}\par
\UL@details
\vfill