uowthesistitlepage (19jul17)

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

1 files changed, 570 insertions, 464 deletions

diff --git a/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty b/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
index 5bb47f00492..49ea3aca3cc 100644
--- a/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
+++ b/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
@@ -1,27 +1,32 @@
-%% This is file `uowthesistitlepage.sty',
-%% 2014-01-07 (cc) tmgriffiths Version 2.0
-%%
-%% Copyright (CC BY-NC-SA 3.0 AU) 2013 by T. M. Griffiths
-%% under the creative commons licence, attribution, non-comercial, share alike
-%% http://creativecommons.org/licenses/by-nc-sa/3.0/au/ 
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License version 1.3c
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%%
-%%--------------------------------------------------------------------------------
-%% This Package redefines the \maketitle Command for LaTeX documents and generates
-%% a title page as close as possible to the current UOW HDR word thesis-template.        
-%% Use this package with the book class to typeset your thesis. 
-%% The UOW default dimensions can be implimented with:
-%% \usepackage{geometry}
-%%     \geometry{a4paper,inner=4.0cm, outer=2cm, top=3cm, bottom=2cm}               
-%%                    
-%% Created by Thomas M. Griffiths (tmg994[at]uowmail[dot]edu[dot]au) 2013-06-17 
-%% Version 2.0 2014-01-07 tmgriffiths       
-%%--------------------------------------------------------------------------------
-
-%% Basic usage overview
+% This is file `uowthesistitlepage.sty',
+% 2014-01-07 (cc) tmgriffiths Version 3.0
+%
+% Copyright (CC BY-SA 4.0 AU) 2017 by T. M. Griffiths under the creative
+% commons licence, attribution, non-comercial, share alike
+% https://creativecommons.org/licenses/by-sa/4.0/ 
+%
+% This work may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License version 1.3c
+% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%
+%------------------------------------------------------------------------------
+% This Package redefines the \maketitle Command for LaTeX documents and
+% generates a title page as close as possible to the current UOW HDR word
+% thesis-template. Use this package with the book class to typeset your thesis.
+% The UOW default dimensions can be implimented with: 
+%  \usepackage{geometry}
+%    \geometry{a4paper,inner=4.0cm, outer=2cm, top=3cm, bottom=2cm}
+% These aren't especially pleasing to look at. Without changing the dimensions
+% of the textblock you can use:
+%  \usepackage{geometry}
+%     \geometry{a4paper,inner=3cm, outer=3cm, top=2cm, bottom=3m}
+% for more visually appealing margins.
+%
+% Created by Thomas M. Griffiths (tmg994[at]uowmail[dot]edu[dot]au) 2013-06-17
+% Version 3.0 2017-07-18 tmgriffiths
+%------------------------------------------------------------------------------
+%
+% Basic usage overview
 %
 % \usepackage{uowthesistitlepage}
 %
@@ -32,46 +37,52 @@
 % Standard fields of \maketitle
 % \title{A Pretty Swish Title} 
 % \author{Average J. Blow}
