ut-thesis (1jun12)

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

3 files changed, 597 insertions, 888 deletions

diff --git a/Master/texmf-dist/doc/latex/ut-thesis/README b/Master/texmf-dist/doc/latex/ut-thesis/README
index bc24c3e3b5b..5353967548f 100644
--- a/Master/texmf-dist/doc/latex/ut-thesis/README
+++ b/Master/texmf-dist/doc/latex/ut-thesis/README
@@ -1,39 +1,130 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  `UT-THESIS' README file
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory CTAN:/macros/latex/base/lppl.txt.
-%%
-%%  Copyright (c) 1999 by Francois Pitt
-%%  Last Update: 1999 December 10
-%%  
-%%  This directory contains the two files described below,
-%%  together with this README file.  For more information, please
-%%  read the comments at the beginning of each file.
-%%  
-%%  Send all bugs, questions, comments, suggestions, etc. to the
-%%  author, at <fpitt@cs.utoronto.ca>.
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  UT-THESIS.CLS (v1.8)
-%%  Copyright (c) 1999 by Francois Pitt
-%%  Last Update: 1999 December 10
-%%  
-%%  LaTeX2e class file for formatting documents according to the
-%%  School of Graduate Studies' guidelines for theses at the
-%%  University of Toronto (conforms to SGS guidelines of 07/97). 
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  UT-THESIS.TEX
-%%  Copyright (c) 1999 by Francois Pitt
-%%  Last Update: 1999 May 13
-%%  
-%%  Skeleton LaTeX2e file for the preparation of theses at UofT;
-%%  conforms to the School of Graduate Studies' guidelines of 07/97.
-%%  To be used in conjunction with class file `ut-thesis.cls', whose
-%%  features it illustrates.
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+LaTeX2e document class and template for graduate theses that conform to
+the guidelines of the School of Graduate Studies at the University of
+Toronto (as of 2008).  [http://www.sgs.utoronto.ca/informationfor/+
+students/finup/producingthesis/formatting.htm]
+
+Copyright (c) 1998-2012 Francois Pitt <fpitt@cs.utoronto.ca>
+last updated at 09:43 (EDT) on Fri  1 Jun 2012
+
+This work may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, either version 1.3c of this license
+or (at your option) any later version.
+The latest version of this license is in
+    http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+The Current Maintainer of this work is
+Francois Pitt <fpitt@cs.utoronto.ca>.
+
+This work consists of the following files:
+  README:        this file
+  ut-thesis.cls: class file
+  ut-thesis.tex: template
+
+See the comments inside each file for further details.
+
+---------------
+Version History
+---------------
+
+v2.0: 2012/06/01 (Francois Pitt)
+- Rewritten to use standard packages: `setspace' to handle line spacing
+  and `geometry' for page layout.  Some options and macros have been
+  renamed from v1.8, hence the change of major version number -- this
+  version is _not_ fully backward-compatible because of these changes.
+- Renamed `oneandahalfspaced' option to `onehalfspaced' (for consistency
+  with `setspace' package).
+- Removed `singlespaced', `oneandahalfspaced', `doublespaced', and
+  `spacing' environments -- use environments from `setspace' package
+  instead.
+- Renamed `spacednotes' option to `standardspacednotes' and added
+  `singlespacednotes' option.
+- Added options `cleardoublepagestyleempty', `cleardoublepagestyleplain'
+  and `cleardoublepagestylestandard' to set the default style for
+  cleared pages, and new macros `\clearthesisdoublepage' and
+  `\clearstandarddoublepage'.
+- Changed default options: now 1 1/2-spaced and LaTeX default font size.
+- Renamed `utthesis' page style to `thesis'.
+- The abstract is no longer put on a right-side page by default.
+- Cleaned up the code and comments throughout.
+
+v1.8: 2000/02/20, 1999/12/10 (Francois Pitt)
+- Minor formatting changes to comments.
+- Fixed circular definition problem with \currenttextsize that caused
+  TeX to run out of input stack memory.
+
+v1.7: 1999/06/02, 1999/05/20, 1999/05/13 (Francois Pitt)
+- Minor change to the format of the date printed on every page with the
+  `draft' option.
+- Minor cosmetic change to the word "DRAFT" printed on the corners of
+  every page with the `draft' option.
+- Made `draft' mode doublespaced by default (it just makes more sense
+  for actual drafts; suggested by Eric Joanis).
+- Changed \currenttextsize from a "\newcommand" to a "\let".
+- Added "known bugs" above.
+
+v1.6: 1999/03/06 (Francois Pitt)
+- Minor change: replaced ``\ifx\empty#1\else...\fi'' with
+  ``\ifx\empty#1\empty\else...\fi'' (the former works only by accident
+  while the latter is logically correct).
+
+v1.5: 1999/02/17 (Francois Pitt)
+- Fixed missing page numbers and headers by removing redefinition of
+  \cleardoublepage (reported by Robert Bernecky 1999/02/04 and Nedialko
+  Nedialkov 1999/02/12).
+- Added \clearemptydoublepage and \clearplaindoublepage commands.
+- Removed redefinitions of \tableofcontents, \listoftables, and
+  \listoffigures because they already call \clearpage or
+  \cleardoublepage by default.
+- Removed "\setcounter{tocdepth}{2}" from the page layout section (moved
+  to `ut-thesis.tex' where it belongs).
+- Added \ignore command to comment out parts of a file.
+- Put version macros at the top of the file.
+- Changed order of revision comments.
+
+v1.4: 1998/11/05 (Francois Pitt)
+- Fixed `abstract' environment so that it is really put on a separate
+  page, and changed "\newpage\endgroup" at the end to
+  "\par\endgroup\newpage", which is more logical.
+- Changed `acknowledgements' environment so that it is *not* put on a
+  separate page, allowing users to add other text on that page (e.g.,
+  `dedication' described next).
+- Added `dedication' environment based on `acknowledgements'
+  (suggested by Robert Bernecky 98/11/04).
+- Changed page layout so that it is defined in terms of the physical
+  page size instead of being hard-coded for letter paper (8.5" x 11").
+
+v1.3: 1998/11/01 (Francois Pitt)
+- Fixed `thebibliography' so page headers are generated in the same
+  style as for the rest of the thesis.
+- Swapped \endgroup and \newpage in definition of `abstract' and
+  `acknowledgements' environments, to fix problem with adjusted line
+  spacing in `abstract'.
+- Renamed `\currentsize' to `\currenttextsize'.
+- Added \cleardoublepage at the end of preliminary sections, so that
+  page 1 of main text is on right-hand side.
+
+v1.2: 1998/10/20 (Francois Pitt)
+- Changed `spacenotes' option to `spacednotes' to have more consistently
+  named options.
+- Fixed spacing between main text and footnotes.
+- Fixed `singlespaced' environment, which didn't seem to work at all
+  (reported by Nedialko Nedialkov 98/10/12): Actually, created a
+  `newspacing' environment, which takes a parameter, and based
+  `singlespaced', `oneandahalfspaced', and `doublespaced' environments
+  on `newspacing'.
+
+v1.1: 1998/10/01 (Francois Pitt)
+- Fixed bug that caused footnotes to make following tables single-spaced
+  (reported by Philip Edmonds 98/09/30).
+- Made spacing of marginal notes and footnotes the same.
+- Added option to control line spacing of notes.
+- Added options to control the size of margins.
+- Changed names of temporary macros used in redefinitions to avoid
+  conflicts with existing names.
+
+v1.0: 1998/09/29 (Francois Pitt)
+- Initial version.
diff --git a/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.tex b/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.tex
index 63ca77dfc56..5c98e7362ca 100644
--- a/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.tex
+++ b/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.tex
@@ -1,141 +1,119 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  UT-THESIS.TEX
+%% ut-thesis.tex -- document template for graduate theses at UofT
 %%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory CTAN:/macros/latex/base/lppl.txt.
+%% Copyright (c) 1998-2012 Francois Pitt <fpitt@cs.utoronto.ca>
+%% last updated at 09:43 (EDT) on Fri  1 Jun 2012
 %%
-%%  Copyright (c) 1999 by Francois Pitt
-%%  Last Update: 1999 May 13
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  This file is distributed in the hope that it will be useful but
-%%  without any warranty (without even the implied warranty of
-%%  fitness for a particular purpose).  For a description of this
-%%  file's purpose, and instructions on its use, see below.
-%%  
-%%  Feel free to copy and redistribute this file, as long as this
-%%  copyright notice remains intact and this file is distributed
-%%  along with the companion file `ut-thesis.cls'.
-%%  
-%%  (Thanks to Robert Bernecky for his suggestions on improving the
-%%  usefulness and readability of this file.)
-%%  
-%%  Send all bugs, questions, comments, suggestions, etc. to the
-%%  author, at <fpitt@cs.utoronto.ca>.
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  Skeleton LaTeX2e file for the preparation of theses at UofT;
-%%  conforms to the School of Graduate Studies' guidelines of 07/97.
-%%  To be used in conjunction with class file `ut-thesis.cls', whose
-%%  features it illustrates.
-%%  
-%%  To comment out parts of a file, use the macro \ignore{...}
-%%  around the entire block of text you want to ignore.
-%%  
-%%  To explicitly set the pagestyle of any inserted blank page when
-%%  \cleardoublepage occurs, use one of \clearemptydoublepage or
-%%  \clearplaindoublepage instead.
-%%  
-%%  For single-spaced quotes or quotations, use the `longquote' and
-%%  `longquotation' environments.  For single-spaced, 1 1/2-spaced,
-%%  or double-spaced paragraphs, use one of the environments
-%%  `singlespaced', `oneandahalfspaced', or `doublespaced'.  More
-%%  generally, for paragraphs with a line spacing of `n', use
-%%  `\begin{newspacing}{n}...\end{newspacing}'.
-%%  
-%%  All other environments, commands, and options provided by the
-%%  `ut-thesis' class will be described below, at the point where
-%%  they should appear in the document.
-%%  
-%%  See the companion file `ut-thesis.cls' for more details.
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3c of this license
+%% or (at your option) any later version.
+%% The latest version of this license is in
+%%     http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is
+%% Francois Pitt <fpitt@cs.utoronto.ca>.
+%%
+%% This work consists of the files listed in the accompanying README.
+
+%% SUMMARY OF FEATURES:
+%%
+%% All environments, commands, and options provided by the `ut-thesis'
+%% class will be described below, at the point where they should appear
+%% in the document.  See the file `ut-thesis.cls' for more details.
+%%
+%% To explicitly set the pagestyle of any blank page inserted with
+%% \cleardoublepage, use one of \clearemptydoublepage,
+%% \clearplaindoublepage, \clearthesisdoublepage, or
+%% \clearstandarddoublepage (to use the style currently in effect).
+%%
+%% For single-spaced quotes or quotations, use the `longquote' and
+%% `longquotation' environments.
 
 
 %%%%%%%%%%%%         PREAMBLE         %%%%%%%%%%%%
 
-%% Default settings format a final copy (12pt font, single-sided,
-%% double-spaced, normal margins, single-spaced notes).  For a rough
-%% copy (10pt font, double-sided, double-spaced, normal margins, with
-%% the word "DRAFT" printed at each corner of every page), use the
-%% `draft' option.  The default line spacing can be changed with one
-%% of the following options: `singlespaced', `oneandahalfspaced', or
-%% `doublespaced'.  The notes are always single-spaced by default, but
-%% can be made to have the same spacing as the rest of the document by
-%% using the option `spacednotes'.  The size of the margins can be
-%% changed with one of the following options: `narrowmargins' (1 1/4"
-%% left, 3/4" others), `normalmargins' (1 1/4" left, 1" others),
-%% `widemargins' (1 1/4" all), `extrawidemargins' (1 1/2" all).  Any
-%% other standard option for the `report' document class can be used
-%% to override the default or draft settings.
-
-%% ***   Add any desired options.   ***
+%%  - Default settings format a final copy (single-sided, normal
+%%    margins, one-and-a-half-spaced with single-spaced notes).
+%%  - For a rough copy (double-sided, normal margins, double-spaced,
+%%    with the word "DRAFT" printed at each corner of every page), use
+%%    the `draft' option.
+%%  - The default global line spacing can be changed with one of the
+%%    options `singlespaced', `onehalfspaced', or `doublespaced'.
+%%  - Footnotes and marginal notes are all single-spaced by default, but
+%%    can be made to have the same spacing as the rest of the document
+%%    by using the option `standardspacednotes'.
+%%  - The size of the margins can be changed with one of the options:
+%%     . `narrowmargins' (1 1/4" left, 3/4" others),
+%%     . `normalmargins' (1 1/4" left, 1" others),
+%%     . `widemargins' (1 1/4" all),
+%%     . `extrawidemargins' (1 1/2" all).
+%%  - The pagestyle of "cleared" pages (empty pages inserted in
+%%    two-sided documents to put the next page on the right-hand side)
+%%    can be set with one of the options `cleardoublepagestyleempty',
+%%    `cleardoublepagestyleplain', or `cleardoublepagestylestandard'.
+%%  - Any other standard option for the `report' document class can be
+%%    used to override the default or draft settings (such as `10pt',
+%%    `11pt', `12pt'), and standard LaTeX packages can be used to
+%%    further customize the layout and/or formatting of the document.
+
+%% *** Add any desired options. ***
 \documentclass{ut-thesis}
 
-%% ***   Add \usepackage declarations here.   ***
-
-
-%% The line spacing of the document should be specified using one of
-%% the document options given above, but if you need a line spacing
-%% that is not provided by the options, you can override the default
-%% line spacing for the entire document with the command
-%%   `\linespacing{...}'.
-%% Note that in order to get the correct appearance, the argument to
-%% `\linespacing' must be equal to 1/3 + 2/3 times the desired line
-%% spacing (for example, single-spaced = \linespacing{1},
-%%                        1 1/2-spaced = \linespacing{1.33}, and
-%%                       double-spaced = \linespacing{1.66}).
-
-%% ***   Uncomment and fill in a value, if needed.    ***
-%% ***   REMEMBER: You should NOT need to use this.  Use one of   ***
-%% ***   the document class options mentionned above instead.     ***
-%\linespacing{}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%%                  ***   I M P O R T A N T   ***                   %%
-%%                                                                  %%
-%%  Fill in the following fields with the required information:     %%
-%%   - \degree{...}       name of the degree obtained               %%
-%%   - \department{...}   name of the graduate department           %%
-%%   - \gradyear{...}     year of graduation                        %%
-%%   - \author{...}       name of the author                        %%
-%%   - \title{...}        title of the thesis                       %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% ***   Change this example to appropriate values.   ***
+%% *** Add \usepackage declarations here. ***
+%% The standard packages `geometry' and `setspace' are already loaded by
+%% `ut-thesis' -- see their documentation for details of the features
+%% they provide.  In particular, you may use the \geometry command here
+%% to adjust the margins if none of the ut-thesis options are suitable
+%% (see the `geometry' package for details).  You may also use the
+%% \setstretch command to set the line spacing to a value other than
+%% single, one-and-a-half, or double spaced (see the `setspace' package
+%% for details).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                    %%
+%%                   ***   I M P O R T A N T   ***                    %%
+%%                                                                    %%
+%%  Fill in the following fields with the required information:       %%
+%%   - \degree{...}       name of the degree obtained                 %%
+%%   - \department{...}   name of the graduate department             %%
+%%   - \gradyear{...}     year of graduation                          %%
+%%   - \author{...}       name of the author                          %%
+%%   - \title{...}        title of the thesis                         %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% *** Change this example to appropriate values. ***
 \degree{Doctor of Philosophy}
 \department{Computer Science}
-\gradyear{1999}
+\gradyear{2012}
 \author{Fran\c{c}ois Pitt}
 \title{UT-Thesis Class File Example}
 
-%% ***   NOTE   ***
+%% *** NOTE ***
 %% Put here all other formatting commands that belong in the preamble.
+%% In particular, you should put all of your \newcommand's,
+%% \newenvironment's, \newtheorem's, etc. (in other words, all the
+%% global definitions that you will need throughout your thesis) in a
+%% separate file and use "\input{filename}" to input it here.
 
 
-%% For example, to list only down to subsections in table of contents
-%% (-1=part, 0=chapter, 1=section, 2=subsection, 3=subsubsection,
-%%  4=paragraph, 5=subparagraph, 6=subsubparagraph).
-%
+%% *** Adjust the following settings as desired. ***
+
+%% List only down to subsections in the table of contents;
+%% 0=chapter, 1=section, 2=subsection, 3=subsubsection, etc.
 \setcounter{tocdepth}{2}
 
+%% Make each page fill up the entire page.
+\flushbottom
+
 
 %%%%%%%%%%%%      MAIN  DOCUMENT      %%%%%%%%%%%%
 
 \begin{document}
 
-%% ***   NOTE   ***
-%% You should put all of your `\newcommand', `\newenvironment', and
-%% `\newtheorem's (in other words, all the global definitions that
-%% you will need throughout your thesis) in a separate file and use
-%% "\input{filename}" to input it here.
-
-
 %% This sets the page style and numbering for preliminary sections.
 \begin{preliminary}
 
@@ -143,76 +121,83 @@
 \maketitle
 
 %% There should be NOTHING between the title page and abstract.
+%% However, if your document is two-sided and you want the abstract
+%% _not_ to appear on the back of the title page, then uncomment the
+%% following line.
+%\cleardoublepage
 
 %% This generates the abstract page, with the line spacing adjusted
 %% according to SGS guidelines.
 \begin{abstract}
-%% ***   Put your Abstract here.   ***
+%% *** Put your Abstract here. ***
 %% (At most 150 words for M.Sc. or 350 words for Ph.D.)
 \end{abstract}
 
 %% Anything placed between the abstract and table of contents will
-%% appear on a separate page since the abstract ends with \newpage
-%% and the table of contents starts with \clearpage.
+%% appear on a separate page since the abstract ends with \newpage and
+%% the table of contents starts with \clearpage.  Use \cleardoublepage
+%% for anything that you want to appear on a right-hand page.
 
-%% This generates a "dedication" section, if needed.
-%% (uncomment to have it appear in the document)
+%% This generates a "dedication" section, if needed
+%% (uncomment to have it appear in the document).
 %\begin{dedication}
-%% ***   Put your Dedication here.   ***
+%% *** Put your Dedication here. ***
 %\end{dedication}
 
 %% The `dedication' and `acknowledgements' sections do not create new
 %% pages so if you want the two sections to appear on separate pages,
 %% you should put an explicit \newpage between them.
 
-%% This generates an "acknowledgements" section, if needed.
-%% (uncomment to have it appear in the document)
+%% This generates an "acknowledgements" section, if needed
+%% (uncomment to have it appear in the document).
 %\begin{acknowledgements}
-%% ***   Put your Acknowledgements here.   ***
+%% *** Put your Acknowledgements here. ***
 %\end{acknowledgements}
 
 %% This generates the Table of Contents (on a separate page).
 \tableofcontents
 
-%% This generates the List of Tables (on a separate page), if needed.
-%% (uncomment to have it appear in the document)
+%% This generates the List of Tables (on a separate page), if needed
+%% (uncomment to have it appear in the document).
 %\listoftables
 
-%% This generates the List of Figures (on a separate page), if needed.
-%% (uncomment to have it appear in the document)
+%% This generates the List of Figures (on a separate page), if needed
+%% (uncomment to have it appear in the document).
 %\listoffigures
 
+%% You can add commands here to generate any other material that belongs
+%% in the head matter (for example, List of Plates, Index of Symbols, or
+%% List of Appendices).
+
 %% End of the preliminary sections: reset page style and numbering.
 \end{preliminary}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  Put your Chapters here; the easiest way to do this is to keep   %%
-%%  each chapter in a separate file and `\include' all the files    %%
-%%  right here.  Note that each chapter file should start with the  %%
-%%  line "\chapter{ChapterName}".  Note that using `\include'       %%
-%%  instead of `\input' makes each chapter start on a new page.     %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% ***   Include chapter files here.   ***
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%  Put your Chapters here; the easiest way to do this is to keep     %%
+%%  each chapter in a separate file and `\include' all the files.     %%
+%%  Each chapter file should start with "\chapter{ChapterName}".      %%
+%%  Note that using `\include' instead of `\input' will make each     %%
+%%  chapter start on a new page, and allow you to format only parts   %%
+%%  of your thesis at a time by using `\includeonly'.                 %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% *** Include chapter files here. ***
 
 
 %% This adds a line for the Bibliography in the Table of Contents.
 \addcontentsline{toc}{chapter}{Bibliography}
-%% ***   Set the bibliography style.   ***
-%% (change according to your preference)
+%% *** Set the bibliography style. ***
+%% (change according to your preference/requirements)
 \bibliographystyle{plain}
-%% ***   Set the bibliography file.   ***
-%% ("thesis.bib" by default; change if needed)
+%% *** Set the bibliography file. ***
+%% ("thesis.bib" by default; change as needed)
 \bibliography{thesis}
 
-%% ***   NOTE   ***
+%% *** NOTE ***
 %% If you don't use bibliography files, comment out the previous line
 %% and use \begin{thebibliography}...\end{thebibliography}.  (In that
-%% case, you should probably put the bibliography in a separate file
-%% and `\include' or `\input' it here).
+%% case, you should probably put the bibliography in a separate file and
+%% `\include' or `\input' it here).
 
 \end{document}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  End of UT-THESIS.TEX
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls
index f4e44689a10..8813985fee3 100644
--- a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls
+++ b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls
@@ -1,542 +1,313 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  UT-THESIS.CLS (v1.8)
+%% ut-thesis.cls -- document class for graduate theses at UofT
 %%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory CTAN:/macros/latex/base/lppl.txt.
+%% Copyright (c) 1998-2012 Francois Pitt <fpitt@cs.utoronto.ca>
+%% last updated at 09:43 (EDT) on Fri  1 Jun 2012
 %%
-%%  Copyright (c) 1999 by Francois Pitt
-%%  Last Update: 1999 December 10
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\newcommand{\utthesisversion}{v1.8} % current version number
-\newcommand{\utthesisupdated}{1999/12/10} % date of last change(s)
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  This file is distributed in the hope that it will be useful but
-%%  without any warranty (without even the implied warranty of
-%%  fitness for a particular purpose).  For a description of this
-%%  file's purpose, and instructions on its use, see below.
-%%  
-%%  Feel free to copy and redistribute this file, as long as this
-%%  copyright notice remains intact.  You may also modify the file
-%%  to suit your particular needs, as long as you indicate your
-%%  changes below (and inform the original author of your changes:
-%%  he's always curious to know what people think of his work).
-%%  
-%%  Send all bugs, questions, comments, suggestions, etc. to the
-%%  author, at <fpitt@cs.utoronto.ca>.
-%%  
-%%  KNOWN BUGS: (reported by Robert Bernecky)
-%%  
-%%   - [On missing page headers for float pages.]
-%%     `teTex' under Linux fails in precisely the same way as does
-%%     `MikTeX', so there's something clearly wrong somewhere, but
-%%     I don't know where.  It only fails on odd-numbered pages (if
-%%     you remove enough text so that the page floats back to an
-%%     even-numbered page, the page header is correct)!
-%%   - [On `dedication' and `acknowledgements' causing an error when
-%%      they both appear on the same page.]
-%%     `teTeX' and `MikTeX' both fail the same way on this one, with
-%%     "LaTeX error: Something's wrong--perhaps a missing \item".
-%%     Adding a \newpage between the two environments "fixes" the
-%%     problem.  Unsure what causes this, but it could be a bug
-%%     common to all x86 platforms...
-%%  
-%%  REVISION HISTORY:
-%%  
-%%  v1.8: 1999/12/10 (Francois Pitt)
-%%      - Fixed circular definition problem with \currenttextsize
-%%        that caused TeX to run out of input stack memory.
-%%  v1.7: 1999/06/02,1999/05/20,1999/05/13 (Francois Pitt)
-%%      - Minor change to the format of the date printed on every
-%%        page with the `draft' option.
-%%      - Minor cosmetic change to the word "DRAFT" printed on the
-%%        corners of every page with the `draft' option.
-%%      - Made `draft' mode doublespaced by default (it just makes
-%%        more sense for actual drafts; suggested by Eric Joanis).
-%%      - Changed \currenttextsize from a "\newcommand" to a "\let".
-%%      - Added "known bugs" above.
-%%  v1.6: 1999/03/06 (Francois Pitt)
-%%      - Minor change: replaced ``\ifx\empty#1\else...\fi'' with
-%%        ``\ifx\empty#1\empty\else...\fi'' (the former works only
-%%        by accident while the latter is logically correct).
-%%  v1.5: 1999/02/17 (Francois Pitt)
-%%      - Fixed missing page numbers and headers by removing
-%%        redefinition of \cleardoublepage (reported by Robert
-%%        Bernecky 1999/02/04 and Nedialko Nedialkov 1999/02/12).
-%%      - Added \clearemptydoublepage and \clearplaindoublepage
-%%        commands.
-%%      - Removed redefinitions of \tableofcontents, \listoftables,
-%%        and \listoffigures because they already call \clearpage
-%%        or \cleardoublepage by default.
-%%      - Removed "\setcounter{tocdepth}{2}" from the page layout
-%%        section (moved to `ut-thesis.tex' where it belongs).
-%%      - Added \ignore command to comment out parts of a file.
-%%      - Put version macros at the top of the file.
-%%      - Changed order of revision comments.
-%%  v1.4: 1998/11/05 (Francois Pitt)
-%%      - Fixed `abstract' environment so that it is really put on a
-%%        separate page, and changed "\newpage\endgroup" at the end
-%%        to "\par\endgroup\newpage", which is more logical.
-%%      - Changed `acknowledgements' environment so that it is *not*
-%%        put on a separate page, allowing users to add other text
-%%        on that page (e.g., `dedication' described next).
-%%      - Added `dedication' environment based on `acknowledgements'
-%%        (suggested by Robert Bernecky 98/11/04).
-%%      - Changed page layout so that it is defined in terms of the
-%%        physical page size instead of being hard-coded for letter
-%%        paper (8.5" x 11").
-%%  v1.3: 1998/11/01 (Francois Pitt)
-%%      - Fixed `thebibliography' so page headers are generated in
-%%        the same style as for the rest of the thesis.
-%%      - Swapped \endgroup and \newpage in definition of `abstract'
-%%        and `acknowledgements' environments, to fix problem with
-%%        adjusted line spacing in `abstract'.
-%%      - Renamed `\currentsize' to `\currenttextsize'.
-%%      - Added \cleardoublepage at the end of preliminary sections,
-%%        so that page 1 of main text is on right-hand side.
-%%  v1.2: 1998/10/20 (Francois Pitt)
-%%      - Changed `spacenotes' option to `spacednotes' to have more
-%%        consistently named options.
-%%      - Fixed spacing between main text and footnotes.
-%%      - Fixed `singlespaced' environment, which didn't seem to
-%%        work at all (reported by Nedialko Nedialkov 98/10/12):
-%%        Actually, created a `newspacing' environment, which takes
-%%        a parameter, and based `singlespaced', `oneandahalfspaced',
-%%        and `doublespaced' environments on `newspacing'.
-%%  v1.1: 1998/10/01 (Francois Pitt)
-%%      - Fixed bug that caused footnotes to make following tables
-%%        single-spaced (reported by Philip Edmonds 98/09/30).
-%%      - Made spacing of marginal notes and footnotes the same.
-%%      - Added option to control line spacing of notes.
-%%      - Added options to control the size of margins.
-%%      - Changed names of temporary macros used in redefinitions
-%%        to avoid conflicts with existing names.
-%%  v1.0: 1998/09/29 (Francois Pitt)
-%%      - Initial version.
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
-%%  LaTeX2e class file for formatting documents according to the
-%%  School of Graduate Studies' guidelines for theses at the
-%%  University of Toronto (conforms to SGS guidelines of 07/97). 
-%%  
-%%  USAGE:  \documentclass{ut-thesis}
-%%          \documentclass[...options...]{ut-thesis}
-%%  
-%%  The default settings produce a final copy, ready for submission
-%%  to SGS (12pt font, single-sided, double-spaced, normal margins,
-%%  with single-spaced notes).
-%%  
-%%  OPTIONS:
-%%  
-%%   - Any standard option for the LaTeX2e `report' class, including
-%%     `10pt', `11pt', `12pt', `oneside', `twoside', etc.
-%%  
-%%   - `singlespaced', `oneandahalfspaced', or `doublespaced':  Set
-%%     the entire document's default line spacing, except for notes,
-%%     which are single-spaced by default.
-%%  
-%%   - `spacednotes':  Let the line spacing of notes be determined
-%%     by the line spacing of the main document, instead of being
-%%     forced single-spaced.
-%%  
-%%   - `narrowmargins', `normalmargins', `widemargins', or
-%%     `extrawidemargins':  Set the size of the margins, as follows:
-%%      . `narrow': 1 1/4" on the left, 3/4" on all other sides,
-%%        headers & footers 1/4" from body;
-%%      . `normal': 1 1/4" on the left, 1" on all other sides,
-%%        headers & footers 1/2" from body;
-%%      . `wide': 1 1/4" on all sides, headers & footers 3/4" from
-%%        body;
-%%      . `extrawide': 1 1/2" on all sides, headers & footers 3/4"
-%%        from body.
-%%     (If you have more than just a few marginal notes, it is
-%%     recommended that you use `wide' or `extrawide' margins.)
-%%  
-%%   - `draft':  Produce a draft copy (10pt font, double-sided,
-%%     double-spaced, normal margins, with the word "DRAFT" printed
-%%     at all four corners of every page).
-%%  
-%%  Note that these options can be used to override the default or
-%%  draft document settings, so that it is possible, for example,
-%%  to create a double-sided final copy, or a 1 1/2-spaced draft
-%%  copy with wide margins, etc.  Also note that when producing
-%%  double-sided documents, new chapters and preliminary sections
-%%  will always start on a right-hand page under the default
-%%  settings (inserting a blank page if needed), but not if the
-%%  `draft' option was used.  (This can be overriden by using the
-%%  `openany' or `openright' options.  To achieve this effect for
-%%  individual sections or chapters, use the \cleardoublepage
-%%  command.)  Note that the blank page inserted in these cases will
-%%  still contain the header and page number that is present on all
-%%  pages.  For `empty' or `plain' pages, explicitly use one of the
-%%  commands \clearemptydoublepage or \clearplaindoublepage.
-%%  
-%%  NEW ENVIRONMENTS and COMMANDS:
-%%  
-%%   * \degree{...}:  (preamble only; REQUIRED)
-%%     Specify the name of the degree (e.g., "Doctor of Philosophy").
-%%  
-%%   * \department{...}:  (preamble only; REQUIRED)
-%%     Specify the name of the graduate department.
-%%  
-%%   * \gradyear{...}:  (preamble only; REQUIRED)
-%%     Specify the year of graduation (defaults to current year).
-%%  
-%%   * \author{...}:  (preamble only; REQUIRED)
-%%     Specify the name of the author.
-%%  
-%%   * \title{...}:  (preamble only; REQUIRED)
-%%     Specify the title of the thesis.
-%%  
-%%   - \linespacing{...}:  (preamble only)
-%%     Set the interline spacing directly, overriding document
-%%     defaults and options; note that in order to get the correct
-%%     appearance, the argument to \linespacing must be equal to
-%%     1/3 + 2/3 times the desired line spacing (for example,
-%%        single-spaced = \linespacing{1},
-%%         1 1/2-spaced = \linespacing{1.33}, and
-%%        double-spaced = \linespacing{1.66}).
-%%  
-%%   - \ignore{...}:
-%%     Ignore the part of the file between { and } (can include
-%%     paragraph breaks); useful for commenting out large blocks.
-%%  
-%%   - \clearemptydoublepage, \clearplaindoublepage:
-%%     Same as \cleardoublepage except that it sets the pagestyle of
-%%     any inserted blank page to `empty' or `plain', respectively.
-%%  
-%%   - \begin{preliminary}...\end{preliminary}:
-%%     Delimit head matter (title page, abstract, table of contents,
-%%     lists of tables and figures, etc.): set the page style and
-%%     numbering for the preliminary sections and reset them for the
-%%     main document.
-%%  
-%%      - \maketitle:
-%%        Generate the title page from the information supplied
-%%        in the preamble.
-%%  
-%%      - \begin{abstract}...\end{abstract}:
-%%        Generate the abstract page.  (According to SGS guidelines,
-%%        this must immediately follow the title page.)
-%%  
-%%      - \begin{dedication}...\end{dedication}:
-%%        Generate a dedication section, if needed.
-%%  
-%%      - \begin{acknowledgements}...\end{acknowledgements}:
-%%        Generate an acknowledgements section, if needed.
-%%  
-%%     Note that neither the `dedication' nor the `acknowledgements'
-%%     are put on a separate page by default (use \newpage to do
-%%     this explicitly).  Also note that the table of contents, list
-%%     of tables, and list of figures can be generated using the
-%%     usual LaTeX commands.
-%%  
-%%   - \begin{longquote}...\end{longquote}:
-%%     Single-spaced version of the `quote' environment.
-%%  
-%%   - \begin{longquotation}...\end{longquotation}:
-%%     Single-spaced version of the `quotation' environment.
-%%  
-%%   - \begin{singlespaced}...\end{singlespaced}:
-%%     Format single-spaced paragraphs.
-%%  
-%%   - \begin{oneandahalfspaced}...\end{oneandahalfspaced}:
-%%     Format 1 1/2-spaced paragraphs.
-%%  
-%%   - \begin{doublespaced}...\end{doublespaced}:
-%%     Format double-spaced paragraphs.
-%%  
-%%   - \begin{newspacing}{<n>}...\end{newspacing}:
-%%     Format paragraphs with an interline spacing of `n'.
-%%  
-%%  (Note that the last four environments can be used to change the
-%%  default line spacing of any enclosed text, including figures,
-%%  tables, abstract or acknowledgement pages, table of contents,
-%%  etc.)
-%%  
-%%  The companion file `ut-thesis.tex' contains a skeleton
-%%  illustrating the use of this class.
-%%  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This work may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3c of this license
+%% or (at your option) any later version.
+%% The latest version of this license is in
+%%     http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is
+%% Francois Pitt <fpitt@cs.utoronto.ca>.
+%%
+%% This work consists of the files listed in the accompanying README.
+
+%% USAGE:  \documentclass{ut-thesis}
+%%         \documentclass[...options...]{ut-thesis}
+%%
+%% The default settings produce a final copy, ready for submission to
+%% the School of Graduate Studies (SGS) at the University of Toronto:
+%% single-sided, "normal" margins (see below), one-and-a-half spaced
+%% with single-spaced notes.
+%%
+%% OPTIONS:
+%%
+%%  - Any standard option for the LaTeX2e `report' class, including
+%%    `10pt', `11pt', `12pt', `oneside', `twoside', etc.
+%%
+%%  - `narrowmargins', `normalmargins', `widemargins', or
+%%    `extrawidemargins':  Set the size of the margins, as follows:
+%%     . `narrow': 1 1/4" on the left, 3/4" on all other sides,
+%%       headers & footers 3/8" from body
+%%       (these are the minimum values required by SGS);
+%%     . `normal': 1 1/4" on the left, 1" on all other sides,
+%%       headers & footers 1/2" from body;
+%%     . `wide': 1 1/4" on all sides,
+%%       headers & footers 5/8" from body;
+%%     . `extrawide': 1 1/2" on all sides,
+%%       headers & footers 3/4" from body.
+%%    If you have more than just a few marginal notes, it is recommended
+%%    that you use at least `wide' margins.  For other settings, use the
+%%    \geometry command (see the template for details).
+%%
+%%  - `singlespaced', `oneandahalfspaced', or `doublespaced':  Set the
+%%    entire document's default line spacing (except for notes, which
+%%    are single-spaced by default).  For other settings, use the
+%%    \setstretch command (see the template for details).
+%%
+%%  - `singlespacednotes' or `standardspacednotes':  Set line spacing
+%%    for footnotes and marginal notes: either single-spaced or the same
+%%    as the rest of the document.
+%%
+%%  - `cleardoublepagestyleempty', `cleardoublepagestyleplain', or
+%%    `cleardoublepagestylestandard':  Set the page style for all
+%%    "cleared" pages (empty pages inserted in two-sided documents to
+%%    put the next page on the right-hand side) to either `empty',
+%%    `plain', or whatever style is in effect when the page is cleared
+%%    (the default).
+%%
+%%  - `draft':  Produce a draft copy (double-sided, double-spaced,
+%%    normal margins, with the word "DRAFT" printed at all four corners
+%%    of every page).
+%%
+%% Note that these options can be used to override the default or draft
+%% document settings, so that it is possible, for example, to create a
+%% double-sided final copy, or a 1 1/2-spaced draft copy with wide
+%% margins, etc.  You may use standard LaTeX packages to tailor the
+%% layout and formatting in other ways.
+%% Also note that when producing double-sided documents while _not_ in
+%% draft mode, new chapters and preliminary sections will always start
+%% on a right-hand page under the default settings (inserting a blank
+%% page if needed).  This can be overridden by using the `openany' or
+%% `openright' options.  To achieve this effect for individual sections
+%% or chapters, use \cleardoublepage -- or one of the more specific
+%% \clearemptydoublepage, \clearplaindoublepage, \clearthesisdoublepage,
+%% or \clearstandarddoublepage (see below for details).
+%%
+%% NEW ENVIRONMENTS and COMMANDS:
+%%
+%%  * \degree{...}:  (preamble only; REQUIRED)
+%%    Specify the name of the degree (e.g., "Doctor of Philosophy").
+%%
+%%  * \department{...}:  (preamble only; REQUIRED)
+%%    Specify the name of the graduate department.
+%%
+%%  * \gradyear{...}:  (preamble only; REQUIRED)
+%%    Specify the year of graduation (defaults to current year).
+%%
+%%  * \author{...}:  (preamble only; REQUIRED)
+%%    Specify the name of the author.
+%%
+%%  * \title{...}:  (preamble only; REQUIRED)
+%%    Specify the title of the thesis.
+%%
+%%  - \begin{preliminary}...\end{preliminary}:
+%%    Delimit head matter (title page, abstract, table of contents,
+%%    lists of tables and figures, etc.): set the page style and
+%%    numbering for the preliminary sections and reset them for the main
+%%    document.
+%%
+%%     - \maketitle:
+%%       Generate the title page from the information supplied in the
+%%       preamble.
+%%
+%%     - \begin{abstract}...\end{abstract}:
+%%       Generate the abstract page, double-sided.  (According to SGS
+%%       guidelines, this must immediately follow the title page.)
+%%
+%%     - \begin{dedication}...\end{dedication}:
+%%       Generate a dedication section, if needed.
+%%
+%%     - \begin{acknowledgements}...\end{acknowledgements}:
+%%       Generate an acknowledgements section, if needed.
+%%
+%%    Note that neither the `dedication' nor the `acknowledgements' are
+%%    put on a separate page by default (use \newpage to do this
+%%    explicitly).  Also note that the table of contents, list of
+%%    tables, and list of figures can be generated using the usual LaTeX
+%%    commands.
+%%
+%%  - \begin{longquote}...\end{longquote}:
+%%    Single-spaced version of the `quote' environment.
+%%
+%%  - \begin{longquotation}...\end{longquotation}:
+%%    Single-spaced version of the `quotation' environment.
+%%
+%%  - \clearemptydoublepage, \clearplaindoublepage,
+%%    \clearthesisdoublepage:
+%%    Same as \cleardoublepage except that cleared pages have style
+%%    `empty', `plain', or `thesis' respectively.
+%%
+%%  - \clearstandarddoublepage:
+%%    Same as the original \cleardoublepage (cleared pages use the style
+%%    currently in effect) -- used to override the effects of options
+%%    `cleardoublepagestyleempty' or `cleardoublepagestyleplain'.
+%%
+%% The companion file `ut-thesis.tex' contains a skeleton illustrating
+%% the use of this class.
 
 
 %%%%%%%%%%%%        IDENTIFICATION        %%%%%%%%%%%%
 
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ut-thesis}%
- [\utthesisupdated\space\utthesisversion\space LaTeX2e document class]
+\newcommand*{\utthesisversion}{v2.0} % current version number
+\newcommand*{\utthesisupdated}{2012/06/01} % date of last change(s)
 
+\NeedsTeXFormat{LaTeX2e}[1995/12/01] % robust macros with * form
+\ProvidesClass{ut-thesis}[\utthesisupdated\space\utthesisversion\space
+   graduate theses at the University of Toronto]
 
-%%%%%%%%%%%%         INITIAL CODE         %%%%%%%%%%%%
 
-%% To comment out parts of a file.
-%% >> Added in v1.5 on 1999/02/17 by Francois Pitt. << %%
-%
-\newcommand{\ignore}[1]{}
+%%%%%%%%%%%%         INITIAL CODE         %%%%%%%%%%%%
 
 %% Switch for testing draft mode (toggled by `draft' option).
