uowthesistitlepage (10jan14)

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

1 files changed, 462 insertions, 105 deletions

diff --git a/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty b/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
index 95d8e7e1add..5bb47f00492 100644
--- a/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
+++ b/Master/texmf-dist/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
@@ -1,5 +1,5 @@
 %% This is file `uowthesistitlepage.sty',
-%% Version 1.3 2007-09-17
+%% 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
@@ -10,7 +10,7 @@
 %% http://www.latex-project.org/lppl/lppl-1-3c.txt
 %%
 %%--------------------------------------------------------------------------------
-%% This Package redefines the \maketitle command for LaTeX documents and generates
+%% 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:
@@ -18,7 +18,7 @@
 %%     \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 1.2 2007-07-12 tmgriffiths       
+%% Version 2.0 2014-01-07 tmgriffiths       
 %%--------------------------------------------------------------------------------
 
 %% Basic usage overview
@@ -43,7 +43,7 @@
 %   % 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. 
+% 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
@@ -63,9 +63,9 @@
 %%---------------------------------------------------------------------%%
 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{uowthesistitlepage}[2007/07/01 (cc) tmgriffiths]
+\ProvidesPackage{uowthesistitlepage}[2014/01/07 V 2.0 (cc) tmgriffiths]
 
-\RequirePackage{lmodern} 
+\RequirePackage{geometry} 
 \RequirePackage{setspace} % for the doublespacing
 \RequirePackage{etoolbox} % for the supervisor counting trickery
 \RequirePackage{graphicx} 
@@ -73,165 +73,522 @@
 
 %% If statements
 \newif\ifphd
+\newif\ifhonours
+\newif\ifmasters
 \newif\ifpartial
 \newif\ifnosupervisor
 \newif\ifmultiplesupervisors
+\newif\ifcosupervisor
+\newif\ifnocosupervisor
+\newif\ifmultiplecosupervisors
 \newif\ifsubject
+\newif\ifschool
+\newif\ifreport
+\newif\ifhorizontal
     
 %% Declareing the package options    
 % The default wording for the thesis requirements for an honours thesis.
 \DeclareOption{honours} 
-{\phdfalse \partialtrue \subjectfalse}
+{
+\phdfalse
+\mastersfalse
+\honourstrue 
+\partialtrue 
+\subjectfalse
+}
 
-\DeclareOption{honors} % for those less honourable of you who've shunned the 'u.
-{\phdfalse \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 \partialtrue \subjectfalse}
+{
+\phdfalse
+\masterstrue
+\honoursfalse 
+\partialtrue 
+\subjectfalse
+}
 
 % The default wording for the thesis requirements for a masters by research dissertaion.
 \DeclareOption{mastersbyresearch} 
-{\phdfalse \partialfalse \subjectfalse}
+{
+\phdfalse 
+\masterstrue
+\honoursfalse
+\partialfalse 
+\subjectfalse
+}
 
 % The default wording for the thesis requirements for a PhD thesis.
 \DeclareOption{phd}
-{\phdtrue \partialfalse \subjectfalse}
+{
+\phdtrue
+\mastersfalse
+\honoursfalse
+\partialfalse
+\subjectfalse
+\def\@degree{Doctor of Philosophy}
+}
 
-% For all other thesis types, 
-\DeclareOption{other} 
-{\phdfalse \partialtrue \subjectfalse}
+% 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 \partialtrue \subjecttrue \nosupervisortrue}
+{
+\phdfalse
+\mastersfalse
+\honoursfalse
+\reportfalse  
+\partialtrue 
+\subjecttrue 
+}
 
 \DeclareOption{fullsubject}
-{\phdfalse \subjecttrue \partialfalse \nosupervisortrue}
+{
+\phdfalse
+\mastersfalse
+\honoursfalse 
+\subjecttrue
+\reportfalse 
+\partialfalse
+}
+
+\DeclareOption{report}
+{
+\phdfalse
+\mastersfalse
+\honoursfalse 
+\subjecttrue
+\reporttrue 
+\partialtrue 
+\nosupervisortrue
+}
+
+% For all other thesis types. 
+\DeclareOption{other} 
+{
+\phdfalse
+\mastersfalse
+\honoursfalse 
+\partialtrue 
+\subjectfalse
+\reportfalse
+\nosupervisortrue
+}
 
-% In case you belong to an institute such as AIIM instead of a 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{}}
+{
+\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 \multiplesupervisorsfalse}
+{
+\nosupervisortrue
+\cosupervisorfalse 
+\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{cosupervisor}
+{
+\nocosupervisorfalse
+\cosupervisortrue
+}
+
+\DeclareOption{horizontal}
+{
+\horizontaltrue
+}
+
+% 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}
+{
+\nosupervisorfalse 
+\multiplesupervisorsfalse
+}
+
 \DeclareOption{multiplesupervisors}
-{\nosupervisorfalse \multiplesupervisorstrue}
+{
+\nosupervisorfalse 
+\multiplesupervisorstrue
+}
 
 %% Defining the defualt values of the macros within \maketitle
-\makeatletter % his \makeatother friend is at the end of the document, using multiple sets I got all sorts of errors
-% Fields already in the \maketitle command
-\def\@title{\textless{}Title of Your Thesis\textgreater}
-\def\@author{\textless{}Student's Full Name\textgreater}
-\def\@date{\textless{}Month Year\textgreater}
-
-%\def\@supervisor{\textless{}Your Supervisor(s)\textgreater} 
-%    \newcommand{\supervisor}[2][1]{\gdef\@supervisor{#2}}
+\makeatletter 
+% His \makeatother friend is at the end of the document, using multiple "make-ats" I got all sorts of errors
+
+% Fields already in the \maketitle Command
+\def\@title
+{
+\textless{}Title of Your \ifreport Report\else \ifsubject Dissertation\else Thesis\fi\fi\textgreater
+}
+
+\def\@author
+{
+\textless{}Student's Full Name\textgreater
+}
+
+\def\@date
+{
+\textless{}Month Year\textgreater
+}
     
-%These are the new fields not currently in the standard \maketitle macro.
-\def\@supervisor{\textless{}Your Supervisor(s)\textgreater}
-    \newcommand{\supervisor}[2][1]{
-        \gdef\@supervisor{#2}
-        \ifnumless{#1}{1}{\nosupervisortrue \multiplesupervisorsfalse}{}
-        \ifnumequal{#1}{1}{\nosupervisorfalse \multiplesupervisorsfalse}{}
-        \ifnumgreater{#1}{1}{\nosupervisorfalse \multiplesupervisorstrue}{}
-    }
-\def\@degree{\textless{}Your Degree\textgreater} 
-    \newcommand{\degree}[1]{\gdef\@degree{#1}}
-\def\@class{\textless{}Your Class\textgreater} 
-    \newcommand{\class}[1]{\gdef\@class{#1}} 
-\def\@school{\textless{}Your School\textgreater} 
-    \newcommand{\school}[1]{\gdef\@school{#1}}     
-\def\@graphic{\includegraphics[height=2.1cm]{uow_logo}} 
-% Image must be in the working directory for this command to work
-    \newcommand{\graphic}[1]{\gdef\@graphic{#1}} 
-\def\@requirement{This \ifsubject dissertation \else thesis \fi is presented as \ifpartial part of the requirements \else required \fi \ifsubject for completion of \else for the \fi}
-\def\@schooltitle{School of}
-% The default value is the same as the honours option. This can be changed for degrees where the thesis is not only a part of the requirement of the degree
+% These are the new fields not currently in the standard \maketitle macro.
+% \supervisor[]{}
+% Dummy text
+\def\@supervisor
+{
+\textless{}Your Supervisor(s)\textgreater
+}
+% Command
+\newcommand{\supervisor}[2][1]
+{
+\gdef\@supervisor{#2}
+\ifnumless{#1}{1}
+    {% true
+    \nosupervisortrue
+    \multiplesupervisorsfalse
+    }
+    {% false
+    }
+\ifnumequal{#1}{1}
+    {% true
+    \nosupervisorfalse 
+    \multiplesupervisorsfalse
+    }
+    {% false
+    }
+\ifnumgreater{#1}{1}
+    {% true
+    \nosupervisorfalse 
+    \multiplesupervisorstrue
+    }
+    {% false
+    }
+}
 
-%\def\@university{No university} 
-%    \newcommand{\university}[1]{\gdef\@university{#1}} % inactive with the new thesis theme (tmgriffiths 2013-05-29)
+% \cosupervisor[]{}
+% Dummy text
+\def\@cosupervisor
+{
+\textless{}Your Co-supervisor(s)\textgreater
+}
+% Command
+\newcommand{\cosupervisor}[2][1]
+{
+\gdef\@cosupervisor{#2}
+\ifnumless{#1}{1}
+    {% true
+    \cosupervisorfalse
+    \nocosupervisortrue
+    \multiplecosupervisorsfalse
+    }
+    {% false
+    }
+\ifnumequal{#1}{1}
+    {% true
+    \cosupervisortrue
+    \nocosupervisorfalse 
+    \multiplecosupervisorsfalse
+    }
+    {% false
+    }
+\ifnumgreater{#1}{1}
+    {% true
+    \cosupervisortrue
+    \nocosupervisorfalse 
+    \multiplecosupervisorstrue
+    }
+    {% false
+    }
+}
+
+% \degree{}
+% Dummy text
+\def\@degree
+{
+\textless{}Your Degree\textgreater
+} 
+% Command
+\newcommand{\degree}[1]
+{
+\gdef\@degree{#1}
+}
+
+% \class{}
+% Dummy text    
+\def\@class{\textless{}Your Class\textgreater}
+% Command 
+\newcommand{\class}[1]
+{
+\gdef\@class{#1}
+} 
 
+% Dummy text     
+\def\@school
+{
+\textless{}Your School\textgreater
+}
+% Command 
+\newcommand{\school}[1]
+{
+\gdef\@school{#1}
+}
+
+% 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}
+} 
+
+% 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
+\fi
+}
+
+% Internal command for the wording of the title page. 
+\def\@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. 
+%% 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. 
 \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.045\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.025\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.
+
+\newlength{\innersidemargin}
+    \setlength{\innersidemargin}{0.135\paperheight} %for A4 paper this is approximately 40 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}
-{
-\begin{doublespace}
-    \begin{center}
-        \vspace{-\smallgap}
-        \thispagestyle{empty}
-        \ifsubject{\ }\\ \else{\@graphic}\\\fi
-        \vspace{\vsmallgap} 
-        \textbf{
-            \@schooltitle{} \@school\\
-            \vspace{\biggap}
-            {\large{\@title}}\\
-            \vspace{\biggap}
-            {\@author}\\
-            \vspace{\smallgap}
-            \ifnosupervisor {\ }\\ 
-                \else{
-                    \ifmultiplesupervisors Supervisors\\\@supervisor\\ 
-                    \else Supervisor\\\@supervisor\\ 
-                    \fi
-                } 
+\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
-            \vspace{\smallgap}
-            \@requirement\\
-            \ifsubject \@class\\ \else{Award of the Degree of}\\ \fi
-            \ifsubject {\ }\\ \else{\@degree}\\ \fi
-            \ifsubject {\ }\\ \else{of the}\\ \fi
-            University of Wollongong\\
-            \vspace*{\fill}
-            \@date\vspace{\smallgap}
+            } 
+        \fi
+        }
+    \fi
+    }
+\else
+    {
+    \ifnosupervisor
+        { 
+        } 
+    \else
+        {
+        \ifmultiplesupervisors 
+            {
+            Supervisors:\\ \@supervisor\\
+            } 
+        \else
+            {
+            Supervisor:\\ \@supervisor\\
+            } 
+        \fi
+        } 
+    \fi
+    \ifcosupervisor
+        {
+        \ifmultiplecosupervisors 
+            {
+            Co-supervisors:\\ \@cosupervisor\\
+            }
+        \else
+            {
+            Co-supervisor:\\ \@cosupervisor\\
+            }
+        \fi
         }
-    \end{center}
-\end{doublespace}
-\clearpage{\pagestyle{empty}\cleardoublepage} 
+    \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}
+}
+}
 }
-
-%% Execute the default options, print supervisor field and requirements for an honours thesis.
-\ExecuteOptions{onesupervisor,honours}
-\ProcessOptions\relax
-
 
 %%
 %% Declaration page
 %%
-%% This is a new command (\declaration) that if you desire you can use to print the standard thesis submission declaration.
+%% This is a new Command (\declaration) that if you desire you can use to print the standard thesis submission declaration.
 
-\newcommand{\declaration}{
+\newcommand{\declaration}
+{
 \thispagestyle{empty}
 \noindent {\large \textbf{Declaration}}\\
 
-\noindent I, \@author, declare that this thesis, submitted in \ifpartial partial \fi fulfilment of the requirements for the award of \@degree, of the \@schooltitle{} \@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.\\
-\vspace{\midgap}\\
-\noindent\rule{0.4\textwidth}{1.pt}\\
-\vspace{\smallgap}\\
-\textbf{\@author}, \today
+{\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
+}
+
+
+%% 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.
\ No newline at end of file
+% 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