summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty')
-rw-r--r--Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty224
1 files changed, 127 insertions, 97 deletions
diff --git a/Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty b/Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty
index 472a49a73d1..d2a63c756fe 100644
--- a/Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty
+++ b/Master/texmf-dist/tex/latex/stellenbosch/usthesis.sty
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% usthesis.dtx (with options: `mem')
-%% Copyright (C) 2003--2012 Danie Els
+%% Copyright (C) 2003--2014 Danie Els
%%
%% -------------------------------------------------------------------
%% University of Stellenbosch Thesis style
@@ -24,8 +24,8 @@
%% This Current Maintainer of this work is Danie Els (dnjels@sun.ac.za)
%% -------------------------------------------------------------------
%%
-\newcommand{\USfileversion}{v4.3}
-\newcommand{\USfiledate}{2012/02/22}
+\newcommand{\USfileversion}{v5.0}
+\newcommand{\USfiledate}{2014/11/28}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{usthesis}[\USfiledate\space
\USfileversion\space
@@ -68,8 +68,12 @@
\newcommand*\AuthByTxt{}
\newcommand*\StudyLeaderType{}
\newcommand*\StudyLeadersType{}
-\newcommand*\PromotorType{}
-\newcommand*\PromotorsType{}
+\newcommand*\CoStudyLeaderType{}
+\newcommand*\CoStudyLeadersType{}
+\newcommand*\SupervisorType{}
+\newcommand*\SupervisorsType{}
+\newcommand*\CoSupervisorType{}
+\newcommand*\CoSupervisorsType{}
\newcommand*\TypeReport{}
\newcommand*\TypeAssignment{}
\newcommand*\TypeThesis{}
@@ -81,7 +85,6 @@
\newcommand*\Datetxt{}
\newcommand*\MasterDescript{}
\newcommand*\PhDDescript{}
-\newcommand*\PhDFinalDescript{}
\newcommand*\ThesisDeclare{}
\newcommand*\MonthName{}
\newcommand*\DeclarationName{}
@@ -138,48 +141,56 @@
\@Mastersfalse
\newif\if@PhD
\@PhDfalse
-\newif\if@Final
-\@Finalfalse
\newcommand{\ThesisType}{}
-\newcommand{\PromotorText}{}
-\newcommand{\PromotorsText}{}
+\newcommand{\SupervisorText}{}
+\newcommand{\SupervisorsText}{}
+\newcommand{\CoSupervisorText}{}
+\newcommand{\CoSupervisorsText}{}
\DeclareOption{report}{%
\renewcommand{\ThesisType}{\TypeReport}%
- \renewcommand{\PromotorText}{\StudyLeaderType}
- \renewcommand{\PromotorsText}{\StudyLeadersType}
+ \renewcommand{\SupervisorText}{\StudyLeaderType}
+ \renewcommand{\SupervisorsText}{\StudyLeadersType}
+ \renewcommand{\CoSupervisorText}{\CoStudyLeaderType}%
+ \renewcommand{\CoSupervisorsText}{\CoStudyLeadersType}%
\@Reporttrue
\@Mastersfalse
\@PhDfalse}
\DeclareOption{masters-a}{%
\renewcommand{\ThesisType}{\TypeAssignment}%
- \renewcommand{\PromotorText}{\StudyLeaderType}
- \renewcommand{\PromotorsText}{\StudyLeadersType}
+ \renewcommand{\SupervisorText}{\SupervisorType}%
+ \renewcommand{\SupervisorsText}{\SupervisorsType}%
+ \renewcommand{\CoSupervisorText}{\CoSupervisorType}%
+ \renewcommand{\CoSupervisorsText}{\CoSupervisorsType}%
\@Reportfalse
\@Masterstrue
\@PhDfalse}
\DeclareOption{masters-t}{%
\renewcommand{\ThesisType}{\TypeThesis}%
- \renewcommand{\PromotorText}{\StudyLeaderType}%
- \renewcommand{\PromotorsText}{\StudyLeadersType}%
+ \renewcommand{\SupervisorText}{\SupervisorType}%
+ \renewcommand{\SupervisorsText}{\SupervisorsType}%
+ \renewcommand{\CoSupervisorText}{\CoSupervisorType}%
+ \renewcommand{\CoSupervisorsText}{\CoSupervisorsType}%
\@Reportfalse
\@Masterstrue
\@PhDfalse}
\DeclareOption{PhD}{%
\renewcommand{\ThesisType}{\TypePhD}%
- \renewcommand{\PromotorText}{\PromotorType}%
- \renewcommand{\PromotorsText}{\PromotorsType}%
+ \renewcommand{\SupervisorText}{\SupervisorType}%
+ \renewcommand{\SupervisorsText}{\SupervisorsType}%
+ \renewcommand{\CoSupervisorText}{\CoSupervisorType}%
+ \renewcommand{\CoSupervisorsText}{\CoSupervisorsType}%
\@Reportfalse
\@Mastersfalse
- \@PhDtrue
- \@Finalfalse}
+ \@PhDtrue}
\DeclareOption{PhDfinal}{%
\renewcommand{\ThesisType}{\TypePhD}%
- \renewcommand{\PromotorText}{\PromotorType}%
- \renewcommand{\PromotorsText}{\PromotorsType}%
+ \renewcommand{\SupervisorText}{\SupervisorType}%
+ \renewcommand{\SupervisorsText}{\SupervisorsType}%
+ \renewcommand{\CoSupervisorText}{\CoSupervisorType}%
+ \renewcommand{\CoSupervisorsText}{\CoSupervisorsType}%
\@Reportfalse
\@Mastersfalse
- \@PhDtrue
- \@Finaltrue}
+ \@PhDtrue}
\newif\if@ABlock
\newif\if@GBlock
\newif\if@WBlock
@@ -207,6 +218,7 @@
\newlength{\US@tdima}
\newlength{\US@tdimb}
\newsavebox{\US@tboxa}
+\newsavebox{\US@tboxb}
\newcounter{US@tcnta}
\newcounter{US@tcntb}
\if@ABlock
@@ -305,10 +317,11 @@
\centering
\if@Report
\includegraphics[width=100mm]{USlogo-top}\par
+ \vfill
\else
%\includegraphics[width=88mm]{UScrest-top}\par
+ \vfill
\fi
- \vfill
{\LARGE \@title \par}
\vspace{2em}
\if@Authorpresent
@@ -320,6 +333,7 @@
\US@authorlong
\end{tabular}\par}%
\vfill
+ \vfill
\fi
\if@Report\if@Subjectpresent
{\large\DegreeNameLong\par}
@@ -330,11 +344,11 @@
\centering\US@ThesisDescript
\end{US@adjustwidth}\par}
\vfill
- {\US@address\par}
- \vfill
- {\normalsize \US@promotorset \par}
\vfill
- {\large \US@date\par}%
+ {\normalsize \US@spvset \par}
+ \vspace{2em}
+ {\normalsize \US@date\par}%
+ {\footnotesize \US@sponsor \par}
\end{US@titlepage}%
\endgroup
\global\let\TitlePage\relax
@@ -362,11 +376,7 @@
\ThesisDescript{\MasterDescript}
\fi
\if@PhD
- \if@Final
- \ThesisDescript{\PhDFinalDescript}
- \else
- \ThesisDescript{\PhDDescript}%
- \fi
+ \ThesisDescript{\PhDDescript}%
\fi
\newif\if@Subjectpresent
\@Subjectpresentfalse
@@ -383,55 +393,86 @@
\newcommand\USfaculty{%
\PackageWarning{usthesis}{No faculty name supplied}%
\textbf{[No faculty name supplied!]}}
-\newif\if@Promotorpresent
-\@Promotorpresentfalse
-\newif\ifUS@multprm\US@multprmfalse
-\newif\ifUS@prmstacked\US@prmstackedfalse
-\newcommand\US@promotor{}
-\newcommand*\US@prmalign{l}
-\newcommand*\US@prmnewline{~}
-\newcommand{\promotor}{%
- \@ifstar{\US@prmstackedtrue\@promotor}%
- {\US@prmstackedfalse\@promotor}}
-\newcommand{\@promotor}[2][l]{%
- \US@ifempt{#2}{}{\@Promotorpresenttrue}%
- \renewcommand*\US@prmalign{#1}%
- \renewcommand\US@promotor{#2}}
-\newcommand{\US@promotorset}{%
- \if@Promotorpresent
- \edef\US@beginTab{%
- \noexpand\begin{tabular}[t]{@{}\US@prmalign @{}}}%
- \edef\US@endTab{%
- \noexpand\end{tabular}}%
- \sbox{\US@tboxa}{%
- \let\and\US@prm@and%
- \US@beginTab%
- \US@promotor%
- \US@endTab}%
- \ifUS@prmstacked
- \makebox[\wd\US@tboxa][\US@prmalign]{%
- \ifUS@multprm\PromotorsText\else\PromotorText\fi}\\[1ex]%
- \usebox{\US@tboxa}%
- \else
- \ifUS@multprm\PromotorsText\else\PromotorText\fi
- \US@prmnewline%
- \usebox{\US@tboxa}%
- \fi
- \fi
- }
-\newcommand*{\US@prm@and}[1][2ex]{%
- \gdef\US@prmnewline{\\[2ex]}%
- \global\US@multprmtrue%
- \ifUS@prmstacked
- \\[#1]%
- \else
- \US@endTab
- \hskip 1em \@plus.17fil\relax
- \US@beginTab
- \fi
+\newif\ifUS@spvpresent\US@spvpresentfalse
+\newif\ifUS@cospvpresent\US@cospvpresentfalse
+\newif\ifUS@spvmult\US@spvmultfalse
+\newif\ifUS@cospvmult\US@cospvmultfalse
+\newif\ifUS@spvrows\US@spvrowsfalse
+\newcommand\US@spv{}
+\newcommand\US@cospv{}
+\newcommand*\US@spvalign{l}
+\newcommand{\supervisor}{%
+ \@ifstar{\US@spvrowsfalse\@supervisor}%
+ {\US@spvrowstrue\@supervisor}}
+\newcommand{\@supervisor}[2][l]{%
+ \US@ifempt{#2}{}{\US@spvpresenttrue}%
+ \renewcommand*\US@spvalign{#1}%
+ \renewcommand\US@spv{#2}}
+\newcommand{\cosupervisor}[1]{%
+ \US@ifempt{#1}{}{\US@cospvpresenttrue}%
+ \renewcommand\US@cospv{#1}}
+\newcommand{\US@spvset}{%
+ \ifUS@spvrows
+ \US@spvrows
+ \else
+ \US@spvcols
+ \fi}
+\newcommand\US@spvrows{%
+ \edef\US@beginTab{\noexpand\begin{tabular}[t]{@{}\US@spvalign @{}}}%
+ \edef\US@endTab{\noexpand\end{tabular}}%
+ \US@spvmultfalse
+ \sbox{\US@tboxa}{%
+ \let\and\US@spvand%
+ \US@beginTab\US@spv\US@endTab}%
+ \US@cospvmultfalse
+ \sbox{\US@tboxb}{%
+ \let\and\US@cospvand%
+ \US@beginTab\US@cospv\US@endTab}%
+ \ifUS@spvpresent
+ \begin{tabular}{@{}ll@{}}
+ \ifUS@spvmult\SupervisorsText\else\SupervisorText\fi
+ & \usebox{\US@tboxa}\\
+ \ifUS@cospvpresent%
+ \noalign{\vskip 1ex}
+ \ifUS@cospvmult\CoSupervisorsText\else\CoSupervisorText\fi
+ & \usebox{\US@tboxb}
+ \fi
+ \end{tabular}
+ \fi}
+\newcommand\US@spvcols{%
+ \edef\US@beginTab{\noexpand\begin{tabular}[t]{@{}\US@spvalign @{}}}%
+ \edef\US@endTab{\noexpand\end{tabular}}%
+ \US@spvmultfalse
+ \sbox{\US@tboxa}{%
+ \let\and\US@spvand%
+ \US@beginTab\US@spv\US@endTab}%
+ \US@cospvmultfalse
+ \sbox{\US@tboxb}{%
+ \let\and\US@cospvand%
+ \US@beginTab\US@cospv\US@endTab}%
+ \ifUS@spvpresent
+ \US@beginTab
+ \ifUS@spvmult\SupervisorsText\else\SupervisorText\fi\\[1ex]
+ \usebox{\US@tboxa}
+ \US@endTab
+ \fi
+ \ifUS@cospvpresent
+ \hspace{2em}%
+ \US@beginTab
+ \ifUS@cospvmult\CoSupervisorsText\else\CoSupervisorText\fi\\[1ex]
+ \usebox{\US@tboxb}
+ \US@endTab
+ \fi}
+\newcommand*{\US@spvand}[1][0pt]{%
+ \global\US@spvmulttrue%
+ \\[#1]%
+ \ignorespaces}
+\newcommand*{\US@cospvand}[1][0pt]{%
+ \global\US@cospvmulttrue%
+ \\[#1]%
\ignorespaces}
-\let\studyleader\promotor
-\let\supervisor\promotor
+\let\studyleader\supervisor
+\let\promotor\supervisor %Backward compatibility
\newcount\US@month
\newcount\US@year
\US@month=0
@@ -441,6 +482,9 @@
\US@ifempt{#1}{\US@month=0}{\US@month=#1}%
\US@year=#2
\gdef\US@date{\MonthName{\US@month}\ \number\US@year}}
+\newcommand\US@sponsor{\vspace{2em}}
+\newcommand\SetSponsor[1]{%
+ \renewcommand\US@sponsor{\vspace{2em}\par\parbox{\linewidth}{#1}}}
\newcommand\CopyrightPage[1][\CopyrightHolder]{%
%\clearpage
%\thispagestyle{empty}
@@ -458,22 +502,9 @@
\US@Copyrighttrue
\newcommand\SetCopyrightOff{%
\US@Copyrightfalse}
-\let\US@DeclSign\@empty
\let\US@DeclDate\@empty
-\newcommand{\DeclarationSign}[1]{\renewcommand\US@DeclSign{#1}}
+\newcommand{\DeclarationSign}[1]{}% Only for backward compatibility
\newcommand{\DeclarationDate}[1]{\renewcommand\US@DeclDate{#1}}
-\newcommand\US@putdeclsign{%
- \ifx\US@DeclSign\@empty\relax\else
- \vspace{0.5cm}
- \noindent
- \begin{minipage}{.5\textwidth}
- \noindent
- \phantom{\Signat:}~\hfill\US@DeclSign\hfill\mbox{}\\[-.5\baselineskip]
- \Signat:~\dotfill\mbox{}\\
- \phantom{\Signat:}~\hfill\makebox[0pt][c]{\US@author}\hfill\mbox{}
- \end{minipage}
- \par
- \fi}
\newcommand\US@putdecldate{%
\vspace{1cm}
\noindent
@@ -498,7 +529,6 @@
\phantomsection
\addcontentsline{toc}{chapter}{\DeclarationName}%
#1\par
- \US@putdeclsign
\US@putdecldate
\ifUS@Copyright
\mbox{}\par