-%
 \newif\if@draft
-\@draftfalse % initially false by default
+\@draftfalse
 
 %% Switch for testing current page style.
-%% >> Added in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%
-\newif\if@thesispage
- % no default value (set by \pagestyle)
-
-%% Switch for testing line spacing of notes.
-%% >> Added in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%
-\newif\if@singlespacednotes
-\@singlespacednotestrue % initially true by default
-
-%% Macro for testing the size of margins.
-%% >> Added in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%
-\newcommand{\@marginsize}{}
-
-%% Because of the draft option, and to allow users to override
-%% defaults, we don't want to be passing conflicting options back to
-%% the report class, so we define our own temporary toggles holding
-%% the most recent setting for each of four basic options: point size,
-%% number of page sides, whether new chapters open on right-hand pages
-%% or on any page, and line spacing.  These toggles will be set from
-%% the corresponding options below.
-%
-\newcommand{\@thesisptsz}{}
-\newcommand{\@thesisside}{}
-\newcommand{\@thesisopen}{}
-\newcommand{\@thesislnsp}{}
+\newif\if@thesispagestyle
+\@thesispagestyletrue
+
+%% Save original definitions of footnote and marginal note macros and
+%% lengths, to be able to reset them below as needed (when changing
+%% between single-spaced and standard-spaced notes).
+\let\@thesis@footnotetext\@footnotetext
+\let\@thesis@mpfootnotetext\@mpfootnotetext
+\let\@thesis@marginparreset\@marginparreset
+\newlength{\@thesisfootnotesep}
+\newlength{\@thesismarginparpush}
+\AtBeginDocument
+  {\setlength\@thesisfootnotesep{\footnotesep}
+   \setlength\@thesismarginparpush{\marginparpush}}
+
+%% Save original definition of \cleardoublepage.
+\let\clearstandarddoublepage\cleardoublepage
+
+%% The \singlespacing macro from `setspace' includes some vertical space
+%% (to make it easier to change line spacing within the document).
+%% Unfortunately, this has undesirable side-effects within macros, so we
+%% define our own replacement here for use within the class.
+\newcommand*{\singlespacingnoskip}{\setstretch{\setspace@singlespace}}
 
 
 %%%%%%%%%%%%      OPTION DECLARATION      %%%%%%%%%%%%
 
 %% `draft' option: change default document settings.