-%   % If you use the hyperref package you can add a mailto link, so that clicking on your name opens an email to you.
-% 	
-% The new fields from the \maketitle renewal (see code below).
-% \degree{That Degree You've Been Studying} 
-%   % Write it in full: e.g. Bachelor of Science Medicinal Chemistry Advanced Honours
-% \school{Your School} 
+%   % If you use the hyperref package you can add a mailto link, so that 
+%   % clicking on your name opens an email to you.
+%
+% The new fields from the \maketitle renewal (see code below)
+% \degree{That Degree You've Been Studying}
+%   % Write it in full: e.g. Bachelor of Science Medicinal Chemistry Advanced 
+%   % Honours
+% \school{Your School}
 %   % e.g Chemistry
 % \supervisor{supervisor 1, supervisor 2 \& supervisor 3}
-%   % A list of your supervisors, can be turned off with the nosupervisor package option in the preamble 
-%   % or switched to multiple (more thn one) with the package option multiplesupervisors
+%   % A list of your supervisors, can be turned off with the nosupervisor 
+%   % package option in the preamble
+%   % or switched to multiple (more thn one) with the package option 
+%   % multiplesupervisors
 %
-% Implimented in version 1.1 is the \declaration Command. 
-% This typesets the declaration (below) that this thesis is your own work, required in the front of each PhD Thesis.
+% Implimented in version 1.1 is the \declaration Command.
+% This typesets the declaration (below) that this thesis is your own work,
+% required in the front of each PhD Thesis.
 %
 % Declaration
 %
-% I, <Student’s Full Name>, declare that this thesis, submitted in partial fulfilment of the requirements for the award of 
-% <Your Degree>, of the School of <Your School>, University of Wollongong, is wholly my own work unless otherwise referenced
-% or acknowledged. The document has not been submitted for qualifications at any other academic institution.
+% I, \emph{Student’s Full Name}, declare that this thesis, submitted in
+% partial fulfilment of the requirements for the award of \emph{Your Degree}, of
+% the School of Your School, University of Wollongong, is wholly my own work
+% unless otherwise referenced or acknowledged. The document has not been
+% submitted for qualifications at any other academic institution.
 %
 %
 % ------------------------------------
 %
-% <Student’s Full Name>, July 1, 2013
+% Student’s Full Name, July 1, 2013
 %
-
-%%---------------------------------------------------------------------%%
-% Package code   														%
-%%---------------------------------------------------------------------%%
+%---------------------------------------------------------------------%
+% Package code                                                          %
+%---------------------------------------------------------------------%
 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{uowthesistitlepage}[2014/01/07 V 2.0 (cc) tmgriffiths]
+\ProvidesPackage{uowthesistitlepage}[2014/01/07 V 3.0 (cc) tmgriffiths]
 
-\RequirePackage{geometry} 
-\RequirePackage{setspace} % for the doublespacing
-\RequirePackage{etoolbox} % for the supervisor counting trickery
-\RequirePackage{graphicx} 
-    \DeclareGraphicsRule{.tif}{png}{.png}{`convert #1 `dirname #1`/`basename #1 .tif`.png}
+\RequirePackage{geometry}
+\RequirePackage{ragged2e} 
+\RequirePackage{setspace}
+\RequirePackage{etoolbox}
+\RequirePackage{graphicx}
 
-%% If statements
+% If statements
 \newif\ifphd
 \newif\ifhonours
 \newif\ifmasters
@@ -83,512 +94,607 @@
 \newif\ifmultiplecosupervisors
 \newif\ifsubject
 \newif\ifschool
+  \schooltrue
+  
 \newif\ifreport
 \newif\ifhorizontal
-    
-%% Declareing the package options    
+\newif\ifaltpage
+\newif\iflogo
+  \logotrue
+  
+\newif\ifcopyright
+  \copyrighttrue
+  
+\newif\ifdomestic
+  \domestictrue
+
+% For my memory
+%\ifvar
+%  true
+%\else
+%  false
+%\fi
+   
+% Declareing the package options.
 % The default wording for the thesis requirements for an honours thesis.
-\DeclareOption{honours} 
-{
-\phdfalse
-\mastersfalse
-\honourstrue 
-\partialtrue 
-\subjectfalse
-}
-
-\DeclareOption{honors} % for those less honourable of you who've shunned the u.
-{
-\phdfalse 
-\mastersfalse
-\honourstrue
-\partialtrue 
-\subjectfalse
-}
-
-% The default wording for the thesis requirements for a masters by coursework thesis.
-\DeclareOption{mastersbycoursework} 
-{
-\phdfalse
-\masterstrue
-\honoursfalse 
-\partialtrue 
-\subjectfalse
-}
-
-% The default wording for the thesis requirements for a masters by research dissertaion.
-\DeclareOption{mastersbyresearch} 
-{
-\phdfalse 
-\masterstrue
-\honoursfalse
-\partialfalse 
-\subjectfalse
+\DeclareOption{honours}{%
+  \phdfalse
+  \mastersfalse
+  \honourstrue 
+  \partialtrue 
+  \subjectfalse
+}
+
+\DeclareOption{honors}{% for those less honourable of you who've shunned the u.
+  \phdfalse 
+  \mastersfalse
+  \honourstrue
+  \partialtrue 
+  \subjectfalse
+}
+
+% The default wording for the thesis requirements for a masters by coursework
+% thesis.
+\DeclareOption{mastersbycoursework}{%
+  \phdfalse
+  \masterstrue
+  \honoursfalse 
+  \partialtrue 
+  \subjectfalse
+}
+
+% The default wording for the thesis requirements for a masters by research
+% dissertation.
+\DeclareOption{mastersbyresearch}{%
+  \phdfalse 
+  \masterstrue
+  \honoursfalse
+  \partialfalse 
+  \subjectfalse
 }
 
 % The default wording for the thesis requirements for a PhD thesis.
-\DeclareOption{phd}
-{
-\phdtrue
-\mastersfalse
-\honoursfalse
-\partialfalse
-\subjectfalse
-\def\@degree{Doctor of Philosophy}
-}
-
-% The default wording for the thesis requirements for a PhD thesis, with option capitalisation.
-\DeclareOption{PhD}
-{
-\phdtrue
-\mastersfalse
-\honoursfalse
-\partialfalse
-\subjectfalse
-\reportfalse
-\def\@degree{Doctor of Philosophy}
-}
-
-%for theses or reports that are for an individual subject, not for the award of a degree
-\DeclareOption{partialsubject}
-{
-\phdfalse
-\mastersfalse
-\honoursfalse
-\reportfalse  
-\partialtrue 
-\subjecttrue 
-}
-
-\DeclareOption{fullsubject}
-{
-\phdfalse
-\mastersfalse
-\honoursfalse 
-\subjecttrue
-\reportfalse 
-\partialfalse
-}
-
-\DeclareOption{report}
-{
-\phdfalse
-\mastersfalse
-\honoursfalse 
-\subjecttrue
-\reporttrue 
-\partialtrue 
-\nosupervisortrue
+\DeclareOption{phd}{%
+  \phdtrue
+  \mastersfalse
+  \honoursfalse
+  \partialfalse
+  \subjectfalse
+  \degree{Doctor of Philosophy}
+}
+
+% The default wording for the thesis requirements for a PhD thesis, with option
+% capitalisation.
+\DeclareOption{PhD}{%
+  \phdtrue
+  \mastersfalse
+  \honoursfalse
+  \partialfalse
+  \subjectfalse
+  \reportfalse
+  \degree{Doctor of Philosophy}
+}
+
+% For theses or reports that are for an individual subject, not for the award of
+% a degree.
+\DeclareOption{partialsubject}{%
+  \copyrightfalse
+  \phdfalse
+  \mastersfalse
+  \honoursfalse
+  \reportfalse  
+  \partialtrue 
+  \subjecttrue
+}
+
+\DeclareOption{fullsubject}{%
+  \copyrightfalse
+  \phdfalse
+  \mastersfalse
+  \honoursfalse 
+  \subjecttrue
+  \reportfalse 
+  \partialfalse
+}
+
+\DeclareOption{report}{%
+  \copyrightfalse
+  \phdfalse
+  \mastersfalse
+  \honoursfalse 
+  \subjecttrue
+  \reporttrue 
+  \partialtrue 
+  \nosupervisortrue
 }
 
 % For all other thesis types. 
-\DeclareOption{other} 
-{
-\phdfalse
-\mastersfalse
-\honoursfalse 
-\partialtrue 
-\subjectfalse
-\reportfalse
-\nosupervisortrue
+\DeclareOption{other}{%
+  \phdfalse
+  \mastersfalse
+  \honoursfalse 
+  \partialtrue 
+  \subjectfalse
+  \reportfalse
+  \nosupervisortrue
+}
+
+% In case you belong to an institute or some other affiliation (such as AIIM)
+% instead of a school.
+\DeclareOption{noschool}{%
+  \newcommand\@schooltitle{} 
+  \newcommand\@school{}
 }
 
-% In case you belong to an institute or some other affiliation (such as AIIM) instead of a school
-\DeclareOption{noschool} 
-{
-\def\@schooltitle{} 
-\def\@school{}
+% Determining the pluralisation (or absence) of 'supervisor' acording to the
+% number of supervisors.
+\DeclareOption{nosupervisor}{% also achievable by using \supervisor[0]{}
+  \nosupervisortrue
+  \cosupervisorfalse 
+  \multiplesupervisorsfalse
 }
 
-% Determining the pluralisation (or absence) of 'supervisor' acording to the number of supervisors
-\DeclareOption{nosupervisor} % also achievable by using \supervisor[0]{}
-{
-\nosupervisortrue
-\cosupervisorfalse 
-\multiplesupervisorsfalse
+\DeclareOption{cosupervisor}{%
+  \nocosupervisorfalse
+  \cosupervisortrue
 }
 
-\DeclareOption{cosupervisor}
-{
-\nocosupervisorfalse
-\cosupervisortrue
+\DeclareOption{horizontal}{%
+  \horizontaltrue
 }
 
-\DeclareOption{horizontal}
-{
-\horizontaltrue
+\DeclareOption{nologo}{%
+  \logofalse
 }
 
-% These two options have been left in for legacy purposes, but are no longer needed as the \supervisor Command has been modifed to have an optional field that specifies the number of supervisors
-\DeclareOption{onesupervisor}
-{
-\nosupervisorfalse 
-\multiplesupervisorsfalse
+% These two options have been left in for legacy purposes, but are no longer
+% needed as the \supervisor Command has been modifed to have an optional field
+% that specifies the number of supervisors.
+\DeclareOption{onesupervisor}{%
+  \nosupervisorfalse 
+  \multiplesupervisorsfalse
 }
 
-\DeclareOption{multiplesupervisors}
-{
-\nosupervisorfalse 
-\multiplesupervisorstrue
+\DeclareOption{multiplesupervisors}{%
+  \nosupervisorfalse 
+  \multiplesupervisorstrue
 }
 
-%% Defining the defualt values of the macros within \maketitle
-\makeatletter 
-% His \makeatother friend is at the end of the document, using multiple "make-ats" I got all sorts of errors
+\DeclareOption{nocopyright}{%
+  \copyrightfalse
+}
+
+\DeclareOption{international}{%
+  \domesticfalse
+}
+
+\DeclareOption{nortpacknowledgement}{%
+  \domesticfalse
+}
+
+% Definitely not another page layout that is more aesthetically pleasing. 
+% No-sir-ee. Not here.
+\DeclareOption{altpage}{%
+  \altpagetrue
+}
+
+% Defining the default values of the macros within \maketitle
 
 % Fields already in the \maketitle Command
-\def\@title
-{
-\textless{}Title of Your \ifreport Report\else \ifsubject Dissertation\else Thesis\fi\fi\textgreater
+\renewcommand\@title{%
+  Title of Your \ifreport Report\else \ifsubject Dissertation\else Thesis\fi\fi%
+  \@latex@warning@no@line{No \noexpand\title specified!}
 }
 
-\def\@author
-{
-\textless{}Student's Full Name\textgreater
+\renewcommand\@author{%
+  Student's Full Name%
+  \@latex@warning@no@line{No \noexpand\author specified!}%
 }
 
-\def\@date
-{
-\textless{}Month Year\textgreater
+\renewcommand\@date{%
+  \ifcase \month%
+      \or January%
+      \or February%
+      \or March%
+      \or April%
+      \or May%
+      \or June%
+      \or July%
+      \or August%
+      \or September%
+      \or October%
+      \or November%
+      \or December%
+  \fi, \number \the\year%
 }
-    
+
 % These are the new fields not currently in the standard \maketitle macro.
 % \supervisor[]{}
 % Dummy text
-\def\@supervisor
-{
-\textless{}Your Supervisor(s)\textgreater
+\newcommand\@supervisor{%
+  Your Supervisor(s)%
+  \@latex@warning@no@line{No \noexpand\supervisor specified!}
 }
 % Command
-\newcommand{\supervisor}[2][1]
-{
-\gdef\@supervisor{#2}
-\ifnumless{#1}{1}
-    {% true
+\newcommand{\supervisor}[2][1]{%
+  \gdef\@supervisor{#2}%
+  \ifnumless{#1}{1}{% true
     \nosupervisortrue
     \multiplesupervisorsfalse
-    }
-    {% false
-    }
-\ifnumequal{#1}{1}
-    {% true
+  }
+  {}% false
+  \ifnumequal{#1}{1}{% true
     \nosupervisorfalse 
     \multiplesupervisorsfalse
-    }
-    {% false
-    }
-\ifnumgreater{#1}{1}
-    {% true
+  }
+  {}% false
+  \ifnumgreater{#1}{1}{% true
     \nosupervisorfalse 
     \multiplesupervisorstrue
-    }
-    {% false
-    }
+  }%
+  {}% false
 }
 
 % \cosupervisor[]{}
 % Dummy text
-\def\@cosupervisor
-{
-\textless{}Your Co-supervisor(s)\textgreater
+\newcommand\@cosupervisor{%
+  {Your Co-supervisor(s)}%
 }
 % Command
-\newcommand{\cosupervisor}[2][1]
-{
-\gdef\@cosupervisor{#2}
-\ifnumless{#1}{1}
-    {% true
+\newcommand{\cosupervisor}[2][1]{%
+  \gdef\@cosupervisor{#2}
+  \ifnumless{#1}{1}{% true
     \cosupervisorfalse
     \nocosupervisortrue
     \multiplecosupervisorsfalse
-    }
-    {% false
-    }
-\ifnumequal{#1}{1}
-    {% true
+  }
+  {}% false
+  \ifnumequal{#1}{1}{% true
     \cosupervisortrue
     \nocosupervisorfalse 
     \multiplecosupervisorsfalse
-    }
-    {% false
-    }
-\ifnumgreater{#1}{1}
-    {% true
+  }
+    {}% false
+  \ifnumgreater{#1}{1}{% true
     \cosupervisortrue
     \nocosupervisorfalse 
     \multiplecosupervisorstrue
-    }
-    {% false
-    }
+  }
+  {}% false
 }
 
 % \degree{}
 % Dummy text
-\def\@degree
-{
-\textless{}Your Degree\textgreater
-} 
+\newcommand\@degree{%
+  Your Degree%
+  \ifsubject{}%
+  \else{%
+    \@latex@warning@no@line{No \noexpand\degree specified!}%
+  }%
+  \fi
+}
 % Command
-\newcommand{\degree}[1]
-{
-\gdef\@degree{#1}
-}
-
-% \class{}
-% Dummy text    
-\def\@class{\textless{}Your Class\textgreater}
-% Command 
-\newcommand{\class}[1]
-{
-\gdef\@class{#1}
+\newcommand{\degree}[1]{%
+  \gdef\@degree{#1}%
+}
+
+% \subject{}
+% Dummy text 
+\newcommand\@subject{%
+  Your Class%
+  \@latex@warning@no@line{No \noexpand\subject specified!}%
+}
+% Command
+\newcommand{\subject}[1]{%
+  \gdef\@subject{#1}%
 } 
 
-% Dummy text     
-\def\@school
-{
-\textless{}Your School\textgreater
+% \school{}
+% Dummy text
+\newcommand\@school{%
+  Your School%
+  \@latex@warning@no@line{No \noexpand\school specified!}%
 }
-% Command 
-\newcommand{\school}[1]
-{
-\gdef\@school{#1}
+
+% Command
+\newcommand{\school}[1]{%
+  \gdef\@school{#1}%
+}
+
+% Internal command for the wording of the title page.
+\newcommand\@graphic{%
+  \includegraphics[height=\crestheight]{uow_logo}%
 }
 
-% Internal command for the wording of the title page.     
-\def\@graphic
-{
-\includegraphics[height=\crestheight]{uow_logo}
-} 
 % Command
 % Image must be in the working directory for this Command to work
-\newcommand{\graphic}[1]
-{
-\gdef\@graphic{#1}
-} 
+\newcommand{\graphic}[1]{%
+  \gdef\@graphic{#1}%
+}
 
-% Internal command for the wording of the title page.    
-\def\@requirement
-{
-\ifreport This report submitted as part of the assessment schedule for: \else This \ifsubject dissertation \else thesis \fi is presented as \ifpartial part of the requirements \else required \fi \ifsubject for completion of: \else for the conferral of the degree:\fi
+% Internal command for the wording of the title page.
+\newcommand\@requirement{%
+  \ifreport This report submitted as part of the assessment schedule for: %
+  \else This \ifsubject dissertation \else thesis \fi is presented as %
+  \ifpartial part of the requirements \else required \fi \ifsubject for %
+  completion of: \else for the conferral of the degree:\fi%
 \fi
 }
 
-% Internal command for the wording of the title page. 
-\def\@schooltitle
-{
-School of
+% Internal command for the wording of the title page.
+\newcommand\@schooltitle{%
+  School of%
 }
 
-%%
-%% Lengths
-%% Calculate the size of the gaps between fields relative to the paper height incase A4 is not used.
-%% The title page should cope with up to A5, but document fontsize  does need to be taken down to 10 pt.
-%% In the future I hope to implement something that changes the font size according to paper size. 
+%
+% Research Training  Program requirement for research students to acknowledge
+% the Australian Government RTP Scholarship in all research publications.
+%
+\newcommand{\RTPacknowledgement}{%
+  This research has been conducted with the support of the Australian %
+  Government Research Training Program Scholarship.%
+}
+
+% \newcommand{\director}[1]{\gdef\@director{#1}}%
+% \newcommand{\@director}{\@latex@warning@no@line{No \noexpand\director specified!}}
+
+% Command
+\newcommand{\copyrighttext}[1]{%
+  \gdef\@copyrighttext{#1}%
+}
+
+\newcommand\@copyrighttext{%
+  \begin{raggedright}
+    \begin{singlespace}
+      This work \textcopyright{} copyright by \@author, \the\year. All Rights %
+      Reserved.
+      
+      \vspace{\smallgap}%
+      No part of this work may be reproduced, stored in a retrieval system, %
+      transmitted, in any form or by any means, electronic, mechanical, %
+      photocopying, recording, or otherwise, without the prior permission of %
+      the author or the University of Wollongong.%
+      
+      \ifdomestic{%
+        \vspace{\smallgap}%
+        \RTPacknowledgement%
+      }%
+      \else{}%
+      \fi%
+    \end{singlespace}
+  \end{raggedright}
+}
+
+%
+% Declaration page
+%
+% This is a new Command (\declaration) that if you desire you can use to print
+% the standard thesis submission declaration.
+\newcommand{\declaration}{%
+  \thispagestyle{empty}
+  \section*{Declaration}
+  \begin{singlespacing}
+    I, \emph{\@author}, declare that this \ifreport report \else \ifsubject %
+    dissertation \else thesis \fi \fi is submitted in \ifpartial partial \fi %
+    fulfilment of the requirements for \ifsubject the completion of %
+    \emph{\@subject{}}, \else the conferral of the degree \emph{\@degree{}}, %
+    from the University of Wollongong, \fi is wholly my own work unless %
+    otherwise referenced or acknowledged. This document has not been submitted %
+    for qualifications at any other academic institution.%
+    \par
+    \vspace{\fill}%
+    \noindent\rule{0.4\linewidth}{0.5pt}%
+    \vspace{1em}%
+    \par
+    \noindent\textbf{\@author}\vspace{1em}%
+    \par
+    \noindent\today
+  \end{singlespacing}
+  \clearpage{\pagestyle{empty}\cleardoublepage}
+}
+
+%
+% Lengths
+%
+% Calculate the size of the gaps between fields relative to the paper height.
+% Just in case A4 is not used. The title page should cope with up to A5, but 
+% document fontsize does need to be taken down to 10 pt. In the future I 
+% hope to implement something that changes the font size according to paper 
+% size. 
+%
 \newlength{\biggap}
-    \setlength{\biggap}{0.10\paperheight} %for A4 paper this is approximately 29 mm.
+\setlength{\biggap}{0.10\paperheight}
+% for A4 paper this is approximately 29 mm.
 
 \newlength{\midgap}
-    \setlength{\midgap}{0.044\paperheight} %for A4 paper this is approximately 13 mm.
+\setlength{\midgap}{0.044\paperheight}
+% for A4 paper this is approximately 13 mm.
 
 \newlength{\smallgap}
-    \setlength{\smallgap}{0.024\paperheight} %for A4 paper this is approximately 7 mm.
+\setlength{\smallgap}{0.024\paperheight}
+% for A4 paper this is approximately 7 mm.
 
 \newlength{\vsmallgap}
-    \setlength{\vsmallgap}{0.012\paperheight} %for A4 paper this is approximately 3.5 mm.
+\setlength{\vsmallgap}{0.012\paperheight}
+% for A4 paper this is approximately 3.5 mm.
 
 \newlength{\crestheight}
-    \setlength{\crestheight}{0.068\paperheight} %for A4 paper this is approximately 20 mm.
+\setlength{\crestheight}{0.068\paperheight}
+% for A4 paper this is approximately 20 mm.
 
 \newlength{\innersidemargin}
-    \setlength{\innersidemargin}{0.135\paperheight} %for A4 paper this is approximately 40 mm.
+% \setlength{\innersidemargin}{0.135\paperheight}
+% for A4 paper this is approximately 40 mm.
+\setlength{\innersidemargin}{0.10\paperheight}
+% for A4 paper this is approximately 29 mm
 
 \newlength{\outersidemargin}
-    \setlength{\outersidemargin}{0.068\paperheight} %for A4 paper this is approximately 20 mm.
-    
-\newlength{\topsidemargin}
-    \setlength{\topsidemargin}{\biggap} %for A4 paper this is approximately 29 mm.
-    
-\newlength{\bottomsidemargin}
-    \setlength{\bottomsidemargin}{\outersidemargin} %for A4 paper this is approximately 20 mm.
-    
-    
-
-%%
-%% Title page
-%%
-%% Here we actually set up the title page.
-\renewcommand{\maketitle}%
-{
-\thispagestyle{empty}
-{\centering
-{\onehalfspacing
-\newgeometry{inner=\innersidemargin,outer=\outersidemargin,top=\topsidemargin,bottom=\bottomsidemargin}
-\ifsubject
-    {
-    }\\ 
-\else
-    {
-    \@graphic\\
-    } 
-\fi
-\textbf
-    {
-    \vspace{\biggap}\\
-    {\Large\@title}\\
-    \vspace{\biggap}
-    }
-\@author\\
-\vspace{\smallgap}
-\ifhorizontal
-    {
-    \ifcosupervisor
-        {
-        \begin{tabular}{cc}
-        \ifmultiplesupervisors 
-            {
-            Supervisors:
-            } 
-        \else 
-            {
-            Supervisor: 
-            }
-        \fi
-        &
-        \ifmultiplecosupervisors 
-            {
-            Co-supervisors:
-            } 
-        \else 
-            {
-            Co-supervisor: 
-            }\\
-        \fi
-        \@supervisor
-        &
-        \@cosupervisor
-        \end{tabular}
-        }\\
-    \else 
-        {
-        \ifnosupervisor
-            { 
-            } 
-        \else
-            {
-            \ifmultiplesupervisors 
-                {
-                Supervisors:\\ \@supervisor
-                }\\ 
-            \else
-                {
-                Supervisor:\\ \@supervisor
-                }\\ 
-            \fi
-            } 
-        \fi
-        }
-    \fi
-    }
-\else
-    {
-    \ifnosupervisor
-        { 
-        } 
-    \else
-        {
-        \ifmultiplesupervisors 
-            {
-            Supervisors:\\ \@supervisor\\
-            } 
-        \else
-            {
-            Supervisor:\\ \@supervisor\\
-            } 
-        \fi
-        } 
-    \fi
-    \ifcosupervisor
-        {
-        \ifmultiplecosupervisors 
-            {
-            Co-supervisors:\\ \@cosupervisor\\
-            }
-        \else
-            {
-            Co-supervisor:\\ \@cosupervisor\\
-            }
-        \fi
-        }
-    \else
-        {
-        } 
-    \fi
-    }
-\fi
-\vspace{\biggap}
-\textit{
-\@requirement
-}\\
-\ifsubject
-    {
-    \vspace{\smallgap}
-    \@class}\\
-    \vspace*{\fill}
-\else
-    {
-    \vspace{\smallgap}
-    \@degree\\
-    \vspace*{\fill}
-    }
-\fi
-The University of Wollongong\par
-\ifschool
-    {
-    \noindent\@schooltitle{}\@school\\
-    }
-\else
-    {
-    }
-\fi
-\vspace{\smallgap}
-\@date\vspace{\smallgap} 
-\restoregeometry       
-\clearpage{\pagestyle{empty}\cleardoublepage}
-}
-}
-}
-
-%%
-%% Declaration page
-%%
-%% This is a new Command (\declaration) that if you desire you can use to print the standard thesis submission declaration.
+\setlength{\outersidemargin}{0.10\paperheight}
+% for A4 paper this is approximately 29 mm.
 
-\newcommand{\declaration}
-{
-\thispagestyle{empty}
-\noindent {\large \textbf{Declaration}}\\
-
-{\itshape\noindent I, \@author, declare that this \ifreport report \else \ifsubject dissertation \else thesis \fi \fi submitted in \ifpartial partial \fi fulfilment of the requirements for \ifsubject the completion of \@class{}, \else the conferral of the degree \@degree{}, from the University of Wollongong, \fi is wholly my own work unless otherwise referenced or acknowledged. This document has not been submitted for qualifications at any other academic institution.\par
-\vspace{\biggap}
-\noindent\rule{0.4\textwidth}{0.5pt}
-\vspace{1ex}\\
-\textbf{\@author}\\
-\today
-}
-
-\clearpage{\pagestyle{empty}\cleardoublepage}
-\makeatother
-}
+\newlength{\topsidemargin}
+\setlength{\topsidemargin}{0.068\paperheight}
+% for A4 paper this is approximately 20 mm.
 
+\newlength{\bottomsidemargin}
+\setlength{\bottomsidemargin}{0.10\paperheight}
+% for A4 paper this is approximately 29 mm.
 
-%% Execute the default options, print supervisor field and requirements for an honours thesis.
+%
+% Title page
+%
+% Here we actually set up the title page.
+%
+\renewcommand{\maketitle}{%
+  \thispagestyle{empty}
+  \newgeometry{%
+    inner=\innersidemargin,%
+    outer=\outersidemargin,%
+    top=\topsidemargin,%
+    bottom=\bottomsidemargin%
+  }%
+  \begin{raggedright}
+    \begin{singlespacing}
+      \ifsubject{}
+      \else{%
+       \iflogo{%
+         \@graphic\\
+       }%
+       \else{}%
+       \fi%
+      }%
+      \fi
+      \textbf{%
+       \vspace{\biggap}\\%
+       {\Large\@title}\\%
+       \vspace{\midgap}%
+      }%
+      \@author\\%
+      \vspace{\midgap}%
+      \textit{%
+       \@requirement%
+      }\\%
+      \ifsubject{%
+       \vspace{\smallgap}%
+       \@subject\\%
+       \vspace*{\fill}%
+      }%
+      \else{%
+       \vspace{\smallgap}%
+       \@degree\\%
+       \vspace*{\fill}%
+      }%
+      \fi
+      \ifhorizontal{%
+       \ifcosupervisor{%
+         \begin{tabular}{@{}ll@{}}
+         \ifmultiplesupervisors{%
+           Supervisors:%
+         }%
+         \else{%
+           Supervisor:%
+         }%
+         \fi%
+         &%
+         \ifmultiplecosupervisors{%
+           Co-supervisors:%
+         }%
+         \else{%
+           Co-supervisor:%
+         }\\%
+         \fi
+         \@supervisor%
+         &%
+         \@cosupervisor%
+         \end{tabular}
+       }\\%
+       \else{%
+         \ifnosupervisor{}%
+         \else{%
+           \ifmultiplesupervisors{%
+             Supervisors:\\%
+             \@supervisor%
+           }\\% 
+           \else{%
+             Supervisor:\\%
+             \@supervisor%
+           }\\%
+           \fi
+         }%
+         \fi
+       }%
+       \fi%
+      }%
+      \else{%
+         \ifnosupervisor{}%
+         \else{%
+           \ifmultiplesupervisors{%
+             Supervisors:\\%
+             \@supervisor\\%
+             \vspace{1ex}%
+           }%
+           \else{%
+             Supervisor:\\%
+             \@supervisor\\%
+             \vspace{1ex}%
+           }%
+           \fi%
+         }%
+         \fi%
+         \ifcosupervisor{%
+           \ifmultiplecosupervisors{%
+             Co-supervisors:\\%
+             \@cosupervisor\\%
+           }%
+           \else{%
+             Co-supervisor:\\%
+             \@cosupervisor\\%
+           }%
+           \fi%
+         }%
+         \else{}%
+         \fi%
+       }%
+      \fi%
+      \vspace{\midgap}%
+      The University of Wollongong\\%
+      \ifschool{%
+        \noindent\@schooltitle{} \@school\\%
+      }%
+      \else{}%
+      \fi%
+      \vspace{\midgap}%
+      \@date\vspace{\smallgap}%
+    \end{singlespacing}
+  \end{raggedright}
+  \ifcopyright{%
+    \clearpage%
+    \newgeometry{%
+      inner=\innersidemargin,%
+      outer=\outersidemargin,%
+      top=\topsidemargin,%
+      bottom=\bottomsidemargin%
+    }%
+    \thispagestyle{empty}%
+    \begin{raggedright}
+      \begin{singlespacing}
+        \vspace*{\fill}%
+        \footnotesize%
+        \@copyrighttext%
+      \end{singlespacing}
+    \end{raggedright}
+    \restoregeometry
+  }%
+  \else{}%
+  \fi%
+  \restoregeometry
+  \clearpage{\pagestyle{empty}\cleardoublepage}
+}
+
+% Execute the default options, print supervisor field and requirements for an
+% honours thesis.
 \ExecuteOptions{honours}
-\schooltrue
 \ProcessOptions\relax
-
 \endinput
-% Quidquid latine dictum sit altum videtur.
 
-% Depreciated/old snippets that I might need someday
-%\def\@university{No university} 
-%    \newcommand{\university}[1]{\gdef\@university{#1}} % inactive with the new thesis theme (tmgriffiths 2013-05-29)
\ No newline at end of file
+% Quidquid latine dictum sit altum videtur.