-%% >> Changed in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%% >> Changed in v1.7 on 1999/05/20 by Francois Pitt. << %%
-%
 \DeclareOption{draft}{\@drafttrue
-   \typeout{UT-Thesis Class Option: `draft'}
-   \ExecuteOptions{10pt,twoside,openany,doublespaced,normalmargins}
-   \PassOptionsToClass{draft}{report}
-   %% Macros for printing "DRAFT" at the corners of a page.
-   \newcommand{\tlDRAFT}%
+   \newcommand*{\tlDRAFT}%
      {\raisebox{ 3ex}[0pt][0pt]{\llap{\sffamily\scriptsize DRAFT\ \ }}}
-   \newcommand{\trDRAFT}%
+   \newcommand*{\trDRAFT}%
      {\raisebox{ 3ex}[0pt][0pt]{\rlap{\sffamily\scriptsize \ \ DRAFT}}}
-   \newcommand{\blDRAFT}%
+   \newcommand*{\blDRAFT}%
      {\raisebox{-3ex}[0pt][0pt]{\llap{\sffamily\scriptsize DRAFT\ \ }}}
-   \newcommand{\brDRAFT}%
+   \newcommand*{\brDRAFT}%
      {\raisebox{-3ex}[0pt][0pt]{\rlap{\sffamily\scriptsize \ \ DRAFT}}}
-}%DeclareOption{draft}
-
-%% `spacednotes' option: make notes share the line spacing of the rest
-%% of the document.
-%% >> Added in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%% >> Changed in v1.2 on 1998/10/20 by Francois Pitt. << %%
-%
-\DeclareOption{spacednotes}{\@singlespacednotesfalse}
-
-%% Margin options: change the size of margins.
-%% >> Added in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%
-\DeclareOption{narrowmargins}{\renewcommand{\@marginsize}{0}}
-\DeclareOption{normalmargins}{\renewcommand{\@marginsize}{1}}
-\DeclareOption{widemargins}{\renewcommand{\@marginsize}{2}}
-\DeclareOption{extrawidemargins}{\renewcommand{\@marginsize}{3}}
-
-%% Point Size options: change current setting.
-%
-\DeclareOption{10pt}{\renewcommand{\@thesisptsz}{10pt}}
-\DeclareOption{11pt}{\renewcommand{\@thesisptsz}{11pt}}
-\DeclareOption{12pt}{\renewcommand{\@thesisptsz}{12pt}}
-
-%% Number of Page Sides options: change current setting.
-%
-\DeclareOption{twoside}{\renewcommand{\@thesisside}{twoside}}
-\DeclareOption{oneside}{\renewcommand{\@thesisside}{oneside}}
-
-%% New Chapter Openings options: change current setting.
-%
-\DeclareOption{openany}{\renewcommand{\@thesisopen}{openany}}
-\DeclareOption{openright}{\renewcommand{\@thesisopen}{openright}}
-
-%% Line Spacing options: change current setting.
-%
-\DeclareOption{singlespaced}{\renewcommand{\@thesislnsp}{1}}
-\DeclareOption{oneandahalfspaced}{\renewcommand{\@thesislnsp}{1.33}}
-\DeclareOption{doublespaced}{\renewcommand{\@thesislnsp}{1.66}}
+   \ExecuteOptions{doublespaced}
+   \PassOptionsToClass{draft,twoside,openany}{report}}
+
+%% Margin options.
+\DeclareOption{narrowmargins}{\AtEndOfClass % 1 1/4" left, 3/4" others
+  {\geometry{margin=.75in,left=1.25in,headsep=.375in-\headheight,
+             footskip=.375in,marginparwidth=.5in,marginparsep=.125in}}}
+\DeclareOption{normalmargins}{\AtEndOfClass % 1 1/4" left, 1" others
+  {\geometry{margin=1in,left=1.25in,headsep=.5in-\headheight,
+             footskip=.5in,marginparwidth=.75in,marginparsep=.125in}}}
+\DeclareOption{widemargins}{\AtEndOfClass % 1 1/4" all around
+  {\geometry{margin=1.25in,headsep=.625in-\headheight,
+             footskip=.625in,marginparwidth=.75in,marginparsep=.25in}}}
+\DeclareOption{extrawidemargins}{\AtEndOfClass % 1 1/2" all around
+  {\geometry{margin=1.5in,headsep=.75in-\headheight,
+             footskip=.75in,marginparwidth=1in,marginparsep=.25in}}}
+
+%% Line Spacing options.
+\DeclareOption{singlespaced}{\AtEndOfClass{\singlespacingnoskip}}
+\DeclareOption{onehalfspaced}{\AtEndOfClass{\onehalfspacing}}
+\DeclareOption{doublespaced}{\AtEndOfClass{\doublespacing}}
+
+%% Line spacing for notes.
+\DeclareOption{singlespacednotes}{\AtBeginDocument
+  {\setlength\footnotesep{\@thesisfootnotesep}
+   \setlength\marginparpush{\@thesismarginparpush}
+   \renewcommand{\@footnotetext}[1]%
+     {\@thesis@footnotetext{#1\singlespacingnoskip}}
+   \renewcommand{\@mpfootnotetext}[1]%
+     {\@thesis@mpfootnotetext{#1\singlespacingnoskip}}
+   \renewcommand*{\@marginparreset}%
+     {\@thesis@marginparreset\singlespacingnoskip}}}
+\DeclareOption{standardspacednotes}{\AtBeginDocument
+  {\setlength\footnotesep{\baselineskip-\@thesisfootnotesep}
+   \setlength\marginparpush{\baselineskip-\@thesismarginparpush}
+   \let\@footnotetext\@thesis@footnotetext
+   \let\@mpfootnotetext\@thesis@mpfootnotetext
+   \let\@marginparreset\@thesis@marginparreset}}
+
+%% Page styles for cleared pages.
+\DeclareOption{cleardoublepagestyleempty}
+  {\AtEndOfClass{\let\cleardoublepage\clearemptydoublepage}}
+\DeclareOption{cleardoublepagestyleplain}
+  {\AtEndOfClass{\let\cleardoublepage\clearplaindoublepage}}
+\DeclareOption{cleardoublepagestylestandard}
+  {\AtEndOfClass{\let\cleardoublepage\clearstandarddoublepage}}
 
 %% All other options are passed to the base class directly.
-%
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
 
 
 %%%%%%%%%%%%       OPTION EXECUTION       %%%%%%%%%%%%
 
-%% Default settings.
-%% >> Changed in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%
-\ExecuteOptions{12pt,oneside,openright,doublespaced,normalmargins}
-%
+%% Default settings: standard options followed by ut-thesis options.
+\ExecuteOptions{letterpaper,oneside,openright}
+\ExecuteOptions{normalmargins,onehalfspaced,singlespacednotes}
+
 %% Process options.
-%
 \ProcessOptions
 
 
 %%%%%%%%%%%%       PACKAGE  LOADING       %%%%%%%%%%%%
 
 %% Load base class using current setting for basic options.
-%
-\LoadClass[\@thesisptsz,\@thesisside,\@thesisopen]{report}
+\LoadClass{report}
+
+%% To set/change page layout.
+\RequirePackage{calc}
+\RequirePackage{geometry}
+
+%% To set/change line spacing.
+\RequirePackage{setspace}
 
 
 %%%%%%%%%%%%          MAIN  CODE          %%%%%%%%%%%%
 
 %%%%%%    Parameters
-%
-%% The following five commands set the respective field values so we
-%% can generate the title page and abstract page automatically.
-%% >> Changed in v1.6 on 1999/03/06 by Francois Pitt. << %%
-%
-\newcommand{\degree}[1]%
+
+%% The following five commands set the respective field values so we can
+%% generate the title page and abstract page automatically.
+\newcommand*{\degree}[1]%
   {\ifx\empty#1\empty\else\gdef\@degree{#1}\fi}
-\newcommand{\department}[1]%
+\newcommand*{\department}[1]%
   {\ifx\empty#1\empty\else\gdef\@department{#1}\fi}
-\newcommand{\gradyear}[1]%
+\newcommand*{\gradyear}[1]%
   {\ifx\empty#1\empty\else\gdef\@gradyear{#1}\fi}
-\renewcommand{\author}[1]%
+\renewcommand*{\author}[1]%
   {\ifx\empty#1\empty\else\gdef\@author{#1}\fi}
-\renewcommand{\title}[1]%
+\renewcommand*{\title}[1]%
   {\ifx\empty#1\empty\else\gdef\@title{#1}\fi}
 
-%%%%%%    Line Spacing
-%
-%% \linespacing is used to define the line spacing.  If the argument
-%% is less than 1.33 (for 1.5-spaced) a warning message is displayed
-%% when not in draft mode.
-%% >> Changed in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%
-\newcommand{\linespacing}[1]%
-  {\newlinestretch{#1}\if@draft\else\ifdim #1pt < 1.33pt\typeout
-   {UT-Thesis Class Warning: line spacing less than 1 1/2}\fi\fi}
-%
-%% `longquote' and `longquotation' produce single-spaced quotes, while
-%% `newspacing' encloses paragraphs with a different line spacing,
-%% such as `singlespaced', `oneandahalfspaced', or `doublespaced'.
-%
-\newenvironment{longquote}%
-  {\begin{quote}\newlinestretch{1}}{\end{quote}}
-\newenvironment{longquotation}%
-  {\begin{quotation}\newlinestretch{1}}{\end{quotation}}
-%% >> Changed in v1.2 on 1998/10/20 by Francois Pitt. << %%
-\newenvironment{singlespaced}%
-  {\begin{newspacing}{1}}{\end{newspacing}}
-%% >> Added in v1.2 on 1998/10/20 by Francois Pitt. << %%
-\newenvironment{oneandahalfspaced}%
-  {\begin{newspacing}{1.33}}{\end{newspacing}}
-\newenvironment{doublespaced}%
-  {\begin{newspacing}{1.66}}{\end{newspacing}}
-\newenvironment{newspacing}[1]%
-  {\par\begingroup\newlinestretch{#1}}%
-  {\par\vskip\parskip\vskip\baselineskip\endgroup
-   \vskip-\parskip\vskip-\baselineskip}
-%
-%% To change the actual line spacing.
-%% >> Changed in v1.2 on 1998/10/20 by Francois Pitt. << %%
-%% >> Changed in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%
-\newcommand{\newlinestretch}[1]%
-  {\renewcommand{\baselinestretch}{#1}\currenttextsize}
-%
-%% To keep track of the current text size.
-%% >> Added in v1.2 on 1998/10/20 by Francois Pitt. << %%
-%% >> Changed in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%% >> Changed in v1.7 on 1999/05/13 by Francois Pitt. << %%
-%
-\let\currenttextsize=\normalsize
-%
-%% Redefine size-changing commands to update \currenttextsize.
-%% >> Added in v1.2 on 1998/10/20 by Francois Pitt. << %%
-%% >> Changed in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%% >> Changed in v1.7 on 1999/05/13 by Francois Pitt. << %%
-%% >> Changed in v1.8 on 1999/12/10 by Francois Pitt. << %%
-%
-\let\tmp@tiny=\tiny
-\renewcommand{\tiny}%
-  {\let\currenttextsize=\tmp@tiny\tmp@tiny}
-\let\tmp@scriptsize=\scriptsize
-\renewcommand{\scriptsize}%
-  {\let\currenttextsize=\tmp@scriptsize\tmp@scriptsize}
-\let\tmp@footnotesize=\footnotesize
-\renewcommand{\footnotesize}%
-  {\let\currenttextsize=\tmp@footnotesize\tmp@footnotesize}
-\let\tmp@small=\small
-\renewcommand{\small}%
-  {\let\currenttextsize=\tmp@small\tmp@small}
-\let\tmp@normalsize=\normalsize
-\renewcommand{\normalsize}%
-  {\let\currenttextsize=\tmp@normalsize\tmp@normalsize}
-\let\tmp@large=\large
-\renewcommand{\large}%
-  {\let\currenttextsize=\tmp@large\tmp@large}
-\let\tmp@Large=\Large
-\renewcommand{\Large}%
-  {\let\currenttextsize=\tmp@Large\tmp@Large}
-\let\tmp@LARGE=\LARGE
-\renewcommand{\LARGE}%
-  {\let\currenttextsize=\tmp@LARGE\tmp@LARGE}
-\let\tmp@huge=\huge
-\renewcommand{\huge}%
-  {\let\currenttextsize=\tmp@huge\tmp@huge}
-\let\tmp@Huge=\Huge
-\renewcommand{\Huge}%
-  {\let\currenttextsize=\tmp@Huge\tmp@Huge}
-%
-%% Make notes single-spaced if `spacednotes' option was not given.
-%% Note that this does _not_ change the spacing of figures or tables.
-%% >> Changed in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%
-\if@singlespacednotes
-%% Make footnotes single-spaced.
-\let\tmp@@footnotetext=\@footnotetext
-\renewcommand{\@footnotetext}[1]%
-  {{\newlinestretch{1}\tmp@@footnotetext{#1}}}
-%% Make footnotes inside a minipage single-spaced.
-\let\tmp@@mpfootnotetext=\@mpfootnotetext
-\renewcommand{\@mpfootnotetext}[1]%
-  {{\newlinestretch{1}\tmp@@mpfootnotetext{#1}}}
-%% Make marginal notes single-spaced.
-\let\tmp@@marginparreset=\@marginparreset
-\renewcommand{\@marginparreset}%
-  {\newlinestretch{1}\tmp@@marginparreset}
-\fi%@singlespacednotes
+%% Default values for the required fields.
+\degree{\emph{(degree)}}
+\department{\emph{(department)}}
+\gradyear{\emph{(year of graduation)}}
+\author{\emph{(author)}}
+\title{\emph{(title)}}
 
 %%%%%%    New formatting environments and commands.
-%
-%% \begin{preliminary} sets the pagestyle and pagenumbering for the
-%% preliminary sections; \end{preliminary} resets the pagenumbering.
+
+%% \begin{preliminary} sets the pagestyle and page numbering for the
+%% preliminary sections; \end{preliminary} resets the page numbering.
 %% The default page style is used outside of the preliminary block.
-%% >> Changed in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%
-\newenvironment{preliminary}%
+\newenvironment*{preliminary}%
   {\pagestyle{plain}\pagenumbering{roman}}%
   {\cleardoublepage\pagenumbering{arabic}}
-%
+
 %% Change \maketitle to follow SGS guidelines.
-%
-\renewcommand{\maketitle}{
-   \begingroup
-   \newlinestretch{1}
-   \begin{titlepage}
-   \begin{large}
+\renewcommand*{\maketitle}%
+  {\begin{titlepage}
+   \large\singlespacingnoskip
    \begin{center}
       \mbox{}
       \vfill
@@ -552,24 +323,17 @@
       Graduate Department of {\@department}\\
       University of Toronto\\
       \vfill
-      Copyright {\copyright} {\@gradyear} by {\@author}\\
-      \vspace{.2in}
+      {\copyright} Copyright {\@gradyear} by {\@author}\\
+      \vspace{.01\textheight}
       \mbox{}
    \end{center}
-   \end{large}
    \setcounter{page}{1}
    \end{titlepage}
-   \endgroup
-   \setcounter{page}{2}
-}%maketitle
-%
-%% Change \begin{abstract}...\end{abstract} to follow SGS guidelines
-%% and put the abstract on a separate page (checking @openright).
-%% >> Changed in v1.4 on 1998/11/05 by Francois Pitt. << %%
-%
-\renewenvironment{abstract}{
-   \if@openright\cleardoublepage\else\clearpage\fi
-   \begin{center}
+   \setcounter{page}{2}}
+
+%% Change \begin{abstract}...\end{abstract} to follow SGS guidelines.
+\renewenvironment*{abstract}%
+  {\begin{center}
       \section*{Abstract}
    \end{center}
    \begin{center}
@@ -581,97 +345,85 @@
       {\@gradyear}\\
    \end{center}
    \begingroup
-   %% Adjust the line spacing: if it was less than 1 1/2,
-   %% increase it to 1 1/2; if it was between 1 1/2 and 2,
-   %% increase it to 2; otherwise, leave it as is.
-   \ifdim \baselinestretch pt < 1.33pt \newlinestretch{1.33}\else
-   \ifdim \baselinestretch pt < 1.66pt \newlinestretch{1.66}\fi\fi
-}{\par\endgroup\newpage}%abstract
-%
-%% \begin{dedication}...\end{dedication} formats a
-%% dedication section (*not* on a separate page).
-%% >> Added in v1.4 on 1998/11/05 by Francois Pitt. << %%
-%
-\newenvironment{dedication}%
+   %% Adjust line spacing: if it was less than 2, increase it to 2;
+   %% otherwise, leave it as is.
+   \ifdim \baselinestretch pt < 1.6pt \doublespacing\fi}%
+  {\par\endgroup\newpage}
+
+%% \begin{dedication}...\end{dedication} formats a dedication section
+%% (*not* on a separate page).
+\newenvironment*{dedication}%
   {\begin{center}
       \section*{Dedication}
    \end{center}
    \begingroup}%
   {\par\endgroup}
-%
+
 %% \begin{acknowledgements}...\end{acknowledgements} formats an
 %% acknowledgements section (*not* on a separate page).
-%% >> Changed in v1.4 on 1998/11/05 by Francois Pitt. << %%
-%
-\newenvironment{acknowledgements}%
+\newenvironment*{acknowledgements}%
   {\begin{center}
       \section*{Acknowledgements}
    \end{center}
    \begingroup}%
   {\par\endgroup}
-%
-%% ...\renewcommand{\tableofcontents}...
-%% ...\renewcommand{\listoftables}...
-%% ...\renewcommand{\listoffigures}...
-%% >> Removed in v1.5 on 1999/02/17 by Francois Pitt. << %%
-%
-%% Redefine `thebibliography' environment so that it generates
-%% headers in the same style as the rest of the document.
-%% >> Added in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%
-\let\tmp@thebibliography=\thebibliography
-\renewcommand{\thebibliography}[1]{\tmp@thebibliography{#1}
-   \if@thesispage\@mkboth{\textsc{\bibname}}{\textsc{\bibname}}\fi}
-%
-%% ...\renewcommand{\cleardoublepage}...
-%% >> Removed in v1.5 on 1999/02/17 by Francois Pitt. << %%
-%
-%% Variations of \cleardoublepage that explicitly set the pagestyle
-%% of any inserted blank page.
-%% >> Added in v1.5 on 1999/02/17 by Francois Pitt. << %%
-%
-\newcommand{\clearemptydoublepage}%
-  {{\pagestyle{empty}\cleardoublepage}}
-\newcommand{\clearplaindoublepage}%
-  {{\pagestyle{plain}\cleardoublepage}}
+
+%% Redefine `thebibliography' environment so that it generates headers
+%% in the same style as the rest of the document.
+\let\@thesisthebibliography\thebibliography
+\renewcommand*{\thebibliography}[1]{\@thesisthebibliography{#1}
+   \if@thesispagestyle\@mkboth{\textsc{\bibname}}{\textsc{\bibname}}\fi}
+
+%% Variations of \cleardoublepage that explicitly set the pagestyle of
+%% any inserted blank page.
+\newcommand*{\clearemptydoublepage}%
+  {{\pagestyle{empty}\clearstandarddoublepage}}
+\newcommand*{\clearplaindoublepage}%
+  {{\pagestyle{plain}\clearstandarddoublepage}}
+\newcommand*{\clearthesisdoublepage}%
+  {{\pagestyle{thesis}\clearstandarddoublepage}}
+
+%% Single-spaced quotes and quotations.
+\newenvironment*{longquote}%
+  {\begin{quote}\singlespacingnoskip}{\end{quote}}
+\newenvironment*{longquotation}%
+  {\begin{quotation}\singlespacingnoskip}{\end{quotation}}
 
 %%%%%%    Page Styles
-%% >> Changed in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%% >> Changed in v1.7 on 1999/06/02 by Francois Pitt. << %%
-%
+
 %% Redefine all four standard page styles (empty, plain, headings,
 %% myheadings), based on the definitions in `report', so that they
 %% conform to the SGS guidelines (and include draft information if
-%% applicable).  Then, define a new pagestyle `utthesis' (default).
-%
+%% applicable).  Then, define a new pagestyle `thesis'.
+
+%% TODO: Get rid of copy-pasted definitions for pagestyles?
+
 %% Pagestyle `empty'.
-%
-\renewcommand{\ps@empty}{\@thesispagefalse
+\renewcommand*{\ps@empty}%
+  {\@thesispagestylefalse
    \let\@mkboth\@gobbletwo
    \def\@oddfoot{\if@draft\blDRAFT\hfil
       {\slshape\small\today}\hfil\brDRAFT\fi}%
    \let\@evenfoot\@oddfoot
    \def\@oddhead{\if@draft\tlDRAFT\hfil
       {\slshape\small\today}\hfil\trDRAFT\fi}%
-   \let\@evenhead\@oddhead
-}%ps@empty
-%
+   \let\@evenhead\@oddhead}
+
 %% Pagestyle `plain'.
-%
-\renewcommand{\ps@plain}{\@thesispagefalse
+\renewcommand*{\ps@plain}%
+  {\@thesispagestylefalse
    \let\@mkboth\@gobbletwo
    \def\@oddfoot{\if@draft\blDRAFT\fi\hfil
       \thepage\hfil\if@draft\brDRAFT\fi}%
    \let\@evenfoot\@oddfoot
    \def\@oddhead{\if@draft\tlDRAFT\hfil
       {\slshape\small\today}\hfil\trDRAFT\fi}%
-   \let\@evenhead\@oddhead
-}%ps@plain
-%
+   \let\@evenhead\@oddhead}
+
 %% Pagestyle `headings'.
-%
-\if@twoside % if two-sided printing
-\renewcommand{\ps@headings}{\@thesispagefalse
+\if@twoside % two-sided printing
+\renewcommand*{\ps@headings}%
+  {\@thesispagestylefalse
    \let\@mkboth\markboth
    \def\@oddfoot{\if@draft\blDRAFT\hfil
       {\slshape\small\today}\hfil\brDRAFT\fi}%
@@ -681,28 +433,27 @@
    \def\@evenhead{\if@draft\tlDRAFT\fi\thepage\hfil
       {\slshape\leftmark}\if@draft\trDRAFT\fi}%
    \def\chaptermark##1{\markboth
-      {\MakeUppercase{\ifnum\c@secnumdepth >\m@ne
+      {\MakeUppercase{\ifnum \c@secnumdepth >\m@ne
          \@chapapp\ \thechapter. \ \fi ##1}}{}}%
    \def\sectionmark##1{\markright
-      {\MakeUppercase{\ifnum\c@secnumdepth >\z@
-         \thesection. \ \fi ##1}}}%
-}%ps@headings
-\else % if one-sided printing
-\renewcommand{\ps@headings}{\@thesispagefalse
+      {\MakeUppercase{\ifnum \c@secnumdepth >\z@
+         \thesection. \ \fi ##1}}}}
+\else % one-sided printing
+\renewcommand*{\ps@headings}%
+  {\@thesispagestylefalse
    \let\@mkboth\markboth
    \def\@oddfoot{\if@draft\blDRAFT\hfil
       {\slshape\small\today}\hfil\brDRAFT\fi}%
    \def\@oddhead{\if@draft\tlDRAFT\fi{\slshape\rightmark}\hfil
       \thepage\if@draft\trDRAFT\fi}%
    \def\chaptermark##1{\markright
-      {\MakeUppercase{\ifnum\c@secnumdepth >\m@ne
-         \@chapapp\ \thechapter. \ \fi ##1}}}%
-}%ps@headings
+      {\MakeUppercase{\ifnum \c@secnumdepth >\m@ne
+         \@chapapp\ \thechapter. \ \fi ##1}}}}
 \fi%@twoside
-%
+
 %% Pagestyle `myheadings'.
-%
-\renewcommand{\ps@myheadings}{\@thesispagefalse
+\renewcommand*{\ps@myheadings}%
+  {\@thesispagestylefalse
    \let\@mkboth\@gobbletwo
    \def\@oddfoot{\if@draft\blDRAFT\hfil
       {\slshape\small\today}\hfil\brDRAFT\fi}%
@@ -711,13 +462,12 @@
       \thepage\if@draft\trDRAFT\fi}%
    \def\@evenhead{\if@draft\tlDRAFT\fi\thepage\hfil
       {\slshape\leftmark}\if@draft\trDRAFT\fi}%
-   \let\chaptermark\@gobble\let\sectionmark\@gobble
-}%ps@myheadings
-%
-%% Pagestyle `utthesis' (based on `headings').
-%
-\if@twoside % if two-sided printing
-\newcommand{\ps@utthesis}{\@thesispagetrue
+   \let\chaptermark\@gobble\let\sectionmark\@gobble}
+
+%% Pagestyle `thesis' (based on `headings').
+\if@twoside % two-sided printing
+\newcommand*{\ps@thesis}%
+  {\@thesispagestyletrue
    \let\@mkboth\markboth
    \def\@oddfoot{\if@draft\blDRAFT\hfil
       {\slshape\small\today}\hfil\brDRAFT\fi}%
@@ -727,140 +477,23 @@
    \def\@evenhead{\if@draft\tlDRAFT\fi\thepage\hfil
       {\slshape\leftmark}\if@draft\trDRAFT\fi}%
    \def\chaptermark##1{\markboth
-      {\textsc{\ifnum\c@secnumdepth >\m@ne
+      {\textsc{\ifnum \c@secnumdepth >\m@ne
          \@chapapp\ \thechapter. \ \fi ##1}}{}}%
    \def\sectionmark##1{\markright
-      {\textsc{\ifnum\c@secnumdepth >\z@
-         \thesection. \ \fi ##1}}}%
-}%ps@utthesis
-\else % if one-sided printing
-\newcommand{\ps@utthesis}{\@thesispagetrue
+      {\textsc{\ifnum \c@secnumdepth >\z@
+         \thesection. \ \fi ##1}}}}
+\else % one-sided printing
+\newcommand*{\ps@thesis}%
+  {\@thesispagestyletrue
    \let\@mkboth\markboth
    \def\@oddfoot{\if@draft\blDRAFT\hfil
       {\slshape\small\today}\hfil\brDRAFT\fi}%
    \def\@oddhead{\if@draft\tlDRAFT\fi{\slshape\rightmark}\hfil
       \thepage\if@draft\trDRAFT\fi}%
    \def\chaptermark##1{\markright
-      {\textsc{\ifnum\c@secnumdepth >\m@ne
-         \@chapapp\ \thechapter. \ \fi ##1}}}%
-}%ps@utthesis
+      {\textsc{\ifnum \c@secnumdepth >\m@ne
+         \@chapapp\ \thechapter. \ \fi ##1}}}}
 \fi%@twoside
 
-%%%%%%    Document Layout
-%% >> Changed in v1.5 on 1999/02/17 by Francois Pitt. << %%
-%
-%% Default line spacing: use current setting from options.
-%
-\linespacing{\@thesislnsp}
-%
-%% Page layout (see The LaTeX Companion pp.84-86).
-%% >> Changed in v1.1 on 1998/10/01 by Francois Pitt. << %%
-%% >> Changed in v1.4 on 1998/11/05 by Francois Pitt. << %%
-%
-%% By default, TeX puts the `reference point' one inch down and to
-%% the right of the top-left corner of the page.  This moves it back
-%% to the top-left corner (making the rest of the layout easier to
-%% define).
-%
-\setlength{\voffset}{-1in}
-\setlength{\hoffset}{-1in}
-%
-%% Instead of hard-coding the page layout for letter paper
-%% (8.5" x 11"), we will base it on \paperheight and \paperwidth,
-%% so that it works with options that change the paper size.
-%
-\setlength{\textheight}{\paperheight}
-\setlength{\textwidth}{\paperwidth}
-%
-%% Now, set the margin-dependent values.
-%
-\ifcase\@marginsize % set narrow margins: 1 1/4" left, 3/4" others
-%
-\addtolength{\textheight}{-1.5in}
-\setlength{\topmargin}{.5in}
-\setlength{\headsep}{.25in}
-\setlength{\footskip}{.25in}
-\addtolength{\textwidth}{-2in}
-\setlength{\oddsidemargin}{1.25in}
-\setlength{\evensidemargin}{.75in}
-\setlength{\marginparwidth}{.5in}
-\setlength{\marginparsep}{.125in}
-%
-\or % set normal margins: 1 1/4" left, 1" others
-%
-\addtolength{\textheight}{-2in}
-\setlength{\topmargin}{.5in}
-\setlength{\headsep}{.5in}
-\setlength{\footskip}{.5in}
-\addtolength{\textwidth}{-2.25in}
-\setlength{\oddsidemargin}{1.25in}
-\setlength{\evensidemargin}{1in}
-\setlength{\marginparwidth}{.75in}
-\setlength{\marginparsep}{.125in}
-%
-\or % set wide margins: 1 1/4" all around
-%
-\addtolength{\textheight}{-2.5in}
-\setlength{\topmargin}{.5in}
-\setlength{\headsep}{.75in}
-\setlength{\footskip}{.75in}
-\addtolength{\textwidth}{-2.5in}
-\setlength{\oddsidemargin}{1.25in}
-\setlength{\evensidemargin}{1.25in}
-\setlength{\marginparwidth}{.75in}
-\setlength{\marginparsep}{.25in}
-%
-\or % set extra wide margins: 1 1/2" all around
-%
-\addtolength{\textheight}{-3in}
-\setlength{\topmargin}{.75in}
-\setlength{\headsep}{.75in}
-\setlength{\footskip}{.75in}
-\addtolength{\textwidth}{-3in}
-\setlength{\oddsidemargin}{1.5in}
-\setlength{\evensidemargin}{1.5in}
-\setlength{\marginparwidth}{1in}
-\setlength{\marginparsep}{.25in}
-%
-\fi%@marginsize
-%
-%% Adjust \headsep to include height of running head.
-%
-\addtolength{\headsep}{-\headheight}
-%
-%% Adjust the vertical spacing between the main text and the notes,
-%% and between successive notes if they are not single-spaced.
-%% >> Added in v1.2 on 1998/10/20 by Francois Pitt. << %%
-%% >> Changed in v1.3 on 1998/11/01 by Francois Pitt. << %%
-%
-\setlength{\skip\footins}{.75\baselineskip}
-\if@singlespacednotes\else
-\let\oldtextsize=\currenttextsize
-\footnotesize
-\setlength{\marginparpush}{\baselineskip}
-\setlength{\footnotesep}{\baselineskip}
-\oldtextsize
-\fi%@singlespacednotes
-%
-%% Make each page fill up the entire page.
-%
-\flushbottom
-%
 %% Default page style.
-%
-\pagestyle{utthesis}
-%
-%% Default values for the required fields.
-%
-\degree{\mbox{}}
-\department{\mbox{}}
-\gradyear{\number\year}
-\author{\mbox{}}
-\title{\mbox{}}
-%
-%% ...\setcounter{tocdepth}{2}...
-%% >> Removed in v1.5 on 1999/02/17 by Francois Pitt. << %%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  End of UT-THESIS.CLS
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pagestyle{thesis}