18 files changed, 1706 insertions, 915 deletions
diff --git a/Master/texmf-dist/doc/latex/york-thesis/README b/Master/texmf-dist/doc/latex/york-thesis/README
new file mode 100644
index 00000000000..8f0cb022629
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/york-thesis/README
@@ -0,0 +1,19 @@
+The york-thesis class
+*********************
+
+This class file is what you need to write theses and dissertations at
+York University (Toronto, Canada).
+
+To get the class file run york-thesis.ins through latex:
+
+$ latex york-thesis.ins
+
+The documentation is provided in york-thesis.pdf, but to generate the
+documentation yourself, run york-thesis.dtx through latex:
+
+$ latex york-thesis.dtx
+
+The york-thesis-Template.tex file is a sample master document for your
+work. The york-thesis.el file is a style file for AUCTeX.
+
+author: Norm Gall <gall@spookyhill.net>
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/.DS_Store b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/.DS_Store
deleted file mode 100644
index 19ed757b317..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/.DS_Store
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/abstract.tex b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/abstract.tex
deleted file mode 100644
index dfe41aa7ae1..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/abstract.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-Ut ullamcorper, amet iriure illum dignissim velit, enim; feugait nulla tincidunt, autem delenit facilisis in facilisi lorem odio laoreet sit nibh magna duis. Consequat, velit sed qui duis, ullamcorper et; accumsan commodo et! Quis, iriuredolor tation suscipit; ullamcorper aliquip ea. Magna nulla... magna amet augue qui iriuredolor blandit facilisis nostrud vel facilisi. Augue iriuredolor te luptatum... dolor lorem, laoreet te exerci consequat quis lorem dignissim luptatum. Duis dolor nostrud magna vel augue facilisis vero. 
-
-Odio ullamcorper esse veniam, ea qui in minim, hendrerit; ad suscipit ea hendrerit dolore quis at. Aliquam euismod nisl, tincidunt diam tation. Vulputate vero eros ut accumsan wisi, feugait exerci delenit veniam, facilisi ad. Hendrerit nibh dolore commodo, ullamcorper wisi quis, magna luptatum nisl; enim aliquip, nulla crisare consequat dolore in illum eum hendrerit consequat ut nulla tincidunt eros. Commodo nibh amet, in et lobortis; sit in vero nulla in!  
-\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/acknowledgements.tex b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/acknowledgements.tex
deleted file mode 100644
index 6a5a91f8fd5..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/acknowledgements.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-Consectetuer velit, duis consequat in feugait consequatvel ut eros nisl ex. Te luptatum duis aliquam... autem facilisis accumsan, wisi in wisi laoreet, duis quis nostrud dolore quis molestie te at commodo qui. Vel tincidunt ut delenit et � crisare nostrud amet eum ut, consequat eros tation ex te sciurus. Laoreet et at odio nostrud lobortis ullamcorper facilisi in minim odio facilisi qui, velit quis, esse ut suscipit; feugait nulla. 
-
-Augue dolore duis blandit facilisi aliquam duis ad nisl blandit? Ad ullamcorper ea ut consectetuer; ut esse feugait diam esse ipsum. Quis dolore nulla; esse tation dolore? Qui, velit enim exerci illum in odio eros suscipit crisare eu facilisi, diam commodo in wisi, facilisis te. Dolore quis consequatvel, laoreet dolore veniam delenit sciurus, consequat; dolore consequatvel minim feugiat exerci, erat velit dolor. Nostrud dolore in nulla vel sit adipiscing; nulla feugait augue diam augue eu suscipit vel blandit tation ex. 
-\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/chapter-1.tex b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/chapter-1.tex
deleted file mode 100644
index 073279ec233..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/chapter-1.tex
+++ /dev/null
@@ -1,40 +0,0 @@
-\chapter{Where the Hell did that thing go?}
-
-\epigraph{``Snogging''? Is that the same thing as ``shagging''? }{Sydney Fox}
-
-\section{Introduction}
-Blandit suscipit dignissim aliquam, nisl duis, eu aliquip tincidunt at feugiat delenit. Ex hendrerit; quis ipsum illum. Consectetuer tincidunt feugiat; consequat augue duis nulla in. Nisl vero at, augue dolor consequat duis; esse exerci, lorem elit nisl. Esse autem praesent amet hendrerit nibh blandit, lorem laoreet magna; iusto dignissim, eum dolore aliquip. 
-Enim iriuredolor, molestie nulla elit dolor lorem consequatvel eum te ea minim feugait ut consequatvel feugiat. Illum velit et feugiat sit consequat nibh minim dignissim ea � wisi tation autem eu erat, laoreet eros velit ea praesent. Sit te � lobortis eros odio aliquip sed. Molestie at consequatvel minim, esse nulla lorem? Feugiat, adipiscing ut blandit vel, sed blandit feugait, feugiat feugait accumsan dolore feugait feugiat veniam in sed in. Nostrud ex sed minim, euismod blandit luptatum in feugiat � odio duis crisare dolore eros eum aliquip \cite[34ff]{dharamsi2001}. 
-
-Commodo augue ut esse blandit. Odio exerci velit illum in consectetuer et hendrerit? Ad elit vel enim nisl; nostrud consequat facilisi, iriuredolor diam ex vulputate nulla vel. Delenit elit, nostrud diam iusto dolor ullamcorper magna praesent duis dolore eros.\footnote{Lobortis molestie facilisis; dolore lobortis nostrud augue eros vulputate, vero iriuredolor vero wisi. Ullamcorper commodo enim quis accumsan nostrud duis eros ut nostrud nulla eum tation; ut qui in vulputate. Et ut volutpat, aliquip odio lobortis, ea in praesent crisare? Aliquip quis esse enim et, vel vero duis; consequat te crisare nibh, nonummy consequat sit wisi autem iusto.}
-
-\section{General Methodologies}
-Eum, adipiscing elit; dolore, ea nulla vel delenit amet duis. Nulla, eum qui veniam, luptatum veniam; suscipit dolor sit vero feugiat sciurus ex, facilisi iriuredolor ea praesent et! Vel, te ut nulla... sed ut dolore, accumsan iusto. Et diam nulla commodo consequatvel eros elit hendrerit at hendrerit odio, ipsum delenit qui consequatvel facilisi; quis dignissim volutpat! Feugiat vero in vel consequatvel duis feugiat. 
-
-Nonummy esse dolore crisare � feugait autem in enim exerci. Commodo dignissim, sciurus dolore volutpat � exerci odio tation exerci dolor praesent nostrud. Ut nulla vero eu nonummy molestie in molestie volutpat minim eum et. Lobortis blandit, euismod ullamcorper, facilisi qui: 
-
-\begin{quote}
-Aliquip dolor feugait delenit facilisis aliquam tation wisi, volutpat qui. Sit sciurus enim in wisi at duis at ullamcorper praesent autem wisi. Velit aliquip illum enim qui tincidunt volutpat elit ipsum dolore luptatum illum nibh duis molestie. Iriure wisi commodo duis ut autem iriuredolor blandit aliquam et facilisi odio aliquam vulputate et! \cite[24--5]{gall1994}
-\end{quote}
-
-Nonummy minim esse laoreet in. Diam crisare; et commodo wisi eum blandit, lobortis odio dolore, nostrud in duis. Consequat diam lorem duis; praesent tincidunt esse ea et nostrud at nisl ut et vero nulla quis sed. At ex velit. Facilisis, vero ad nostrud, ad magna at qui; iriuredolor, vulputate ut eu nibh. In, consectetuer; elit, molestie et enim veniam, in luptatum ullamcorper molestie delenit tincidunt nulla, nonummy euismod delenit et hendrerit at feugiat vulputate in. 
-
-\section{Passports and International Treaties}
-Lobortis molestie facilisis; dolore lobortis nostrud augue eros vulputate, vero iriuredolor vero wisi. Ullamcorper commodo enim quis accumsan nostrud duis eros ut nostrud nulla eum tation; ut qui in vulputate. Et ut volutpat, aliquip odio lobortis, ea in praesent crisare? Aliquip quis esse enim et, vel vero duis; consequat te crisare nibh, nonummy consequat sit wisi autem iusto. 
-
-Eum, adipiscing elit; dolore, ea nulla vel delenit amet duis. Nulla, eum qui veniam, luptatum veniam; suscipit dolor sit vero feugiat sciurus ex, facilisi iriuredolor ea praesent et! Vel, te ut nulla... sed ut dolore, accumsan iusto. Et diam nulla commodo consequatvel eros elit hendrerit at hendrerit odio, ipsum delenit qui consequatvel facilisi; quis dignissim volutpat! Feugiat vero in vel consequatvel duis feugiat. 
-
-Ut molestie quis; in ut aliquam dolore vel veniam ipsum vel consequat illum vero, iusto in ut delenit feugiat dolore, augue commodo. Dignissim vulputate vero tation feugait � consequat eros vel enim et augue dolor elit, veniam feugait feugiat. Esse, wisi hendrerit; lobortis ut commodo aliquam commodo nisl eum. Facilisi tation nibh nulla te delenit accumsan nulla at eu; illum duis illum ex. Enim aliquip at, nibh tincidunt et, amet vel. Quis volutpat, in; tincidunt amet in vero dignissim iusto aliquip illum dolor. Aliquam aliquip... feugait, at luptatum iriure eros minim aliquip consequat in elit. Nibh hendrerit euismod feugiat commodo, facilisi veniam ullamcorper praesent iusto vulputate exerci; praesent nostrud. Quis augue molestie... duis praesent nulla feugiat laoreet dignissim accumsan exerci velit exerci. 
-
-Duis nibh exerci tation esse nonummy illum lorem nulla luptatum ut facilisis sit. Velit qui eros; te eum hendrerit tincidunt eu te vel. Blandit vulputate velit te feugiat nostrud in tation dignissim qui in praesent... wisi eum commodo? Praesent, qui praesent... ex autem luptatum facilisi, aliquip diam, sciurus in laoreet ullamcorper esse nulla feugiat. Illum feugiat hendrerit molestie dolore, vel consectetuer; enim illum facilisis vero dolor odio. Iusto feugait qui wisi veniam, nostrud nisl hendrerit lobortis dolore te vel iriuredolor. Ex wisi! 
-
-Feugait tation augue iusto et eu qui consequat. Quis amet; sed, exerci duis feugiat, luptatum ea. Aliquip vel nostrud feugait delenit aliquip in dolor lobortis, odio ex suscipit. Qui nostrud praesent in dolor feugiat, vulputate eros autem nostrud. 
-
-\section{The Thesis}
-Eros luptatum vel... consequat in praesent augue ut nibh dolor facilisi iusto eu. Ea nulla feugiat luptatum vel aliquip te diam nonummy eum aliquip nulla aliquip commodo dolore molestie. Elit quis accumsan feugait nulla wisi blandit tation. Eros nostrud ullamcorper minim delenit eu et? Sit duis nonummy tation adipiscing dolore iriure? Euismod duis facilisis nulla. Exerci facilisi hendrerit minim commodo eu, consequat accumsan ut facilisis vel odio. Lorem te; nonummy consequat iusto duis euismod, ea eu luptatum consequat. 
-
-Exerci nulla diam augue autem ut vero dignissim et veniam... ut tation vulputate wisi ad accumsan aliquip? Sit ea eros sed veniam sit eros � iriuredolor diam, molestie amet luptatum nulla eum suscipit. Ullamcorper dignissim iriure eu velit at wisi euismod vero dolore ut illum elit? Ut dolor nostrud sit et nisl consequat nulla luptatum � molestie feugait ut lobortis dolore exerci hendrerit nulla duis nisl dolore. Elit odio vero accumsan ut, exerci enim delenit suscipit, nonummy nulla duis dolor et wisi aliquam suscipit exerci suscipit? 
-
-In et; qui suscipit ad vulputate suscipit ullamcorper et enim veniam et facilisis adipiscing, nonummy eu, vulputate exerci quis. Lobortis esse eum esse volutpat � facilisis consequat lobortis dolore feugait duis, aliquip suscipit eu. Dolor, nostrud tincidunt, et; eu nostrud aliquip eum tation suscipit lobortis in aliquip, te feugait nulla duis. Nisl iusto in consequat luptatum sed luptatum, nisl dolore amet duis odio! Sciurus, duis erat, ut augue; nostrud vel ea. Exerci volutpat duis, eum; ea eros. Aliquip nisl; quis ut feugait lobortis eum, enim autem? 
-
-Hendrerit nulla vel, autem laoreet veniam elit sit; in luptatum te esse, consectetuer suscipit, crisare te eu? Volutpat nibh nonummy, delenit nulla tation illum! Qui suscipit ut accumsan tation elit feugait nonummy dignissim consequatvel � feugait lobortis commodo in odio vel quis vel feugait. Vel, vulputate � iusto feugiat facilisi odio nulla duis ut aliquip facilisi? Vulputate feugait ullamcorper delenit vel in vulputate quis dolore! 
-
-Vel enim... ut euismod dolore duis minim duis aliquip, facilisis vel at iriuredolor? Feugiat nulla aliquip sed, feugiat esse nonummy eu dolore praesent nonummy ut ex! Ut, laoreet nostrud; eu wisi duis feugait amet accumsan, suscipit ea in laoreet. Aliquam euismod commodo, eros nisl qui. Et dignissim aliquip nisl illum ullamcorper ea ut illum, vel odio, volutpat dolore iriuredolor ut euismod dolor eros vel et luptatum dolore vero wisi consequatvel quis; vero minim augue. Ipsum iriure molestie; iriure praesent aliquip feugait et duis, adipiscing vulputate commodo eum feugait ut. Suscipit blandit eros wisi blandit nostrud illum vero illum, eum delenit; hendrerit consequat facilisi. 
-
-Minim magna sit � esse autem aliquam illum minim consectetuer odio ex ullamcorper, duis tation consequatvel luptatum in hendrerit iriuredolor vel exerci? Nulla commodo, vulputate esse; nulla vero, ut elit ad facilisi vero. Ad nonummy commodo ex � ut wisi ex exerci dolor velit, dolore amet augue laoreet consequatvel facilisi nostrud veniam. Ullamcorper commodo, ex nulla augue quis suscipit nisl dolore euismod � iriuredolor dolor te velit volutpat et illum enim minim ad exerci commodo consequat praesent. Nonummy diam blandit sed autem tation at molestie at blandit ut nostrud dolore quis. Accumsan aliquam ea dolore commodo feugait dolore dolor nisl ea magna lobortis hendrerit minim velit vulputate. Sed blandit minim exerci nulla veniam, ex tation vero dolor te? 
-
-Delenit in aliquip eum, nisl at qui feugait et; duis veniam qui esse duis eros lobortis. Dolore volutpat ut ad; feugait quis ut, consequatvel volutpat, magna at ea, enim delenit dignissim praesent sciurus. In facilisi commodo � suscipit nostrud, elit eu dolore adipiscing suscipit nibh consequat ex lorem ipsum, tation nisl suscipit iriuredolor? Ut, veniam ut eum. Suscipit te dolor minim in, feugiat ut consequat ea eu � nulla volutpat, suscipit luptatum odio te, tation et ad! Commodo et... ut et ea consequat delenit hendrerit nostrud nulla blandit dolore ut vero? Luptatum dolor dignissim lobortis ullamcorper consectetuer; qui feugait aliquam vulputate nostrud? 
-
-\section{All the Rest}
-Odio quis, elit wisi commodo; suscipit, crisare iusto luptatum nulla aliquip sit tation odio accumsan autem enim aliquam nulla ut augue dolor enim, commodo at lobortis hendrerit veniam? Minim odio iriure nostrud in nostrud, ullamcorper dolor accumsan dolore... laoreet dignissim te erat sed ut ullamcorper qui te odio. Commodo et nonummy nisl ut nibh; aliquip at dolore consequatvel, consequat eum praesent. Sciurus sed odio minim, aliquip dolore duis vel facilisis consequatvel; at esse sit dolor eu facilisi blandit illum ut. Aliquip magna dignissim odio duis. 
-Hendrerit blandit duis molestie velit praesent minim consequat dignissim, dolor lobortis nisl nostrud; elit aliquip eu crisare at qui. Wisi vulputate nulla nostrud, nulla adipiscing diam eu enim, aliquip tation suscipit. Consequat lorem dolor commodo, consectetuer vero hendrerit duis wisi enim ut amet feugait adipiscing feugait. Lorem minim... lorem esse, vulputate vel tation adipiscing at nostrud ut elit. 
-
-Dolore erat adipiscing; euismod dolore erat, luptatum nostrud in hendrerit diam, adipiscing feugait consequat ut dolore vel eros, lobortis illum qui iusto! Ea molestie blandit adipiscing euismod! Blandit facilisi nostrud eum... dignissim ex nostrud consequat, nisl adipiscing ea iusto et nostrud enim velit nibh qui. Wisi feugiat nonummy esse molestie praesent blandit tincidunt, at � exerci vel odio quis veniam tincidunt. At aliquip vulputate; eum aliquam consequat ut wisi dignissim feugait dolor ut dignissim vero eu eros quis veniam. Nonummy qui; dolore dolor vulputate. Luptatum at nonummy molestie, veniam et nulla veniam dolore in velit, hendrerit luptatum aliquip enim. 
-
-Accumsan, erat enim delenit euismod ullamcorper esse aliquam delenit molestie vero feugait � nonummy vero in illum nostrud, facilisis nisl sit nulla? Lobortis ad in eu consequat vel nulla, lorem elit vel praesent veniam, vero nibh et; illum praesent vero euismod duis. Ut qui, dolor nulla aliquip nibh exerci vel blandit eros luptatum duis? Te, ut autem feugiat, delenit aliquip; nisl lorem nulla dolore et praesent, laoreet illum in aliquip nibh sit! 
-
-Augue dolor nulla... molestie, augue sed, blandit nibh dolore, diam lorem, ut duis. Facilisi delenit vulputate; suscipit nisl, praesent iusto dolore dignissim adipiscing blandit in molestie eum dolore in. Suscipit facilisis consequat ut lorem elit dolore � ut et duis nonummy nibh eu luptatum! Amet dolore nulla eum veniam eros � in illum ut lobortis te, delenit ut iusto duis dolor ea. Iriure augue iusto ullamcorper tation augue luptatum accumsan delenit, accumsan dignissim qui delenit in. Tation ea nostrud; consectetuer magna, dolore sciurus amet et. Velit facilisis praesent facilisi, suscipit adipiscing sit feugiat te lobortis praesent. Augue at sit iusto, feugait nibh; amet minim feugait commodo et iusto, dolore ullamcorper crisare.\footnote{Delenit, eum duis ut facilisi ut ea at elit ut ullamcorper; in dolore wisi. Velit ullamcorper et te ad exerci diam ut at eum crisare commodo dolore; eum accumsan vulputate feugiat commodo feugait tation odio! Ex suscipit dolore eum commodo � suscipit at iusto illum facilisi consequat et volutpat augue magna, tincidunt sit. Dignissim veniam; at esse veniam vel consequat illum duis ipsum, augue quis. Facilisi esse commodo molestie; velit odio. 
-Aliquam consequat augue ullamcorper et... dolore illum ex! Crisare tation ut; adipiscing nostrud duis volutpat lorem esse augue et nisl illum magna nibh enim ex. Augue dignissim volutpat; nostrud praesent, hendrerit vel lobortis te consequat praesent duis, esse molestie ut quis. Lorem aliquip praesent consequatvel lorem iriure hendrerit nonummy; eros in tation vulputate, nulla minim commodo, hendrerit eu velit suscipit consequat. Nisl vulputate hendrerit ad ex, ad vel exerci hendrerit velit veniam in; ut ad te nulla nostrud in! 
-
-Qui magna nulla autem minim feugiat. Nulla duis dolore? Vel et consequat nulla euismod feugait iusto, augue consequat in dolore eum nisl commodo. Luptatum sciurus sed aliquip... molestie lobortis exerci consequat aliquip ex vel! Et aliquam nostrud ad; ut ea wisi at esse duis esse nibh feugiat in!} 
-
-Eros nostrud nulla iusto velit, ea enim quis wisi quis nulla sed, dolore odio tation te esse. Adipiscing vel iusto tincidunt ea, delenit � duis nonummy augue ut aliquip molestie nulla autem feugiat vulputate? Ullamcorper dolore duis, minim ut nostrud luptatum iriuredolor, diam adipiscing hendrerit iusto illum et. Dolore euismod ipsum autem iriuredolor dolore eros ut sciurus nulla, minim ut, dolor consequatvel dolore ut blandit, euismod illum dolore volutpat iriure. Et vero molestie eu illum eum wisi commodo praesent consequat dignissim lobortis facilisis blandit dignissim; vulputate nulla? At wisi, illum molestie te luptatum lorem. Vero exerci, facilisis ut ex quis, vulputate dolor tation! 
-
-Amet eum et duis. Commodo euismod eu hendrerit delenit ullamcorper veniam hendrerit ipsum iriure sciurus? Duis, eros at vero ex, erat blandit duis vel veniam nisl! Eros ea tincidunt nostrud; nulla feugait eu iusto, nonummy dolor te et iriuredolor ullamcorper ea, volutpat enim consectetuer in aliquip duis. 
-
-Ipsum luptatum wisi qui ut odio delenit feugiat vel duis... laoreet duis nostrud autem delenit hendrerit dolore augue dolor esse feugiat. Et iusto quis... minim ullamcorper velit, wisi consectetuer esse minim, vulputate illum enim. Nulla feugiat, nulla enim tation molestie in � ad exerci, duis nostrud in vel eu aliquam ut nulla facilisis ut dignissim. Nostrud augue dolor vulputate enim exerci vel vero. Adipiscing, veniam facilisi; facilisis ad facilisis nisl eu wisi diam, feugiat aliquam, exerci augue eum aliquam lorem! Consequat vulputate ex qui consectetuer dolor ullamcorper. Ut feugait dolor facilisi minim; esse facilisi aliquam vero blandit delenit vero magna. 
-
-
-\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.bib b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.bib
deleted file mode 100644
index 5e7504abfaa..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.bib
+++ /dev/null
@@ -1,23 +0,0 @@
-%% This BibTeX bibliography file was created using BibDesk.
-%% http://www.cs.ucsd.edu/~mmccrack/bibdesk.html
-
-
-%% Created for Norman Gall at 2004-05-06 16:35:17 -0600 
-
-
-
-@book{gall1994,
-	Address = {Oxford},
-	Author = {Norman Gall},
-	Edition = {3rd},
-	Publisher = {Oxford University Press},
-	Title = {How to Find Things},
-	Year = {1994}}
-
-@book{dharamsi2001,
-	Address = {Peshawar},
-	Author = {Karim Dharamsi},
-	Edition = {5th},
-	Publisher = {University of Peshawar press},
-	Title = {South-Asian Martial Arts for Post-Graduate Students},
-	Year = {2001}}
-\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.pdf b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.pdf
deleted file mode 100644
index 7e5d86dc109..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.tex b/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.tex
deleted file mode 100644
index 75d42118328..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%
-% York University FGS thesis/dissertation template 
-%            for use with york-thesis.cls (v1.8)
-%
-% The reference for this file is "Guidelines for the Preparation and 
-% Examination of Theses and Dissertations". This is available in 
-% each Graduate Programme Office as well as in the FGS Thesis Office.
-%
-% There are a few decisions I made:
-%       a) The type size in both draft and final is set as 12pt
-%       b) The paper type is set as letterpaper
-%       c) Footnotes, quotes, and quotations are set single spaced
-%               in final mode. This is an option in the FGS guidelines.
-%               You can change this in the .cls file if you
-%               really want double spaced text in these environments
-%
-% options:  final: generates depositable document according to FGS regs
-%           draft: wider margins, single spaced text [default setting]
-%
-\documentclass[final]{york-thesis}
-
-\setboolean{masters}{false}             % set false for PhD degree
-\setboolean{hasfigures}{false}
-\setboolean{hastables}{false}
-
-\title{``A PEARL OF GREAT PRICE'': s\\ MYTHICAL STATUES AND GRIEVOUS BODILY HARM}
-\author{Nigel Bailey}
-\department{Ancient Studies}   
-\masterof{Arts}                         % set to `Arts' or `Science'
-\date{September 2004}                   % this is the month and year of defence
-
-% Some helpful settings
-\setcounter{tocdepth}{1}                % table of contents inclusion level
-
-% If you really want footnotes to reset to 0 at the beginning of each
-% chapter, uncomment the following command:
-%
-% \def\resetfootnote{\setcounter{footnote}{0}}
-
-%========== preliminary matter =================
-%
-%       Create these in separate files; trust me
-%
-
-\abstractfile{abstract.tex}
-\acknowledgementsfile{acknowledgements.tex}
-
-%============ document control ==================
-%\includeonly{Chapter-1}
-%\includeonly{Chapter-2}
-%\includeonly{Chapter-3}
-%\includeonly{Chapter-4}
-%\includeonly{Chapter-5}
-
-%============ document begins ==================
-%
-\begin{document}
-
-\makefrontmatter
-
-%
-%   include commands for chapters here
-%
-
-\include{chapter-1}
-%\include{chapter-2}
-%\include{chapter-3}
-%\include{chapter-4}
-%\include{chapter-5}
-
-\spacing{1}		                     % I prefer single spaced bibliographies
-\bibliographystyle{apalike}
-\bibliography{sample-thesis}
-
-%\appendix							% if you have appendices, they go here
-%\include{appendix-a}
-%\include{appendix-b}
-%\include{appendix-c}
-\end{document}
-\end
diff --git a/Master/texmf-dist/doc/latex/york-thesis/york-thesis-Template.tex b/Master/texmf-dist/doc/latex/york-thesis/york-thesis-Template.tex
new file mode 100644
index 00000000000..7829eadff9f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/york-thesis/york-thesis-Template.tex
@@ -0,0 +1,114 @@
+%%
+%% Copyright (C) 2005 by Norm Gall <gall@spookyhill.net>
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version
+%% 2003/06/01 or later.
+%%
+%
+% York University FGS thesis/dissertation template 
+%            for use with york-thesis.cls (v3.0)
+%
+% You really should read the documentation for the class file
+% (york-thesis.pdf) to see what all of the additional macros and
+% booleans do. As well, many of the macros you are used to using
+% behave differently in this class. 
+%
+% You may, of course, remove all comments from your document.
+%
+\documentclass[draft]{york-thesis}
+
+%========== citation setup  =================
+\usepackage[authoryear,sort]{natbib} % I use natbib, but you can use
+                                % any citation format; the class file
+                                % is agnostic about citation styles.
+\bibpunct[, ]{(}{)}{,}{a}{}{,}  % This line configures natbib to use
+                                % CMoS in-line citation style 
+
+%========= package setup ================
+\setboolean{masters}{true}      % set true for a Master's thesis;
+                                % false for a PhD dissertation
+\setboolean{hasfigures}{false}  % set true if you have figures
+\setboolean{hastables}{false}   % set true of you have tables
+
+\title{The title}         % this is the full title of your work
+\author{I. M. N. Author}  % this is your name exactly as you want it
+                          % to appear everywhere in your work.
+\department{Department}   % this is the name of the programme in which
+                          % you are attempting your degree 
+\masterof{Arts}           % this is the type of Master's degree you
+                          % are attempting. If the boolean masters is
+                          % false, this has no effect. 
+\degreename{Magisteriate} % put the actual name of the degree you are
+                          % attempting 
+\date{September 1995}     % this is the month and year of defence
+
+%========== preliminary matter =================
+%
+% Create these in separate files; trust me
+%
+% If you do not have one or more of these commands in your document,
+% simply delete the line.
+% 
+% The following macros need appear in no particular order, but if you
+% are going to use them, they have to be defined before you begin your
+% document environment.
+%
+\abstractfile{abstract.tex}
+\dedicationfile{dedication.tex}
+\acknowledgementsfile{acknowledgements.tex}
+\prefacefile{preface.tex}
+\abbreviationsfile{abbreviations.tex}
+%
+% Your committee members list has to be an enumerated list.
+%
+\committeememberslist{
+  \begin{enumerate}
+    \item First Examiner
+    \item Second Examiner
+    \item Third Examiner
+    \item Fourth Examiner
+    \item Fifth Examiner
+    \item Sixth Examiner
+  \end{enumerate}}
+
+%============ document begins ==================
+%
+\begin{document}
+
+\makefrontmatter
+
+%
+%   the include commands for chapters go here
+%
+
+%\include{chapter-1}
+%\include{chapter-2}
+%\include{chapter-3}
+%\include{chapter-4}
+%\include{chapter-5}
+
+%\appendix
+%\include{appendix-a}
+%\include{appendix-b}
+%\include{appendix-c}
+
+\spacing{1}
+\bibliographystyle{plainnat} % the class file is agnostic as to which
+                             % bibliographic style you prefer. You
+                             % should be able to use any style that
+                             % conforms to what you want to see in the
+                             % bibliography 
+\bibliography{thesis} % you do not have to use BibTeX to construct
+                      % your bibliography; you can do it here by hand
+                      % just as you would in any other document, if
+                      % you wish.
+
+\end{document}
+\end
diff --git a/Master/texmf-dist/doc/latex/york-thesis/york-thesis.el b/Master/texmf-dist/doc/latex/york-thesis/york-thesis.el
new file mode 100644
index 00000000000..e0589ee6274
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/york-thesis/york-thesis.el
@@ -0,0 +1,26 @@
+;
+;;; york-thesis.el - Special code for york-thesis style.
+;
+;;; Code:
+
+;; AUCTeX configuration
+(TeX-add-style-hook "york-thesis"
+ (function (lambda ()
+   (setq LaTeX-largest-level (LaTeX-section-level "part"))
+   (LaTeX-add-environments
+	"epigraphs" "fquote"
+	"fquotation" "fverse")
+   (TeX-add-symbols
+        '("epigraph" 2)
+	'("degreename" 1)
+	'("committeememberslist" 1)
+	'("department" 1)
+	'("masterof" 1)
+	'("abstractfile" 1)
+	'("acknowledgementsfile" 1)
+	'("prefacefile" 1)
+	'("abbreviationsfile" 1)
+	'("threestars" 0))
+)))
+
+;;; york-thesis.el ends here
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/york-thesis.pdf b/Master/texmf-dist/doc/latex/york-thesis/york-thesis.pdf
index 4fe95e328d3..38b17d744e1 100644
--- a/Master/texmf-dist/doc/latex/york-thesis/york-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/york-thesis/york-thesis.pdf
diff --git a/Master/texmf-dist/doc/latex/york-thesis/york-thesis.tex b/Master/texmf-dist/doc/latex/york-thesis/york-thesis.tex
deleted file mode 100644
index b749c7383a7..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/york-thesis.tex
+++ /dev/null
@@ -1,226 +0,0 @@
-\documentclass[11pt]{article}
-
-\usepackage{amsfonts}
-\usepackage{graphicx}
-\usepackage[authoryear,sort]{natbib}
-\bibpunct[: ]{(}{)}{,}{a}{}{,}
-\citestyle{authoryear}
-
-\newcommand{\epigraph}[2]{\begin{flushright}\begin{minipage}{4in}%
-                        #1
-                    \begin{flushright}#2\end{flushright}\hrule%
-                    \end{minipage}\vskip 12pt\end{flushright}}
-
-\textwidth = 6.5 in
-\textheight = 9 in
-\oddsidemargin = 0.0 in
-\evensidemargin = 0.0 in
-\topmargin = 0.0 in
-\headheight = 0.0 in
-\headsep = 0.0 in
-\parskip = 0.2in
-\parindent = 0.0in
-
-\title{The \textsf{york-thesis} Package\thanks{2004/05/05 v1.8}}
-
-\author{Norman Gall\thanks{For the love of all that is holy, if you find errors your output, get hold of me pronto at \texttt{gall@spookyhill.net} --- I will make every effort to make the corrections quickly and get back to you. However, you need to describe the problem clearly and include the source and output that offends.}}
-
-\date{\today}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-\noindent The \textsf{york-thesis} package implements the York University (Toronto, Canada) Faculty of Graduate Studies guidelines for Thesis and Dissertations. This class file is based on the \textsf{report} class included in every \LaTeX\ distribution. All requirements are pre-programmed and various additional bits that I found useful when writing my dissertation are included. 
-\end{abstract}
-
-\section{Description}
-
-This document specifies completely the changes the class file makes to the \textsf{report} class in order for the output to meet the York FGS specifications for Theses and Dissertations. These guidelines are available from your gradate programme office and from FGS. They are also available at 
-\texttt{http://www.yorku.ca/grads/pub/pre.htm} but this page is currently dated October 4, 2002 and may not be up to date when you read this. It is your responsibility to ensure that your output meets these requirements.
-
-\section{Usage}
-
-\subsection{Installation}
-
-The only file you need to install is the \texttt{york-thesis.cls} file. It goes in your personal \texttt{texmf} tree, wherever that is. For MacOS X users, this location is in \texttt{Library/texmf/tex/latex/} in your home folder.
-
-\subsection{Deployment}
-
-The \textsf{york-thesis} class is invoked in the standard fashion:
-\begin{quote}
-\textsf{$\backslash$documentclass[]\{york-thesis\}}
-\end{quote}
-
-The defaults are \textsf{12pt,draft,letterpaper}.\footnote{Keep in mind that the guidelines require \textsf{12pt} and \textsf{letterpaper} for the submission copies.} The \textsf{$\backslash$documentclass} command has extra functionality built into two options: \textsf{draft} and \textsf{final}. The \textsf{draft} option sets the margins to 1 inch all around and single-spaces everything (except the title page). All other \textsf{draft} features of the \textsf{report} class (such as marking overfull boxes and providing empty boxes for graphics) are left intact. The \textsf{final} option sets all parameters for producing output suitable for examination and deposit.
-
-\subsection{Preprogrammed Formats}
-\label{preprog}
-
-The York FGS guidelines are both specific and vague. Where the guidelines \textit{require} some feature, it is implemented as the default. If you change the behaviour of anything, you should confirm that this liberty is permitted by the guidelines. I have taken some liberties that are premitted --- these are detailed below.
-
-\paragraph{\textsf{quote}, \textsf{quotation}, and \textsf{verse} environments} I have made a command decision regarding these environments. The guidelines allow for single spacing these in the submission copy and I think it just looks better to do so. So, these three environments are single-spaced in both \textsf{draft} and \textsf{final}. I am planning to implement a switch for this in the future. If this is an important feature for anyone, please give me a shout.
-
-\paragraph{\textsf{$\backslash$footnote} command} Similarly with footnotes, the guidelines allows them to be single-spaced, so they are. Again, if anyone needs this soon, give me a shout.
-
-\subsection{The Template File}
-
-I have included in the package a template file that can serve as a template root document for your thesis/dissertation project. It makes a number of assumptions about how you might want your final document to look, but none are required.
-
-\begin{description}
-
-\item[\textsf{$\backslash$setcounter\{tocdepth\}\{1\}}] This command sets the depth to which the table of contents will be built. For subsections to be included set to 1, for subsubsections set to 2, etc\@.
-
-\item[\textsf{$\backslash$includeonly}] This command will tell \LaTeX\ to include only the specified file. This is handy if you need to generate only one chapter.
-
-\item[\textsf{$\backslash$include}] This command links each chapter file to the root document. I recommend doing it this way (having each chapter in a separate file) for it keeps individual files small and allows for better organisation when editing.
-
-\end{description}
-
-\subsection{Switches and Variables}
-
-\begin{description}
-
-\item[\textsf{masters}] This \textsf{boolean} sets whether this is a PhD dissertation or a Masters thesis. \\ Example: \textsf{$\backslash$setboolean\{masters\}\{true\}}
-
-\item[\textsf{hasfigures}] This \textsf{boolean} sets whether there are any figures in the text. All this switch does is tell \LaTeX\ to construct a list of figures and insert an entry for the list of figures in the table of contents. \\ Example: \textsf{$\backslash$setboolean\{hasfigures\}\{true\}}
-
-\item[\textsf{hastables}] This \textsf{boolean} sets whether there are any tables in the text. All this switch does is tell \LaTeX\ to construct a list of tables and insert an entry for the list of tables in the table of contents. \\ Example: \textsf{$\backslash$setboolean\{hastables\}\{true\}}
-
-\item[\textsf{$\backslash$title}] This variable specifies the title of the work for the title page. This must be entered in ALL CAPS. \\ Example: \textsf{$\backslash$title\{TWO DOGMAS UNLEASHED: QUINE'S ATTACK ON CARNAP\}} 
-
-\item[\textsf{$\backslash$author}] This variable specifies your name for the title page. This must be in upper and lower case. \\ Example: \textsf{$\backslash$author\{W. V. O. Quine\}} 
-
-\item[\textsf{$\backslash$department}] This variable specifies the department or graduate programme within which you are pursuing the degree. \\ Example: \textsf{$\backslash$department\{Philosophy\}} 
-
-\item[\textsf{$\backslash$date}] This variable specifies the full month and year of the defense date. It must be in upper and lower case. \\ Example: \textsf{$\backslash$date\{September 2004\}} 
-
-\item[\textsf{$\backslash$mastersof}] This variable specifies which Masters degree you are attempting. This variable has no effect if \textsf{$\backslash$boolean\{masters\}} is false, i.e., if this is a PhD dissertation.\\ Example: \textsf{$\backslash$mastersof\{Science\}} 
-
-\item[\textsf{$\backslash$abstractfile}] This variable specifies the filename of the .tex file that contains your abstract. The first line of the abstract should not be indented, so this is forced by the class file.\\ Example: \textsf{$\backslash$abstractfile\{abstract.tex\}} 
-
-\item[\textsf{$\backslash$acknowledgementsfile}] This variable specifies the filename of the .tex file that contains your acknowledgements. The first line of the acknowledgements should not be indented, so this is forced by the class file.\\ Example: \textsf{$\backslash$acknowledgementsfile\{acknowledgements.tex\}} 
-
-\item[\textsf{$\backslash$def$\backslash$resetfootnote\{$\backslash$setcounter\{footnote\}\{0\}\}}] This piece of cryptic code allows you to reset the footnote counter for each chapter. The \textsf{york-thesis} class does not reset the footnote for each chapter. If you are so inclined, you may insert this command in the preamble of your root document.
-
-\item[\textsf{$\backslash$makefrontmatter}] This command  generates the title page, abstract, acknowledgements, table of contents, and lists of tables and figures. It can be commented out until you need the front matter generated.
-
-\end{description}
-
-\subsubsection{Additional Switches, Variables, and Commands}
-
-\paragraph{\textsf{$\backslash$epigraph\{\textit{pithy quote}\}\{\textit{source}\}}} I have added a command to insert an epigraph to be used immediately after the \textsf{$\backslash$chapter} command (or wherever it strikes your fancy). It takes two arguments: a pithy quote and the source. The text is inserted right-justified with a rule underneath just after the chapter title (when invoked right after the \textsf{$\backslash$chapter} command).
-
-For example, the command 
-\begin{quote}
-\textsf{$\backslash$epigraph\{There once was a man from Nantucket$\backslash$dots\}\{Famous bawdy limerick\}}
-\end{quote}
-generates the following:
-
-\epigraph{There once was a man from Nantucket\dots}{Famous bawdy limerick}
-
-The output is single-spaced in both \textsf{draft} and \textsf{final} modes. As you can see, the possibilities are endless.
-
-\subsection{Environments}
-
-There are no new environments, but \textsf{quote}, \textsf{quotation}, and \textsf{verse} have been modified as specified in \S\ref{preprog}.
-
-\section{Miscellaneous Goodies}
-
-\subsection{Bugs}
-
-There are, of course, no bugs in this class file. In the incredibly unlikely event that it does not perform correctly, it is obvious that it is the operator's fault. Please send a detailed description of your error to me at \texttt{gall@spookyhill.net} and I will instruct you in the proper use of the class file. If, on the other hand, you have the temerity to think that there could be \textit{improvements} to this most perfect code, please send those along as well for I do enjoy condescending to those who who second-guess genius.\footnote{For the humour-impaired, if this thing is messed up, send me a detailed description of the error or improvement desired and I'll make something useful happen.}
-
-\subsection{Future Features}
-
-\begin{itemize}
-
-\item Implement a switch for the \textsf{quote}, \textsf{quotation}, and \textsf{verse} environments so that they are double-spaced in \textsf{final} mode.
-
-\item Implement a switch for the \textsf{footnote} command so that they are double-spaced in \textsf{final} mode.
-
-\item Generation of subject matter appropriate text. I forsee a \textsf{generate} option for the \textsf{$\backslash$documentclass} command. This option will, if the computer is attached to the Internet, search all available sources, generate a thesis statement (based upon the value of the \textsf{$\backslash$title} variable), and the supporting arguments for that thesis. I anticipate a great deal of extra code will be necessary, so this feature will be an ongoing project.
-
-\end{itemize}
-
-\subsection{Changes}
-
-From the class file:
-
-\begin{verbatim}
-% Version History
-% ---------------
-%
-% v1.8 2004-05-05       Removed code for the copyright page; York theses
-%                        have pre-printed copyright and certificate pages
-%                        that are un-numbered and inserted after printing
-%                        pagination for the abstract page starts at iv
-%
-% v1.7 2004-03-27       Added code to single space the verse environment
-%
-% v1.6 2003-11-21       Added code to remove chapter resets of footnote
-%                        numbering.
-%
-% v1.5 2003-09-20       Changed appearance of chapter titles:
-%                        removed \chaptername and placed the
-%                        section number on the same line as the 
-%                        label (suggested by Dave Makalsky)
-%
-% v1.4 2003-09-07       Made subsection and subsubsection sizes more
-%                        sane
-%
-% v1.3 2003-03-30       Corrected some typos and added an epigraph 
-%                        command
-%
-% v1.2 2002-02-15       Corrected error with bibliography toc line
-%
-% v1.1 2002-02-13       Modifications by Norm Gall <gall@spookyhill.net>
-%                        for York University, Toronto, ON, Canada; 
-%                        a) name changed to york-thesis
-%                        b) added a TOC entry for the Table of Contents
-%                        c) added {final | draft} option in 
-%                           \documentclass command
-%                        d) made footnote spacing single spaced in 
-%                           final
-%                        e) changed quoting environments for single 
-%                           spacing in final
-%                        f) various housekeeping functions
-%
-% v1.0  1995-04-25      Set up for distribution to others.
-%
-%   9/1997  changes by Stefan Kehrbaum (sk) to accomodate new guidelines 
-%   implemented by the graduate school in summer 1997
-%
-% v0.3  1995-01-15      Got rid of a bunch of stuff that I don't think
-%                       is needed.  I.e.,  some of the cross referencing
-%                       stuff.  I think that most people either won't
-%                       use this or they have their own macros.
-%
-% v0.2  1995-01-15      Modified slightly to conform to LaTeX2e 
-%                        suggested standards
-%
-% v0.1  1995-01-15      Test of Class file
-%                       Included (Aaron Naiman's modified version) of 
-%                       dissertation.sty
-%
-\end{verbatim}
-
-\subsection{Package Contents}
-
-This package consists of the following files and folders:
-
-\begin{itemize}
-\item \texttt{york-thesis.cls}: the class file
-\item \texttt{yorkTemplate.tex}: the template file
-\item \texttt{documentation.pdf}: this document in pdf
-\item \texttt{documentation.dvi}: this document in dvi
-\item \texttt{documentation.tex}: the source for this document
-\item \texttt{sample-thesis} folder
-\begin{itemize}
-\item \texttt{sample-thesis.tex}: a sample root document
-\item \texttt{abstract.tex}: a sample abstract
-\item \texttt{acknowledgements.tex}: sample acknowledgements
-\item \texttt{chapter-1.tex}: a sample chapter
-\item \texttt{sample-thesis.bib}: a sample bibliography
-\item \texttt{sample-thesis.pdf}: the generated thesis in pdf
-\item \texttt{sample-thesis.dvi}: the generated thesis in dvi
-\end{itemize}
-\end{itemize}
-
-\end{document}
-   
-\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/york-thesis/yorkTemplate.tex b/Master/texmf-dist/doc/latex/york-thesis/yorkTemplate.tex
deleted file mode 100644
index 7bb8504fb9e..00000000000
--- a/Master/texmf-dist/doc/latex/york-thesis/yorkTemplate.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%
-% York University FGS thesis/dissertation template 
-%            for use with york-thesis.cls (v1.8)
-%
-% The reference for this file is "Guidelines for the Preparation and 
-% Examination of Theses and Dissertations". This is available in 
-% each Graduate Programme Office as well as in the FGS Thesis Office.
-%
-% There are a few decisions I made:
-%       a) The type size in both draft and final is set as 12pt
-%       b) The paper type is set as letterpaper
-%       c) Footnotes, quotes, and quotations are set single spaced
-%               in final mode. This is an option in the FGS guidelines.
-%               You can change this in the .cls file if you
-%               really want double spaced text in these environments
-%
-% options:  final: generates depositable document according to FGS regs
-%           draft: wider margins, single spaced text [default setting]
-%
-\documentclass[draft]{york-thesis}
-
-\setboolean{masters}{false}             % set false for PhD degree
-\setboolean{hasfigures}{false}
-\setboolean{hastables}{false}
-
-\title{THE TITLE}
-\author{Author}
-\department{Department}   
-\masterof{Arts}                         % set to `Arts' or `Science'
-\date{September 2004}                   % this is the month and year of defence
-
-% Some helpful settings
-\setcounter{tocdepth}{1}                % table of contents inclusion level
-
-% If you really want footnotes to reset to 0 at the beginning of each
-% chapter, uncomment the following command:
-%
-% \def\resetfootnote{\setcounter{footnote}{0}}
-
-%========== preliminary matter =================
-%
-%       Create these in separate files; trust me
-%
-
-\abstractfile{abstract.tex}
-\acknowledgementsfile{acknowledgement.tex}
-
-%============ document control ==================
-%\includeonly{Chapter-1}
-%\includeonly{Chapter-2}
-%\includeonly{Chapter-3}
-%\includeonly{Chapter-4}
-%\includeonly{Chapter-5}
-
-%============ document begins ==================
-%
-\begin{document}
-
-\makefrontmatter
-
-%
-%   include commands for chapters here
-%
-
-\include{chapter-1}
-%\include{chapter-2}
-%\include{chapter-3}
-%\include{chapter-4}
-%\include{chapter-5}
-
-\spacing{1}		                     % I prefer single spaced bibliographies
-\bibliographystyle{plainnat}
-\bibliography{thesis}
-
-%\appendix							% if you have appendices, they go here
-%\include{appendix-a}
-%\include{appendix-b}
-%\include{appendix-c}
-\end{document}
-\end
diff --git a/Master/texmf-dist/source/latex/york-thesis/york-thesis.dtx b/Master/texmf-dist/source/latex/york-thesis/york-thesis.dtx
new file mode 100644
index 00000000000..24ea76c07c1
--- /dev/null
+++ b/Master/texmf-dist/source/latex/york-thesis/york-thesis.dtx
@@ -0,0 +1,1163 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2002--6 by Norm Gall <gall@spookyhill.net>
+% -------------------------------------------------------
+% 
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% 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.3 or later is part of all distributions of LaTeX 
+% version 2003/06/01 or later.
+%
+% This work has the LPPL maintenance status "author-maintained".
+%
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{york-thesis.dtx}
+%</driver>
+%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<class>\ProvidesClass{york-thesis}
+%<*class>
+[2006/05/16 v3.4 York University (Toronto, Canada) thesis class]
+%</class>
+%
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{listings}
+\EnableCrossrefs         
+\RecordChanges
+\widowpenalty=50000 \clubpenalty=50000
+\begin{document}
+  \DocInput{york-thesis.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{0}
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \changes{v1.0}{1995/04/25}{Set up for distribution to others}
+% \changes{v1.1}{2002/02/13}{Various housekeeping functions}
+% \changes{v2.5}{2005/04/20}{Extensive changes to comply with the new
+%   Spring 2005 FGS Thesis and Dissertation Guidelines}
+% \changes{v3.0}{2005/05/21}{Converted all code to literate
+%   programming; corrected innumerable minor errors}
+%
+% \GetFileInfo{york-thesis.dtx}
+%
+% \DoNotIndex{\newcommand,\newenvironment}
+% 
+% \title{The \textsf{york-thesis} class\thanks{This document
+%     corresponds to \textsf{york-thesis}~\fileversion, dated
+%     \filedate.}}  \author{Norm Gall \\
+%   \texttt{gall@spookyhill.net}\thanks{For the love of all that is
+%     holy, if you find errors your output, get hold of me pronto at
+%     \texttt{gall@spookyhill.net} --- I will make every effort to
+%     make the corrections quickly and get back to you. However, you
+%     need to describe the problem clearly and include the source and
+%     output that offends.}}
+%
+% \maketitle
+% \parindent = 0pt
+% \parskip = 1em
+% \begin{abstract}
+%   \noindent The \textsf{york-thesis} class implements the York
+%   University (Toronto, Canada) Faculty of Graduate Studies guidelines
+%   for Theses and Dissertations (Spring 2005). This class file is based
+%   on the \textsf{report} class included in every \LaTeX\
+%   distribution. All requirements are pre-programmed and various
+%   additional bits that I found useful when writing my dissertation are
+%   included.
+% \end{abstract}
+%
+% \section{Introduction}
+%
+% This document specifies completely the changes the class file makes
+% to the \textsf{report} class in order for the output to meet the
+% York FGS specifications for Theses and Dissertations. These
+% guidelines are available from your graduate programme office and
+% from FGS.\footnote{They are also available at
+%   \texttt{http://www.yorku.ca/grads/pub/td.htm}} It is your
+% responsibility to ensure that your output meets these requirements.
+%
+% \section{Usage}
+%
+% \subsection{Installation}
+%
+% Now that you have run both \texttt{york-thesis.ins} and
+% \texttt{york-thesis.dtx} through \LaTeX, the only file you
+% \textit{need} to install is the \texttt{york-thesis.cls} file. It
+% goes in your personal \texttt{texmf} tree, wherever that is. For
+% MacOS X users, this location is in \texttt{Library/texmf/tex/latex/}
+% in your home folder.
+%
+% If you are using emacs and AUCTeX, the file \texttt{york-thesis.el}
+% should be installed in a folder called \texttt{style} in your
+% personal \texttt{emacs-lisp} folder in your home directory. This
+% file contains some definitions for AUCTeX.
+%
+% The york-thesis-Template.tex file contains a sample master document
+% that uses all of the features provided by the class file over
+% \textsf{report.cls}. If you forget to set anything, the defaults
+% from the class file will be used, so review your output carefully.
+%
+% \subsection{Deployment}
+% 
+% \DescribeMacro{\documentclass} Use: |\documentclass| \oarg{options}
+% \{\textsf{york-thesis}\}
+%
+% The \textsf{york-thesis} class is invoked in the standard
+% fashion. The defaults are
+% \textsf{letterpaper,10pt,oneside,onecolumn,draft,openany}. The
+% |\documentclass| command has extra functionality built into two
+% options: \textsf{draft} and \textsf{final}. The \textsf{draft}
+% option sets the margins to 1 inch all around and single-spaces
+% everything. All other \textsf{draft} features of the \textsf{report}
+% class (such as marking overfull boxes and providing empty boxes for
+% graphics) are left intact, if you explicitly declare \textsf{draft};
+% otherwise, you get the graphics drawn and bad boxes are not marked.
+% The \textsf{final} option, by itself in the options list, sets all
+% parameters for producing output suitable for examination and
+% deposit. All other options are available, though some (like
+% \textsf{titlepage}) do nothing.\footnote{If you declare
+%   \textsf{twocolumn}, the output may be goofy. I intend to make this
+%   a real option in future. See \S\ref{future}.}
+%
+% \subsection{Preprogrammed Formats}
+% \label{preprog}
+%
+% The York FGS guidelines are both specific and vague. Where the
+% guidelines \textit{require} some feature, it is implemented as the
+% default. If you change the behaviour of anything, you should confirm
+% that this liberty is permitted by the guidelines. I have taken some
+% liberties that are permitted---these are detailed below.
+%
+% \DescribeMacro{\chapter} \DescribeMacro{\section}
+% \DescribeMacro{\subsection} \DescribeMacro{\subsubsection}
+% \DescribeMacro{\paragraph} I have made the size and spacing of the
+% output these commands less idiotic---that is, smaller. The chapter
+% type size is slightly larger than that for the others (|\Large|
+% rather than |\Huge|), but the others are now simply |\large|, save
+% |\paragraph|, which is |\normalsize|. Additionally, the chapter
+% command gives you a chapter number with the title on a single line
+% without the word `Chapter' to remind you that this is where a
+% chapter begins. I think we can all tell from the context.
+%
+% \DescribeMacro{\appendix} Appendices are marked with
+% capital Roman letters (i.e., A, B, C, et cetera), and treated
+% exactly the same as a normal chapter.
+%
+% \DescribeEnv{quote} \DescribeEnv{quotation} \DescribeEnv{verse} I
+% have made a command decision regarding these environments. The
+% guidelines allow for single spacing these in the submission copy and
+% I think it just looks better to do so. So, these three environments
+% are single-spaced in both \textsf{draft} and \textsf{final}. I am
+% planning to implement a switch for this in the future. If this is an
+% important feature for anyone, please give me a shout.
+%
+% \DescribeMacro{\footnote} The guidelines allow footnotes to be
+% single-spaced, so they are. Also, I have set the footnote
+% continuation bar (the one that gets drawn when footnotes continue on
+% the next page) to be drawn across the width of the text. Again, if
+% anyone needs a switch to double space their footnotes soon, give me
+% a shout.
+%
+% \subsection{Booleans and Macros}
+%
+% \subsubsection{Preamble Material}
+%
+% These booleans and macros must be set before the |document|
+% environment begins.
+%
+% \DescribeMacro{masters} This \textsf{boolean} sets whether the
+% document should be typeset as a PhD dissertation or a Masters
+% thesis.
+%
+% \DescribeMacro{hasfigures} This \textsf{boolean} sets whether there
+% are any figures in the text. All this switch does is tell \LaTeX\ to
+% construct a list of figures and insert an entry for the list of
+% figures in the table of contents.
+%
+% \DescribeMacro{hastables} This \textsf{boolean} sets whether there
+% are any tables in the text. All this switch does is tell \LaTeX\ to
+% construct a list of tables and insert an entry for the list of
+% tables in the table of contents.
+%
+% \DescribeMacro{\title} This macro specifies the title of the work
+% for the title page.
+%
+% \DescribeMacro{\author} This macro specifies your name for the title
+% page.
+%
+% \DescribeMacro{\department} This macro specifies the department or
+% graduate programme within which you are pursuing the degree.
+%
+% \DescribeMacro{\date} This macro specifies the full month and year
+% of the defense date.
+%
+% \DescribeMacro{\committeememberslist} Use: |\committeememberslist|
+% \marg{enumerated list}
+%
+% This macro specifies the list of your
+% examination committee members for the authenticity page, if you are
+% printing one. What goes into the macro must be an enumerated list.
+%
+% \DescribeMacro{\mastersof} This macro specifies which Masters degree
+% you are attempting (i.e., Master of Science, Master of Arts). This
+% macro has no effect if |\boolean{masters}| is false, i.e., if this
+% is a PhD dissertation.
+%
+% \DescribeMacro{\degreename} This macro specifies the name of the
+% degree you are attempting: Master or Magisteriate, Doctor or
+% Doctorate.
+%
+% \DescribeMacro{\abstractfile} This macro specifies the filename of
+% the .tex file that contains your abstract. If you do not specify a
+% file, nothing is typeset. The macro constructs the title and table
+% of contents entry for the page. All you need to do in the file is
+% enter the text. The first line of the abstract should not be
+% indented, so this is forced by the class file.
+%
+% \DescribeMacro{\dedicationfile} This macro specifies the filename of
+% the .tex file that contains your dedication text. All you need to do
+% here is specify the text of your dedication.
+%
+% \changes{v3.2}{2006/01/31}{Added the \textsf{dedicationfile} macro.}
+%
+% \DescribeMacro{\acknowledgementsfile} This macro specifies the
+% filename of the .tex file that contains your acknowledgements. If
+% you do not specify a file, nothing is typeset.  The macro constructs
+% the title and table of contents entry for the page. All you need to
+% do in the file is enter the text.  The first line of the
+% acknowledgements should not be indented, so this is forced by the
+% class file.
+%
+% \DescribeMacro{\prefacefile} This macro specifies the filename of
+% the .tex file that contains your preface. If you do not specify a
+% file, nothing is typeset.  The macro constructs the title and table
+% of contents entry for the page. All you need to do in the file is
+% enter the text.  The first line of the preface should not be
+% indented, so this is forced by the class file.
+%
+% \DescribeMacro{\abbreviationsfile} This macro specifies the filename
+% of the .tex file that contains any abbreviations for citations, et
+% cetera, that you are going to use in the text. If you do not specify
+% a file, nothing is typeset.  The macro constructs the title and
+% table of contents entry for the page. All you need to do in the file
+% is enter the text.  The first line of the abbreviations page should
+% not be indented, so this is forced by the class file.
+%
+% \subsubsection{Source Material}
+% \label{sourcemat}
+%
+% These macros are used inside the |document| environment.
+%
+% \DescribeMacro{\makefrontmatter} This macro generates the title
+% page, abstract, acknowledgements, preface, abbreviations page, table
+% of contents, and lists of tables and figures. It can be commented
+% out until you need the front matter generated.
+%
+% \DescribeMacro{\epigraph} Use: |\epigraph| \marg{pithy quote}
+% \marg{source} 
+%
+% I have added a command to insert an epigraph to be used inside an
+% |epigraphs| environment immediately after the |\chapter| command (or
+% wherever it strikes your fancy). It takes two arguments: a pithy
+% quote and the source. The text is inserted right-justified with a
+% rule underneath just after the chapter title (when invoked right
+% after the |\chapter| command). The output is single-spaced in
+% \texttt{draft} mode and double-spaced in \texttt{final} mode. As you
+% can see, the possibilities are endless.
+%
+% \subsection{Environments}
+%
+% The |quote|, |quotation|, and |verse| environments have been
+% modified as specified in \S\ref{preprog}.
+%
+% \DescribeEnv{epigraphs} This environment allows for the setting of
+% epigraphs---if you are so inclined. It is a list environment and
+% uses the |\epigraph| macro as the list item as specified in
+% \S\ref{sourcemat}.
+%
+% \DescribeEnv{fquote} \DescribeEnv{fquotation} \DescribeEnv{fverse}
+% These environments are redefinitions of the corresponding
+% environments for use inside footnotes. They properly set the text
+% size to |\footnotesize| and control the spacing appropriately.
+%
+% \section{Miscellaneous Goodies}
+%
+% \subsection{Bugs}
+%
+% There are, of course, no bugs in this class file. In the incredibly
+% unlikely event that it does not perform correctly, it is obvious that
+% it is the operator's fault. Please send a detailed description of your
+% error to me at \texttt{gall@spookyhill.net} and I will instruct you in
+% the proper use of the class file. If, on the other hand, you have the
+% temerity to think that there could be \textit{improvements} to this
+% most perfect code, please send those along as well for I do enjoy
+% condescending to those who dare second-guess genius.\footnote{For the
+%   humour-impaired, if this thing is messed up, send me a detailed
+%   description of the error or improvement desired and I'll make
+%   something useful happen.}
+%
+% \subsection{Future Features}
+% \label{future}
+%
+% \begin{itemize}
+%
+% \item Implement a switch for the |quote|, |quotation|, |verse|
+%   environments so that they can be set to double-space in
+%   \textsf{final} mode.
+%
+% \item Implement a switch for the |\footnote| command so that they
+%   can be double-spaced in \textsf{final} mode.
+%
+% \item Some people might want to have the option of setting their
+%   \textsf{draft} documents two sided and/or two columned (i.e., any
+%   damned way they want). If you do so right now, things may look
+%   goofy (most of the frontmatter, for instance). I want to make it
+%   such that a decent looking \textsf{draft} document can be
+%   generated. My idea here is that users might want to make their
+%   thesis/dissertation look like a book at the end of the day, since
+%   the \textsf{final} document is not set like a book. This is not a
+%   high priority.
+%
+% \item Generation of subject matter appropriate text. I forsee a
+%   |generate| option for the |\documentclass| command. This option
+%   will, if the computer is attached to the Internet, search all
+%   available sources, generate a thesis statement (based upon the
+%   value of the |\title| macro), and the supporting arguments for
+%   that thesis. I anticipate a great deal of extra code will be
+%   necessary, so this feature will be an ongoing project.
+%
+% \end{itemize}
+%
+% \StopEventually{\PrintChanges}
+%
+% \section{Implementation}
+%
+% \subsection{Initial Code}
+%
+% All of these packages are in the standard distribution of
+% \LaTeX. I've included the \textsf{makeidx} so I can re-define
+% |\printindex|. The |saving| boolean is defined here for use with the
+% class options.
+%
+%    \begin{macrocode}
+\RequirePackage{ifthen} 
+\RequirePackage{calc}
+\RequirePackage{makeidx}
+\newboolean{saving}
+%    \end{macrocode}
+%
+% \subsection{Declaration of Options}
+%
+% \changes{v1.1}{2002/02/13}{added \textsf{final} and \textsf{draft}
+%   options in \textsf{documentclass} macro.}
+% \changes{v3.0}{2005/05/21}{changed the fashion in which options are
+%   processed so that \textsf{report.cls} correctly gets the draft and
+%   final options.}  \changes{v3.0}{2005/05/21}{FGS guidelines allow
+%   for 10pt, 11pt, and 12pt type now. I no longer enforce 12pt;
+%   however, it is set as the default. Other type sizes must be
+%   explicitly declared.}
+%
+% All of the options available to the |report| class are available in
+% \textsf{york-thesis}.\footnote{Do not use the |titlepage| and
+%   |abstract| environments from \textsf{report.cls}. The title page
+%   and the abstract are taken care of by the |makefronmatter|
+%   macro.} I have changed the default options (i.e., the option set
+%   executed where there are no explicitly declared options in the
+%   |\documentclass| macro. There are also two changes to the standard
+%   behaviour of two options: \textsf{draft} and \textsf{final}.
+%
+% The default option list is:
+%   \textsf{letterpaper,10pt,oneside,onecolumn,draft,openany}
+%
+% I have set the options up in a way that increases the number of
+% options for typesetting the document.
+%
+% If \textsf{draft} is declared \textit{implicitly} (that is, neither
+% \textsf{draft} or \textsf{final} is declared in the options list),
+% then all text is set to single-spacing, graphics are drawn, and bad
+% boxes are not marked.
+%
+% If draft is declared \textit{explicitly} (that is, \textsf{draft} is
+% declared in the options list), then all text is set to
+% single-spaced, graphics are not drawn (bounding boxes are drawn),
+% and bad boxes are marked.
+%
+% If \textsf{final} is declared, the text is set to double-space (as
+% described in \S\ref{preprog}), one sided printing, and one
+% column. If \textsf{final} is declared alone, what you get is
+% acceptable by FGS for deposit.
+%
+%    \begin{macrocode}
+\DeclareOption{draft}{\setboolean{saving}{true}}
+\DeclareOption{final}{\setboolean{saving}{false}
+  \PassOptionsToClass{letterpaper,12pt,oneside,%
+    onecolumn,final,openany}{report}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
+\ExecuteOptions{draft}
+%    \end{macrocode}
+%
+% \subsection{Execution of Options}
+%
+%    \begin{macrocode}
+\ProcessOptions
+%    \end{macrocode}
+%
+% \subsection{Package Loading}
+%
+%    \begin{macrocode}
+\LoadClass{report}
+%    \end{macrocode}
+%
+% \subsection{Main Code}
+%
+% \subsubsection{Preliminary Matter}
+%
+% I need to re-define a number of standard macros and settings to get
+% everything to come out exactly right. This is where that magic
+% happens.
+%
+%    \begin{macrocode}
+\let\oldquote\quote \let\oldendquote\endquote
+\let\oldquotation\quotation \let\oldendquotation\endquotation
+\let\oldverse\verse \let\oldendverse\endverse
+\let\oldbibliography\bibliography
+\let\oldendbibliography\endbibliography
+\let\oldprintindex\printindex
+%    \end{macrocode}
+%
+%
+% The following are booleans along with their initial values
+%
+% \changes{v2.5}{2005/04/20}{added the boolean
+%   \textsf{authenticitypage}} \changes{v3.0}{2005-05-21}{removed the
+%   boolean \textsf{authenticitypage}; the authenticity page is now
+%   always generated}
+%
+% \begin{macro}{hasfigures}
+%
+% This \textsf{boolean} sets whether a list of figures should be
+% generated 
+%
+% \begin{macrocode}
+\newboolean{hasfigures}\setboolean{hasfigures}{false}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{hastables}
+%
+% This \textsf{boolean} sets whether a list of tables should be
+% generated 
+%
+% \begin{macrocode}
+\newboolean{hastables}\setboolean{hastables}{false}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{masters}
+% 
+%   The |masters| boolean was taken from dissertation.sty with
+%   modification. If set \textsf{true}, you will need to specify which
+%   master's degree you are pursuing with the |\masterof| macro.
+%
+%    \begin{macrocode}
+\newboolean{masters}\setboolean{masters}{false}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\spacing}
+%
+%   I redefine |\baselinestretch| and recompute |\baselineskip|
+%   lateral effect: set typeface to normal size roman
+%
+%    \begin{macrocode}
+\newcommand{\spacing}[1]{\renewcommand{\baselinestretch}{#1}%
+  \large\normalsize}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@removefromreset}
+%
+%   I define a command that can undo footnote reset between chapters
+%   (shamelessly lifted from removefr.sty by Donald Arseneau) and then
+%   do it.
+%
+%    \begin{macrocode}
+\def\@removefromreset#1#2{\let\@tempb\@elt
+  \expandafter\let\expandafter\@tempa\csname c@#1\endcsname
+  \def\@elt##1{\expandafter\ifx\csname c@##1\endcsname\@tempa\else
+    \noexpand\@elt{##1}\fi}%
+  \expandafter\edef\csname cl@#2\endcsname{\csname cl@#2\endcsname}%
+  \let\@elt\@tempb}
+\@removefromreset{footnote}{chapter}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\resetfootnote}
+% 
+%   Here I undo the hideous |\@addtoreset| in \textsf{report.cls}
+%
+%    \begin{macrocode}
+\def\resetfootnote{\setcounter{footnote}{0}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\footnotetext}
+%
+%   Make footnotes single spaced, footnote continuation lines
+%        longer
+%
+%        \changes{v1.1}{2002/02/13}{made footnote spacing single
+%          spaced in final}
+%
+%        \changes{v3.4}{2006/05/16}{stole code from footmisc to
+%          lengthen footnote continuation lines}
+%
+%
+%    \begin{macrocode}
+\long\def\@footnotetext#1{%
+ \insert\footins{%
+  \def\baselinestretch {1}%
+  \reset@font\footnotesize
+  \interlinepenalty\interfootnotelinepenalty
+  \splittopskip\footnotesep
+  \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+  \hsize\columnwidth
+  \@parboxrestore
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+  \color@endgroup}}
+\gdef\split@prev{0} 
+\let\pagefootnoterule\footnoterule 
+\let\mpfootnoterule\footnoterule 
+\def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@} 
+\def\footnoterule{\relax 
+ \ifx \@listdepth\@mplistdepth 
+   \mpfootnoterule 
+ \else 
+   \ifnum\split@prev=\z@ 
+   \pagefootnoterule 
+ \else 
+   \splitfootnoterule 
+   \fi 
+   \xdef\split@prev{\the\insertpenalties}% 
+ \fi 
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\appendix}
+%
+%   Renew the |\appendix| command to deal with spacing in appendices
+%   correctly
+%
+%    \begin{macrocode}
+\renewcommand\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\thechapter{\@Alph\c@chapter}
+  \ifthenelse{\boolean{saving}}{\spacing{1}}{\spacing{2}}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\bibliography}
+%
+%   Renew the |\bibliography| macro so that it puts in its own toc entry
+%
+%    \begin{macrocode}
+\renewenvironment{bibliography}[1]%
+  {\addcontentsline{toc}{chapter}{Bibliography}\oldbibliography {#1}}%
+  {\oldendbibliography}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\printindex}
+%
+%   Renew the |\printindex| macro so that it puts in its own toc entry
+%
+%    \begin{macrocode}
+\renewcommand{\printindex}{\newpage%
+  \addcontentsline{toc}{chapter}{Index}\oldprintindex}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hugeskip}
+%
+%   Skip twice as much as the TeX command |\bigskip|
+%
+%    \begin{macrocode}
+\def\hugeskip{\vskip 24pt plus 8pt minus 8pt}
+%    \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\@ifdefined} 
+%
+%   Expand second argument if the command in the first argument is not
+%   defined
+%
+%    \begin{macrocode}
+\def\@ifdefined#1#2{\@ifundefined{#1}{}{#2}}
+%    \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\@makechapterhead}
+%
+%   These macros are redefined here to use not-so-huge type and to
+%   provide chapters of form: N chaptername
+%
+%   \changes{v1.5}{2003/09/20}{Changed appearance of chapter titles:
+%     removed \textsf{chaptername} and placed the section number on
+%     the same line as the label (suggested by Dave Makalsky)}
+%
+%    \begin{macrocode}
+\def\@makechapterhead#1{ \vspace*{50pt} { \parindent 0pt
+    \raggedright%
+    \ifnum \c@secnumdepth > \m@ne \Large\bf 
+    \thechapter \hskip 1em \fi \Large \bf #1\par
+    \nobreak \vskip 40pt } }
+\def\@makeschapterhead#1{ \vspace*{50pt} { \parindent 0pt \raggedright
+    \Large \bf #1\par
+    \nobreak \vskip 40pt }}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\section}
+%
+%  This section of code re-defines some standard stuff for sanity.
+%
+%    \begin{macrocode}
+\renewcommand\section{\@startsection {section}{1}{\z@}%
+                                 {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                 {2.3ex \@plus.2ex}%
+                                 {\normalfont\large\bfseries}}
+\renewcommand\subsection{\@startsection {subsection}{1}{\z@}%
+                                 {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                 {2.3ex \@plus.2ex}%
+                                 {\normalfont\normalsize\bfseries}}
+\renewcommand\subsubsection{\@startsection {subsubsection}{1}{\z@}%
+                                 {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                 {2.3ex \@plus.2ex}%
+                                 {\normalfont\normalsize\bfseries}}
+%    \end{macrocode}
+% \end{macro}
+%
+% We rename the headings for the toc, lof, and the references.
+%
+%    \begin{macrocode}
+\renewcommand\contentsname{Table of Contents}
+\renewcommand\listfigurename{List of Figures}
+\renewcommand\listtablename{List of Tables}
+\renewcommand\bibname{Bibliography}
+%    \end{macrocode}
+%
+% We modify the definitions for the various contents headers 
+%
+%    \begin{macrocode}
+\newcommand{\contentsheader}[2] { \addtocontents{#1} {
+    \centerline{\underline{#2}\protect\hfill%
+      \underline{Page}}}}
+\renewcommand\tableofcontents { \chapter*{\contentsname}
+  \addcontentsline{toc}{chapter}{Table of Contents}
+  \@starttoc{toc}} 
+\renewcommand\listoffigures { \chapter*{\listfigurename}
+  \addcontentsline{toc}{chapter}{List of Figures}
+  \@starttoc{lof}} 
+\renewcommand\listoftables { \chapter*{\listtablename}
+  \addcontentsline{toc}{chapter}{List of Tables}
+  \@starttoc{lot}}
+%    \end{macrocode}
+%
+% \subsubsection{Margins and spacing}
+%
+% Rules taken from York FGS Guidelines for Theses and Dissertations
+%
+% The style guide, for the final deposited verrsion, requires 1.5in
+% left and top margin and 1.0in right and bottom margins.
+%
+% If |\boolean{saving}| is true, set for draft; otherwise, set for
+% final
+%
+%    \begin{macrocode}
+\ifthenelse{\boolean{saving}} {%
+  \setlength {\topmargin}{0.0in}
+  \setlength {\textheight}{\paperheight-2.5in}
+  \setlength {\oddsidemargin}{0.0in}
+  \setlength {\evensidemargin}{0.0in}
+  \setlength {\textwidth}{\paperwidth-2in}
+  \spacing{1}
+  } {%
+  \setlength {\topmargin}{0.65in}
+  \setlength {\textheight}{\paperheight-3.05in}
+  \setlength {\oddsidemargin}{0.6in}
+  \setlength {\evensidemargin}{0.1in}
+  \setlength {\textwidth}{\paperwidth-2.65in}
+  \setlength {\footskip}{0.3in}
+  \spacing{2}
+%    \end{macrocode}
+%
+% \begin{environment}{quote}
+%
+%   \changes{v1.1}{2002/02/13}{changed \textsf{quote} environment for
+%     single spacing in \textsf{final}}
+%
+% \begin{macrocode}
+  \renewenvironment{quote}{\oldquote\spacing{1}}%
+       {\oldendquote\spacing{2}}
+%    \end{macrocode}
+% \end{environment}
+%
+% \begin{environment}{quotation}
+%
+%   \changes{v1.1}{2002/02/13}{changed \textsf{quotation} environment
+%     for single spacing in \textsf{final}}
+%
+% \begin{macrocode}
+  \renewenvironment{quotation}{\oldquotation\spacing{1}}%
+       {\oldendquotation\spacing{2}}
+%    \end{macrocode}
+% \end{environment}
+%
+% \begin{environment}{verse}
+%
+%   \changes{v1.1}{2002/02/13}{changed \textsf{verse} environment for
+%     single spacing in \textsf{final}}
+%
+% \begin{macrocode}
+  \renewenvironment{verse}{\oldverse\spacing{1}}%
+       {\oldendverse\spacing{2}}}
+%    \end{macrocode}
+% \end{environment}
+%
+% Let's space the footnotes nicely and, since we have no headers,
+% remove them from the page layout.
+%
+%    \begin{macrocode}
+\setlength {\footnotesep}{14pt}
+\setlength {\headheight}{0in}
+\setlength {\headsep}{0in}
+%    \end{macrocode}
+%
+% \subsubsection{Commands to define parameters for the front matter}
+% 
+% There are two kinds of commands that define parameters for the front
+% matter: macros that provide info (like |\author| or |\abstractfile|)
+% and booleans that set flags.
+% 
+% The following are the definitions of the macros that provide info
+% (standard LaTeX commands like |\author| are omitted because they are
+% already defined).
+%
+% \changes{v2.5}{2005/04/20}{added \textsf{degreename},
+%   \textsf{committeememberslist}}
+%
+%    \begin{macrocode}
+\def\department#1{\gdef\@department{#1}}
+\def\masterof#1{\gdef\@masterof{#1}}
+\def\abstractfile#1{\gdef\@abstractfile{#1}}
+\def\dedicationfile#1{\gdef\@dedicationfile{#1}}
+\def\acknowledgementsfile#1{\gdef\@acknowledgementsfile{#1}}
+\def\prefacefile#1{\gdef\@prefacefile{#1}}
+\def\abbreviationsfile#1{\gdef\@abbreviationsfile{#1}}
+\def\committeememberslist#1{\gdef\@committeememberslist{#1}}
+\def\degreename#1{\gdef\@degreename{#1}}
+%    \end{macrocode}
+%
+% The following are the initial values for some macros that provide
+% info.
+%
+%    \begin{macrocode}
+\gdef\@author{YOUR FULL NAME} \gdef\@title{{\bf THE TITLE OF YOUR
+    WORK}} \gdef\@date{\number\year} \gdef\@department{PHILOSOPHY}
+\gdef\@masterof{Arts} \gdef\@committeememberslist{%
+  \begin{enumerate}%
+  \item Joanne Examiner%
+  \item Fred P. Questioner%
+  \end{enumerate}}
+\ifthenelse{\boolean{masters}}{\gdef\@degreename{MASTER}}%
+  {\gdef\@degreename{DOCTOR}}
+%    \end{macrocode}
+%
+% \subsubsection{Generate frontmatter}
+% 
+% \begin{macro}{\makefrontmatter}
+%     
+%   What we want is a single macro that will generate all of the
+%   frontmatter of the document, such as, the title page, abstract,
+%   authenticity page, table of contents, etc.\@ Each page of the
+%   frontmatter is created by individual macros. This keeps things
+%   modular and tidy. Any sections of the frontmatter that are not
+%   declared are ignored.
+%
+% \changes{v1.1}{2002/02/13}{added a TOC entry for the Table of
+%   Contents}
+%
+%    \begin{macrocode}
+\def\makefrontmatter{%
+  \pagestyle {empty}
+  \pagenumbering {roman}
+  \maketitlepage
+  \makecopyrightpage
+  \makeauthenticitypage
+  \@ifdefined {@abstractfile}{\makeabstract}
+  \pagestyle {plain}
+  \@ifdefined {@dedicationfile}{\makededication}
+  \@ifdefined {@acknowledgementsfile}{\makeacknowledgements} 
+  \tableofcontents
+  \ifthenelse{\boolean{hastables}}{\listoftables}{}
+  \ifthenelse{\boolean{hasfigures}}{\listoffigures}{}
+  \@ifdefined{@prefacefile}{\makepreface}
+  \@ifdefined{@abbreviationsfile}{\makeabbreviations}
+  \newpage
+  \pagenumbering {arabic}
+  \setcounter {page}{1}}
+%    \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\maketitlepage}
+%
+%   The title page is standard. The guidelines require uppercase
+%   throughout, so I have forced this wherever necessary.
+%
+% \changes{v3.3}{2002/03/07}{removed the tabular environment from
+% around the title macro. I still have the problem of not being able
+% to force a line break inside the title macro.}
+%
+%    \begin{macrocode}
+\def\maketitlepage{
+  \vspace*{.85in}
+  \begin{center}
+    \spacing{1}
+    \textbf{\MakeUppercase{\@title}}
+    \hugeskip
+    \hugeskip
+    \hugeskip
+    {\bigskip \MakeUppercase{\@author}}
+  \end{center}
+  \hugeskip \hugeskip \hugeskip \hugeskip \hugeskip \hugeskip
+  {\spacing{1}
+    \begin{center}
+      \ifmasters A THESIS \else A DISSERTATION \fi
+      SUBMITTED TO THE FACULTY OF GRADUATE STUDIES \\
+      IN PARTIAL FULFILMENT OF THE REQUIREMENTS \\
+      FOR THE DEGREE OF \\
+      \hugeskip \hugeskip \hugeskip 
+      \ifmasters \MakeUppercase{\@degreename} OF
+      \MakeUppercase{\@masterof} 
+      \else
+      \MakeUppercase{\@degreename} OF PHILOSOPHY \fi \\
+      \hugeskip \hugeskip
+      GRADUATE PROGRAM IN \MakeUppercase{\@department} \\
+      YORK UNIVERSITY \\
+      TORONTO, ONTARIO \\
+      \MakeUppercase{\@date}
+    \end{center}}
+  \newpage }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\copyrightpage}
+% 
+% The copyright page has to be centred both left and right and up and
+% down \textit{between the margins}. Not hard to do but a little bit
+% of a pain to make come out just right.
+%
+% The author might be using the department generated copyright pages,
+% but I have no idea if this is still a common practice. So, the
+% copyright page is always generated.
+%
+%    \begin{macrocode}
+\def\makecopyrightpage{%
+  \begin{center}
+    \setlength{\fboxrule}{.004in} \setlength{\fboxsep}{2cm} 
+    \mbox{}
+    \par\vspace*{\stretch{1}}
+    \fbox{\parbox{4in}{%
+      \spacing{1} 
+      \begin{center} 
+        \textbf{\MakeUppercase{\@title}} 
+      \end{center} by
+      \textbf{\@author}
+
+      \bigskip
+      a \ifmasters thesis \else dissertation \fi submitted to the 
+      Faculty of Graduate Studies of York University in partial 
+      fulfilment of the requirements for the degree of 
+      \begin{center}
+        \ifmasters \textbf{\MakeUppercase{\@degreename} OF
+          \MakeUppercase{\@masterof}} 
+        \else 
+          \textbf{\MakeUppercase{\@degreename} OF PHILOSOPHY} \fi \\ 
+                   $\copyright$\ \number\year \\
+      \end{center}
+
+      Permission has been granted to: a) YORK UNIVERSITY LIBRARIES
+      to lend or sell copies of this dissertation in paper,
+      microform or electronic formats, and b) LIBRARY AND ARCHIVES
+      CANADA to reproduce, lend, distribute, or sell copies of this
+      \ifmasters thesis \else dissertation \fi anywhere in the world
+      in microform, paper or electronic formats \textit{and} to
+      authorise or procure the reproduction, loan, distribution or
+      sale of copies of this \ifmasters thesis \else dissertation
+      \fi anywhere in the world in microform, paper or electronic
+      formats.
+
+      \bigskip The author reserves other publication rights, and
+      neither the \ifmasters thesis \else dissertation \fi nor
+      extensive extracts for it may be printed or otherwise
+      reproduced without the author's written permission.}}
+  \vspace*{\stretch{1}}
+\end{center}
+\newpage}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makeauthenticitypage}
+%
+% This page is used in lieu of a Certificate page when the thesis or
+% dissertation is being deposited electronically. Now that we can do
+% this, I have no idea why anyone \textit{wouldn't} submit
+% electronically. As such, we will always have an authenticity
+% page. If you don't like it, throw it away and stick a certificate
+% page in.
+%
+%    \begin{macrocode}
+\def\makeauthenticitypage{%
+  \par\vfill
+  {\spacing{1}
+    \begin{center}
+      \textbf{\MakeUppercase{\@title}} \hugeskip\hugeskip by
+      \textbf{\@author}
+    \end{center}
+    \hugeskip\noindent By virtue of submitting this document
+    electronically, the author certifies that this is a true
+    electronic equivalent of the copy of the \ifmasters thesis \else
+    dissertation \fi approved by York University for the award of
+    the degree. No alteration of the content has occurred and if
+    there are any minor variations in formatting, they are as a
+    result of the coversion to Adobe Acrobat format (or similar
+    software application).  \hugeskip
+    \begin{flushright}
+      \begin{minipage}[t]{4in}
+        Examination Committee Members: \@committeememberslist
+      \end{minipage}
+    \end{flushright}}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makeabstract}
+%
+% The abstract page is pretty standard. It sets up a toc entry, starts
+% a new chapter, and forces a non-indented first paragraph.
+%
+%    \begin{macrocode}
+\def\makeabstract{%
+  \chapter*{Abstract}
+  \addcontentsline {toc}{chapter}{Abstract}
+  \noindent
+  \@input{\@abstractfile}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makededication}
+%
+%   \changes{v3.2}{2006/01/31}{Added the \textsf{makededication} and
+%     \textsf{dedicationfile} macro.}  
+%
+%   The dedication page is pretty simple. It just sets whatever is in
+%   your dedication.tex file.
+%
+%    \begin{macrocode}
+\def\makededication{%
+  %\chapter*{Abstract}
+  %\addcontentsline {toc}{chapter}{Abstract}
+  %\noindent
+  \newpage
+  \@input{\@dedicationfile}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makepreface}
+%
+% We need to include the preface file, if specified
+%
+% \changes{v2.0}{2004/05/13}{Added prefacefile support}
+%
+%    \begin{macrocode}
+\def\makepreface{%
+  \chapter*{Preface}
+  \addcontentsline {toc}{chapter}{Preface}
+  \noindent
+  \@input{\@prefacefile}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makeabbreviations}
+%
+% This page will probably be rarely used. If you have a lot of
+% references from one or two authors, sometimes it is clearer to use
+% an abbreviation rather than the sometimes cryptic in-line
+% citation. This is the page where you provide the legend. 
+%
+% I have found this particularly useful in conjunction with
+% \texttt{natbib}'s |\citepalias| and |\citetalias| macros.
+%
+%    \begin{macrocode}
+\def\makeabbreviations{%
+  \chapter*{Abbreviations}
+  \addcontentsline{toc}{chapter}{Abbreviations}
+  \noindent
+  \@input{\@abbreviationsfile}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\makeacknowledgements}
+%
+%    \begin{macrocode}
+\def\makeacknowledgements{% 
+  \chapter*{Acknowledgements}
+  \addcontentsline{toc}{chapter}{Acknowledgements}
+  \noindent
+  \@input{\@acknowledgementsfile}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Other new commands and environments}
+%
+% \begin{environment}{epigraphs}
+% \begin{macro}{\epigraph}
+%       
+%   Constructed with stolen code from epigraph.sty by Peter Wilson
+%   (pandgwilson at earthlink dot net)
+%
+%   This is simple: |\epigraph| macros go in an |epigraphs| environment
+%
+% \changes{v3.0}{2005/05/21}{Set \textsf{epigraphwidth} to .8 of the
+%   \textsf{columnwidth} rather than the \textsf{textwidth}}
+%
+% \changes{v3.1}{2005/07/27}{Make \textsf{epigraphs} environment
+% single-spaced in all output modes.}
+%
+%    \begin{macrocode}
+\newlength{\epigraphwidth}\setlength{\epigraphwidth}{.8\columnwidth}
+\newlength{\epigraphrule}\setlength{\epigraphrule}{.4\p@}
+\newcommand{\@epirule}{\rule[.5ex]{\epigraphwidth}{\epigraphrule}}
+\newcommand{\epigraph}[2]%
+  {\item #1\vspace{-12pt}\begin{flushright}#2\end{flushright}}
+\newcommand{\epigraphlabel}[1]{\hfill}
+\newenvironment{epigraphs}{%
+    \begin{flushright}
+      \begin{minipage}{\epigraphwidth}
+        \list{}%
+     {\itemindent\z@ \labelwidth\z@ \labelsep\z@
+      \leftmargin\z@ \rightmargin\z@
+      \let\makelabel\epigraphlabel}}%
+  {\endlist\vspace{-18pt}\@epirule\vspace{24pt}\end{minipage}\end{flushright}}
+\let\oldepigraphs\epigraphs \let\oldendepigraphs\endepigraphs
+\ifthenelse{\boolean{saving}}{}{%
+  \renewenvironment{epigraphs}{\oldepigraphs\spacing{1}}%
+       {\oldendepigraphs\spacing{2}}
+}
+%    \end{macrocode}
+%   \end{macro}
+% \end{environment}
+%
+% \begin{environment}{fquote}
+%
+%   The |fquote| environment corrects for line spacing and indentation
+%   when used inside a |\footnote|.
+%
+% \changes{v2.0}{2004/05/13}{Added \textsf{fquote} environment for
+%   footnotes}
+%
+%    \begin{macrocode}
+\newenvironment{fquote}%
+  {\oldquote\footnotesize}%
+  {\oldendquote\normalsize}
+%    \end{macrocode}
+% \end{environment}
+% \begin{environment}{fquotation}
+%
+%   The |fquotation| environment corrects for line spacing and indentation
+%   when used inside a |\footnote|.
+%
+% \changes{v2.0}{2004/05/13}{Added \textsf{fverse} environment for
+%   footnotes}
+%
+%    \begin{macrocode}
+\newenvironment{fquotation}{\oldquotation\footnotesize}%
+     {\oldendquotation\normalsize}
+%    \end{macrocode}
+% \end{environment}
+% \begin{environment}{fverse}
+%   The |fverse| environment corrects for line spacing and indentation
+%   when used inside a |\footnote|.
+%
+% \changes{v2.0}{2004/05/13}{Added \textsf{fverse} environment for
+%   footnotes}
+%
+%    \begin{macrocode}
+\newenvironment{fverse}{\oldverse\footnotesize}%
+     {\oldendverse\normalsize}
+%    \end{macrocode}
+% \end{environment}
+%
+% \begin{macro}{\threestars}
+%      The |threestars| macro gives a centred set of three asterisks for
+%      use at the end of a section near the end of a chapter so that a
+%      new `concluding' section need not be used.
+%
+% \changes{v3.1}{2005/07/27}{Added \textsl{threestars} macro}
+%
+%    \begin{macrocode}
+\newcommand{\threestars}{\begin{center}%
+  *\hspace{.5in}*\hspace{.5in}*\hspace{.5in}\end{center}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \Finale
+% \newpage
+% \appendix
+%
+% \section{The york-thesis-Template.tex File}
+%
+% This is a listing of a sample master document for your thesis or
+% dissertation. I recommend placing chapters and appendices in
+% separate files (like I force you to do for your abstract, preface,
+% acknowledgements, and abbreviations). This makes everything more
+% manageable from an editor point of view (you are scrolling through
+% thousands of lines) and makes typesetting parts of the document much
+% easier.
+%
+% \lstinputlisting[language=TeX,basicstyle={\footnotesize}]{york-thesis-Template.tex}
+\endinput
diff --git a/Master/texmf-dist/source/latex/york-thesis/york-thesis.ins b/Master/texmf-dist/source/latex/york-thesis/york-thesis.ins
new file mode 100644
index 00000000000..33be5dbf610
--- /dev/null
+++ b/Master/texmf-dist/source/latex/york-thesis/york-thesis.ins
@@ -0,0 +1,54 @@
+%%
+%% Copyright (C) 2005 by Norm Gall <gall@spookyhill.net>
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version
+%% 2003/06/01 or later.
+%%
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/york-thesis}
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2005 by Norm Gall <gall@spookyhill.net>
+
+This file may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version
+2003/06/01 or later.
+
+\endpreamble
+
+\generate{\file{york-thesis.cls}{\from{york-thesis.dtx}{class}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX:                    *}
+\Msg{*                                                           *}
+\Msg{*     york-thesis.cls                                       *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation run the file york-thesis.dtx *}
+\Msg{* through LaTeX.                                            *}
+\Msg{*                                                           *}
+\Msg{* Happy TeXing!                                             *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
+
+\endbatchfile
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/york-thesis/york-thesis.cls b/Master/texmf-dist/tex/latex/york-thesis/york-thesis.cls
index 6abd5d33aca..9a9f19f9fd8 100644
--- a/Master/texmf-dist/tex/latex/york-thesis/york-thesis.cls
+++ b/Master/texmf-dist/tex/latex/york-thesis/york-thesis.cls
@@ -1,469 +1,344 @@
-% york-thesis.cls
-%
-%% This is a class (.cls) file for LaTeX2e.
-%% This is a replacement for the dissertation.sty file used with
-%% LaTeX209.  Basically we want the report class with a 
-%% few modifications.
 %%
-%% Current Maintainer:  Norman Gall
-%%                      Department of Philosophy
-%%                      The University of Calgary
-%%                      Calgary, Alberta, Canada
+%% This is file `york-thesis.cls',
+%% generated with the docstrip utility.
 %%
-%%                      ngall@ucalgary.ca
+%% The original source files were:
 %%
-%% Next to last Author: Thomas J. Stone
-%%
-%% Feel free to copy, modify, and distribute.
-%% I am interested in any changes you make.
-%% Send changes to ngall@ucalgary.ca
-%%
-%% This file has been changed so much from the original that I almost feel
-%% justified in claiming it as my own. Of course, so many people have
-%% contributed code (i.e., I have shamelessly stolen it) that I feel
-%% compelled to mention them; so their names still appear.
-%%
-%% Please note that I have made a number of stylistic choices in how the 
-%% text appears. If you feel stongly about any particular choice, give me 
-%% a shout and I will see what I can do about implementing a switch. But 
-%% I make no promises. Some of these choices are not negotiable. :)
-%%
-%% The original is based on the dissertation.sty file by Pablo A. Straub.
-%% (Actually it is based on a modified version that contains 
-%% modifications by Aaron E. Naiman.)
-%
-% Version History
-% ---------------
-%
-% v1.8 2004-05-05       Removed code for the copyright page; York theses
-%                        have pre-printed copyright and certificate pages
-%                        that are un-numbered and inserted after printing
-%                        pagination for the abstract page starts at iv
-%
-% v1.7 2004-03-27       Added code to single space the verse environment
-%
-% v1.6 2003-11-21       Added code to remove chapter resets of footnote
-%                        numbering.
-%
-% v1.5 2003-09-20       Changed appearance of chapter titles:
-%                        removed \chaptername and placed the
-%                        section number on the same line as the 
-%                        label (suggested by Dave Makalsky)
-%
-% v1.4 2003-09-07       Made subsection and subsubsection sizes more
-%                        sane
-%
-% v1.3 2003-03-30       Corrected some typos and added an epigraph 
-%                        command
-%
-% v1.2 2002-02-15       Corrected error with bibliography toc line
-%
-% v1.1 2002-02-13       Modifications by Norm Gall <gall@spookyhill.net>
-%                        for York University, Toronto, ON, Canada; 
-%                        a) name changed to york-thesis
-%                        b) added a TOC entry for the Table of Contents
-%                        c) added {final | draft} option in 
-%                           \documentclass command
-%                        d) made footnote spacing single spaced in 
-%                           final
-%                        e) changed quoting environments for single 
-%                           spacing in final
-%                        f) various housekeeping functions
-%
-% v1.0  1995-04-25      Set up for distribution to others.
-%
-%   9/1997  changes by Stefan Kehrbaum (sk) to accomodate new guidelines 
-%   implemented by the graduate school in summer 1997
-%
-% v0.3  1995-01-15      Got rid of a bunch of stuff that I don't think
-%                       is needed.  I.e.,  some of the cross referencing
-%                       stuff.  I think that most people either won't
-%                       use this or they have their own macros.
-%
-% v0.2  1995-01-15      Modified slightly to conform to LaTeX2e 
-%                        suggested standards
-%
-% v0.1  1995-01-15      Test of Class file
-%                       Included (Aaron Naiman's modified version) of 
-%                       dissertation.sty
-%
-%-- Notes -------------------------------------------------------------
-%
-%       a) both letterpaper and 12pt options are forced. The document  
-%               cannot change them.
-%
-%-- Identification ----------------------------------------------------
-%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{york-thesis}[2004/05/05 v1.8]
-%
-%-- Initial Code ------------------------------------------------------
-%
+%% york-thesis.dtx  (with options: `class')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2005 by Norm Gall <gall@spookyhill.net>
+%% 
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 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.3 or later is part of all distributions of LaTeX version
+%% 2003/06/01 or later.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{york-thesis}
+[2006/05/16 v3.4 York University (Toronto, Canada) thesis class]
 \RequirePackage{ifthen}
-%
-%-- Declaration of Options -----------------------------
-% saving taken from dissertation.sty with modification
-%
+\RequirePackage{calc}
+\RequirePackage{makeidx}
 \newboolean{saving}
-
 \DeclareOption{draft}{\setboolean{saving}{true}}
-\DeclareOption{final}{\setboolean{saving}{false}}
-
-\PassOptionsToClass{12pt}{report}
-\PassOptionsToClass{letterpaper}{report}
-
+\DeclareOption{final}{\setboolean{saving}{false}
+  \PassOptionsToClass{letterpaper,12pt,oneside,%
+    onecolumn,final,openany}{report}}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
-
 \ExecuteOptions{draft}
-%-- Execution of Options -------------------------------
 \ProcessOptions
-%-- Package Loading ------------------------------------
 \LoadClass{report}
-%-- Main Code ------------------------------------------
-%
-% 1. Preliminary Matter
-%
-%     some redefinitions I need later
-%
-\let\oldquote\quote
-\let\oldendquote\endquote
-\let\oldquotation\quotation
-\let\oldendquotation\endquotation
-\let\oldverse\verse
-\let\oldendverse\endverse
+\let\oldquote\quote \let\oldendquote\endquote
+\let\oldquotation\quotation \let\oldendquotation\endquotation
+\let\oldverse\verse \let\oldendverse\endverse
 \let\oldbibliography\bibliography
 \let\oldendbibliography\endbibliography
-%
-% masters taken from dissertation.sty with modification
-%
+\let\oldprintindex\printindex
+\newboolean{hasfigures}\setboolean{hasfigures}{false}
+\newboolean{hastables}\setboolean{hastables}{false}
 \newboolean{masters}\setboolean{masters}{false}
-\newcommand{\@thesis}{\ifthenelse{\boolean{masters}}{Thesis}{Dissertation}}
-%
-%
-%
-% 2. Margins and spacing
-%
-% Rules taken from York FGS Guidelines for Theses and Dissertations
-%
-% The style guide requires a 1.5in left and top margin.  We use 1.65in.
-% The style guide requires a 1.0in right and bottom margin. 
-% We use 1.15in.
-%
-%
-% \spacing - redefine \baselinestretch and recompute \baselineskip
-%            lateral effect: set typeface to normalize roman
-%
 \newcommand{\spacing}[1]{\renewcommand{\baselinestretch}{#1}%
-                        \large\normalsize}
-%
-\ifthenelse{\boolean{saving}}
-{       % settings for draft
-        \setlength {\topmargin}{0.0in}          % top margin    1.0 inch
-        \setlength {\textheight}{8.5in}         % bottom margin 1.0 inch
-        \setlength {\oddsidemargin}{0.0in}      % left margin   1.0 inch
-        \setlength {\evensidemargin}{0.0in}     % right margin (ds)  1.0 inch
-        \setlength {\textwidth}{6.5in}          % right margin  1.0 inch
-        \spacing{1}                             % single for drafts
-}
-{       % settings for final
-        \setlength {\topmargin}{0.65in}         % top margin    1.65 inch
-        \setlength {\textheight}{7.6in}         % bottom margin 1.00 inch
-        \setlength {\oddsidemargin}{0.65in}     % left margin   1.65 inch
-        \setlength {\evensidemargin}{0.15in}    % right margin (ds)  1.15 inch
-        \setlength {\textwidth}{5.7in}          % right margin  1.15 inch
-        \setlength {\footskip}{0.7in}           % space above pg num
-        \spacing{2}                             % double for final
-        \renewenvironment{quote}                % redefine quote 
-                        {\oldquote\spacing{1}}
-                        {\oldendquote\spacing{2}}
-        \renewenvironment{quotation}            % redefine quotation
-                        {\oldquotation\spacing{1}}
-                        {\oldendquotation\spacing{2}} 
-        \renewenvironment{verse}                % redefine verse
-                        {\oldverse\spacing{1}}
-                        {\oldendverse\spacing{2}} 
-}
-\setlength {\footnotesep}{14pt}         
-\setlength {\headheight}{0in}                   % no header
-\setlength {\headsep}{0in}                      % no header separation
-\renewenvironment{bibliography}[1]              % automatically enter toc line
-        {\addcontentsline{toc}{chapter}{Bibliography}\oldbibliography {#1}}
-                        {\oldendbibliography}
-%
-% define command that can undo footnote reset between chapters
-% (shamelessly lifted from removefr.sty by Donald Arseneau) 
-%
+  \large\normalsize}
 \def\@removefromreset#1#2{\let\@tempb\@elt
-   \expandafter\let\expandafter\@tempa\csname c@#1\endcsname
-   \def\@elt##1{\expandafter\ifx\csname c@##1\endcsname\@tempa\else
-         \noexpand\@elt{##1}\fi}%
-   \expandafter\edef\csname cl@#2\endcsname{\csname cl@#2\endcsname}%
-   \let\@elt\@tempb}
-%
-% undo the hideous \@addtoreset in report.cls:
+  \expandafter\let\expandafter\@tempa\csname c@#1\endcsname
+  \def\@elt##1{\expandafter\ifx\csname c@##1\endcsname\@tempa\else
+    \noexpand\@elt{##1}\fi}%
+  \expandafter\edef\csname cl@#2\endcsname{\csname cl@#2\endcsname}%
+  \let\@elt\@tempb}
 \@removefromreset{footnote}{chapter}
-\def\resetfootnote{\setcounter{footnote}{0}}  % definition to reset footnote       
-%
-% Make footnotes single spaced
-%
-%       code shamelessly stolen from setspace.sty 
-%        written by Geoffrey Tobin <G.Tobin@latrobe.edu.au>
-%
+\def\resetfootnote{\setcounter{footnote}{0}}
 \long\def\@footnotetext#1{%
-  \insert\footins{%
-    \def\baselinestretch {1}%
-    \reset@font\footnotesize
-    \interlinepenalty\interfootnotelinepenalty
-    \splittopskip\footnotesep
-    \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-    \hsize\columnwidth
-    \@parboxrestore
-    \protected@edef\@currentlabel{%
-      \csname p@footnote\endcsname\@thefnmark
-    }%
-    \color@begingroup
-      \@makefntext{%
-        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
-    \color@endgroup}}
-%
-% 3. Commands to define parameters for the front matter
-% 
-% There are two kinds of commands that define parametters for the  front
-% matter:  those  that  provide info (like \author or \abstractfile) and
-% those that set flags (like \hascopyright).
-% 
-% The following are the definitions of the commands  that  provide  info
-% (standard  LaTeX  commands  like  \author are omitted because they are
-% already defined).
-%
-\def\department#1{\gdef\@department{#1}}
-\def\abstractfile#1{\gdef\@abstractfile{#1}}
-\def\masterof#1{\gdef\@masterof{#1}}
-\def\acknowledgementsfile#1{\gdef\@acknowledgementsfile{#1}}
-%
-% The following are the initial values for some commands that 
-% provide info.
-%
-\gdef\@author{{\it Your Full Name}}
-\gdef\@title{{\it The Title of the Work}}
-\gdef\@date{\number\year}
-\gdef\@department{Department of Ancient Studies}
-\def\@abstractfile{abstract}
-\def\@acknowldgementsfile{acknowledgements}
-\gdef\@masterof{Arts}
-%
-%
-% The following are all switch setting commands along 
-% with their initial values 
-%
-%
-\newboolean{hascopyright}\setboolean{hascopyright}{true}
-\newboolean{hasfigures}\setboolean{hasfigures}{false}
-\newboolean{hastables}\setboolean{hastables}{false}
-%
-%
-% 4. Command \makefrontmatter
-%        
-% The \makefrontmatter command creates the front matter by conditionally
-% invoking other commands:
-%  
-%       \makeabstract, \maketitlepage, \makepreface,
-%       \makededication, \makeacknowledgements, \tableofcontents,
-%       \makelistoftables, \makelistoffigures, \makecommentpage.
-%
-% \makefrontmatter takes care of numbering in lowercase roman, arabic or
-% none.
-%
-\def\makefrontmatter{
- \pagestyle {empty}
- \maketitlepage
- \pagestyle {plain}
- \pagenumbering {roman}
- \setcounter {page}{4}
- \@ifdefined {@abstractfile}{\makeabstract}
- \@ifdefined {@acknowledgementsfile}{\makeacknowledgements}
- \addcontentsline {toc}{chapter}{Table of Contents}
- \tableofcontents\newpage
- \ifthenelse{\boolean{hastables}}{\makelistoftables}{}
- \ifthenelse{\boolean{hasfigures}}{\makelistoffigures}{}
- \pagenumbering {arabic}
- \setcounter {page}{1}
- }
-%
-%
-% 5. Commands to create different parts of the front matter
-%
-%
-% \maketitlepage - create the title page according to a complex format
-%
-\def\maketitlepage{
- \newpage
- \vspace*{.85in}
- \begin{center}
- \spacing{1}
- {\begin{tabular}[t]{c}\@title\end{tabular}}
- \\ \hugeskip 
- \hugeskip
- \hugeskip
- \hugeskip
- {\bigskip \@author}
- \end{center}
- \hugeskip \hugeskip \hugeskip \hugeskip \hugeskip \hugeskip
- {\spacing{1}
- \begin{center}
- \ifmasters A thesis \else A dissertation \fi
-          submitted to the Faculty of Graduate Studies \\
-          in partial fulfilment of the requirements \\
-          for the degree of \\
- \hugeskip \hugeskip \hugeskip
- \ifmasters Master of \@masterof \else Doctor of Philosophy \fi \\
- \hugeskip \hugeskip % \hugeskip
- Graduate Programme in \@department \\
- York University \\
- Toronto, Ontario \\
- \@date
- \end{center}
- \newpage}}
-%
-% \makeabstract - create the abstract page(s)
-%
-\def\makeabstract{
- \newpage
- \addcontentsline {toc}{chapter}{Abstract}
- \chapter*{Abstract}
- \noindent
- \@input{\@abstractfile}
- \newpage}
-%
-% \makeacknowledgements - create the acknowledgements page(s)
-%
-\def\makeacknowledgements{
- \newpage
- \addcontentsline {toc}{chapter}{Acknowledgements}
- \chapter*{Acknowledgements}
- \noindent
- \@input{\@acknowledgementsfile}
- \newpage}
-%
-% \makelistoftables - create the list of tables
-%
-\def\makelistoftables{
- \newpage
- \addcontentsline {toc}{chapter}{List of Tables}
- \listoftables
- \newpage}
-%
-% \makelistoffigures  - create the list of figures
-%
-\def\makelistoffigures{
- \newpage
- \addcontentsline {toc}{chapter}{List of Figures}
- \listoffigures
- \newpage}
-%
-% \hugeskip - skip twice as much as the TeX command \bigskip
-%
+ \insert\footins{%
+  \def\baselinestretch {1}%
+  \reset@font\footnotesize
+  \interlinepenalty\interfootnotelinepenalty
+  \splittopskip\footnotesep
+  \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+  \hsize\columnwidth
+  \@parboxrestore
+  \protected@edef\@currentlabel{%
+    \csname p@footnote\endcsname\@thefnmark}%
+  \color@begingroup
+    \@makefntext{%
+      \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+  \color@endgroup}}
+\gdef\split@prev{0}
+\let\pagefootnoterule\footnoterule
+\let\mpfootnoterule\footnoterule
+\def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+\def\footnoterule{\relax
+ \ifx \@listdepth\@mplistdepth
+   \mpfootnoterule
+ \else
+   \ifnum\split@prev=\z@
+   \pagefootnoterule
+ \else
+   \splitfootnoterule
+   \fi
+   \xdef\split@prev{\the\insertpenalties}%
+ \fi
+}
+\renewcommand\appendix{\par
+  \setcounter{chapter}{0}%
+  \setcounter{section}{0}%
+  \gdef\@chapapp{\appendixname}%
+  \gdef\thechapter{\@Alph\c@chapter}
+  \ifthenelse{\boolean{saving}}{\spacing{1}}{\spacing{2}}}
+\renewenvironment{bibliography}[1]%
+  {\addcontentsline{toc}{chapter}{Bibliography}\oldbibliography {#1}}%
+  {\oldendbibliography}
+\renewcommand{\printindex}{\newpage%
+  \addcontentsline{toc}{chapter}{Index}\oldprintindex}
 \def\hugeskip{\vskip 24pt plus 8pt minus 8pt}
-%
-% \@ifdefined - expand #2 if command #1 is not defined
-%
 \def\@ifdefined#1#2{\@ifundefined{#1}{}{#2}}
-%
-% \@makechapterhead \@makeschapterhead - create a chapter head
-%
-% These standard LaTeX commands are redefined here to use not-so-huge type
-% and to provide chapters of form: N chaptername
-
-%
-\def\@makechapterhead#1{ \vspace*{50pt} { \parindent 0pt \raggedright%
-         \ifnum \c@secnumdepth >\m@ne \Large\bf 
-         \thechapter \hskip 1em \fi \Large \bf #1\par
-         \nobreak \vskip 40pt } }
-%
+\def\@makechapterhead#1{ \vspace*{50pt} { \parindent 0pt
+    \raggedright%
+    \ifnum \c@secnumdepth > \m@ne \Large\bf
+    \thechapter \hskip 1em \fi \Large \bf #1\par
+    \nobreak \vskip 40pt } }
 \def\@makeschapterhead#1{ \vspace*{50pt} { \parindent 0pt \raggedright
- \Large \bf #1\par
- \nobreak \vskip 40pt } }
-%
-% redefine section size to the same size as subsection, etc.
-%
+    \Large \bf #1\par
+    \nobreak \vskip 40pt }}
 \renewcommand\section{\@startsection {section}{1}{\z@}%
-                                   {-3.5ex \@plus -1ex \@minus -.2ex}%
-                                   {2.3ex \@plus.2ex}%
-                                   {\normalfont\large\bfseries}}
-                                   
+                                 {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                 {2.3ex \@plus.2ex}%
+                                 {\normalfont\large\bfseries}}
 \renewcommand\subsection{\@startsection {subsection}{1}{\z@}%
-                                   {-3.5ex \@plus -1ex \@minus -.2ex}%
-                                   {2.3ex \@plus.2ex}%
-                                   {\normalfont\normalsize\bfseries}}
-
+                                 {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                 {2.3ex \@plus.2ex}%
+                                 {\normalfont\normalsize\bfseries}}
 \renewcommand\subsubsection{\@startsection {subsubsection}{1}{\z@}%
-                                   {-3.5ex \@plus -1ex \@minus -.2ex}%
-                                   {2.3ex \@plus.2ex}%
-                                   {\normalfont\normalsize\bfseries}}
-%
-% First we rename the headings for the toc, lof, and the references.
-%
-\renewcommand\contentsname{Table of Contents}                                 
+                                 {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                 {2.3ex \@plus.2ex}%
+                                 {\normalfont\normalsize\bfseries}}
+\renewcommand\contentsname{Table of Contents}
 \renewcommand\listfigurename{List of Figures}
 \renewcommand\listtablename{List of Tables}
 \renewcommand\bibname{Bibliography}
-%
-% next we modify the definitions of \tableofcontents, \listoffigures,
-% and \listoftables.  We need to have \underline{Section}   
-% \underline{Page} and so forth....  basically we add the contentsheader 
-% line to each of the standard definitions 
-%
-\newcommand{\contentsheader}[2]
-{       \addtocontents{#1}
-        {       \centerline{\underline{#2}\protect\hfill%
-                           \underline{Page}}%
-        }%
-}
-%
-\renewcommand\tableofcontents
-{       \if@twocolumn
-                \@restonecoltrue\onecolumn
-        \else
-                \@restonecolfalse
-        \fi
-        \chapter*{\contentsname \@mkboth        {\uppercase{\contentsname}}%
-                                                {\uppercase{\contentsname}}}%
-        \@starttoc{toc}%
-        \if@restonecol\twocolumn\fi
-}
-%
-\renewcommand\listoffigures
-{       \if@twocolumn
-                \@restonecoltrue\onecolumn
-        \else
-                \@restonecolfalse
-        \fi
-        \chapter*{\listfigurename \@mkboth      {\uppercase{\listfigurename}}%
-                                                {\uppercase{\listfigurename}}}%
-        \@starttoc{lof}%
-        \if@restonecol\twocolumn\fi
-}
-%
-\renewcommand\listoftables
-{       \if@twocolumn
-                \@restonecoltrue\onecolumn
-        \else
-                \@restonecolfalse
-        \fi
-        \chapter*{\listtablename \@mkboth       {\uppercase{\listtablename}}%
-                                                {\uppercase{\listtablename}}}%
-        \@starttoc{lot}%
-        \if@restonecol\twocolumn\fi
-}
-%
-%       \epigraph{text}{byline}
-%
-\newcommand{\epigraph}[2]{\begin{flushright}\begin{minipage}{4in}%
-                        \spacing{1}#1
-                    \begin{flushright}#2\end{flushright}\hrule%
-                    \end{minipage}\vskip 12pt\end{flushright}}
-%
-%% End of file `york-thesis.cls'.
+\newcommand{\contentsheader}[2] { \addtocontents{#1} {
+    \centerline{\underline{#2}\protect\hfill%
+      \underline{Page}}}}
+\renewcommand\tableofcontents { \chapter*{\contentsname}
+  \addcontentsline{toc}{chapter}{Table of Contents}
+  \@starttoc{toc}}
+\renewcommand\listoffigures { \chapter*{\listfigurename}
+  \addcontentsline{toc}{chapter}{List of Figures}
+  \@starttoc{lof}}
+\renewcommand\listoftables { \chapter*{\listtablename}
+  \addcontentsline{toc}{chapter}{List of Tables}
+  \@starttoc{lot}}
+\ifthenelse{\boolean{saving}} {%
+  \setlength {\topmargin}{0.0in}
+  \setlength {\textheight}{\paperheight-2.5in}
+  \setlength {\oddsidemargin}{0.0in}
+  \setlength {\evensidemargin}{0.0in}
+  \setlength {\textwidth}{\paperwidth-2in}
+  \spacing{1}
+  } {%
+  \setlength {\topmargin}{0.65in}
+  \setlength {\textheight}{\paperheight-3.05in}
+  \setlength {\oddsidemargin}{0.6in}
+  \setlength {\evensidemargin}{0.1in}
+  \setlength {\textwidth}{\paperwidth-2.65in}
+  \setlength {\footskip}{0.3in}
+  \spacing{2}
+  \renewenvironment{quote}{\oldquote\spacing{1}}%
+       {\oldendquote\spacing{2}}
+  \renewenvironment{quotation}{\oldquotation\spacing{1}}%
+       {\oldendquotation\spacing{2}}
+  \renewenvironment{verse}{\oldverse\spacing{1}}%
+       {\oldendverse\spacing{2}}}
+\setlength {\footnotesep}{14pt}
+\setlength {\headheight}{0in}
+\setlength {\headsep}{0in}
+\def\department#1{\gdef\@department{#1}}
+\def\masterof#1{\gdef\@masterof{#1}}
+\def\abstractfile#1{\gdef\@abstractfile{#1}}
+\def\dedicationfile#1{\gdef\@dedicationfile{#1}}
+\def\acknowledgementsfile#1{\gdef\@acknowledgementsfile{#1}}
+\def\prefacefile#1{\gdef\@prefacefile{#1}}
+\def\abbreviationsfile#1{\gdef\@abbreviationsfile{#1}}
+\def\committeememberslist#1{\gdef\@committeememberslist{#1}}
+\def\degreename#1{\gdef\@degreename{#1}}
+\gdef\@author{YOUR FULL NAME} \gdef\@title{{\bf THE TITLE OF YOUR
+    WORK}} \gdef\@date{\number\year} \gdef\@department{PHILOSOPHY}
+\gdef\@masterof{Arts} \gdef\@committeememberslist{%
+  \begin{enumerate}%
+  \item Joanne Examiner%
+  \item Fred P. Questioner%
+  \end{enumerate}}
+\ifthenelse{\boolean{masters}}{\gdef\@degreename{MASTER}}%
+  {\gdef\@degreename{DOCTOR}}
+\def\makefrontmatter{%
+  \pagestyle {empty}
+  \pagenumbering {roman}
+  \maketitlepage
+  \makecopyrightpage
+  \makeauthenticitypage
+  \@ifdefined {@abstractfile}{\makeabstract}
+  \pagestyle {plain}
+  \@ifdefined {@dedicationfile}{\makededication}
+  \@ifdefined {@acknowledgementsfile}{\makeacknowledgements}
+  \tableofcontents
+  \ifthenelse{\boolean{hastables}}{\listoftables}{}
+  \ifthenelse{\boolean{hasfigures}}{\listoffigures}{}
+  \@ifdefined{@prefacefile}{\makepreface}
+  \@ifdefined{@abbreviationsfile}{\makeabbreviations}
+  \newpage
+  \pagenumbering {arabic}
+  \setcounter {page}{1}}
+\def\maketitlepage{
+  \vspace*{.85in}
+  \begin{center}
+    \spacing{1}
+    \textbf{\MakeUppercase{\@title}}
+    \hugeskip
+    \hugeskip
+    \hugeskip
+    {\bigskip \MakeUppercase{\@author}}
+  \end{center}
+  \hugeskip \hugeskip \hugeskip \hugeskip \hugeskip \hugeskip
+  {\spacing{1}
+    \begin{center}
+      \ifmasters A THESIS \else A DISSERTATION \fi
+      SUBMITTED TO THE FACULTY OF GRADUATE STUDIES \\
+      IN PARTIAL FULFILMENT OF THE REQUIREMENTS \\
+      FOR THE DEGREE OF \\
+      \hugeskip \hugeskip \hugeskip
+      \ifmasters \MakeUppercase{\@degreename} OF
+      \MakeUppercase{\@masterof}
+      \else
+      \MakeUppercase{\@degreename} OF PHILOSOPHY \fi \\
+      \hugeskip \hugeskip
+      GRADUATE PROGRAM IN \MakeUppercase{\@department} \\
+      YORK UNIVERSITY \\
+      TORONTO, ONTARIO \\
+      \MakeUppercase{\@date}
+    \end{center}}
+  \newpage }
+\def\makecopyrightpage{%
+  \begin{center}
+    \setlength{\fboxrule}{.004in} \setlength{\fboxsep}{2cm}
+    \mbox{}
+    \par\vspace*{\stretch{1}}
+    \fbox{\parbox{4in}{%
+      \spacing{1}
+      \begin{center}
+        \textbf{\MakeUppercase{\@title}}
+      \end{center} by
+      \textbf{\@author}
 
+      \bigskip
+      a \ifmasters thesis \else dissertation \fi submitted to the
+      Faculty of Graduate Studies of York University in partial
+      fulfilment of the requirements for the degree of
+      \begin{center}
+        \ifmasters \textbf{\MakeUppercase{\@degreename} OF
+          \MakeUppercase{\@masterof}}
+        \else
+          \textbf{\MakeUppercase{\@degreename} OF PHILOSOPHY} \fi \\
+                   $\copyright$\ \number\year \\
+      \end{center}
 
+      Permission has been granted to: a) YORK UNIVERSITY LIBRARIES
+      to lend or sell copies of this dissertation in paper,
+      microform or electronic formats, and b) LIBRARY AND ARCHIVES
+      CANADA to reproduce, lend, distribute, or sell copies of this
+      \ifmasters thesis \else dissertation \fi anywhere in the world
+      in microform, paper or electronic formats \textit{and} to
+      authorise or procure the reproduction, loan, distribution or
+      sale of copies of this \ifmasters thesis \else dissertation
+      \fi anywhere in the world in microform, paper or electronic
+      formats.
 
+      \bigskip The author reserves other publication rights, and
+      neither the \ifmasters thesis \else dissertation \fi nor
+      extensive extracts for it may be printed or otherwise
+      reproduced without the author's written permission.}}
+  \vspace*{\stretch{1}}
+\end{center}
+\newpage}
+\def\makeauthenticitypage{%
+  \par\vfill
+  {\spacing{1}
+    \begin{center}
+      \textbf{\MakeUppercase{\@title}} \hugeskip\hugeskip by
+      \textbf{\@author}
+    \end{center}
+    \hugeskip\noindent By virtue of submitting this document
+    electronically, the author certifies that this is a true
+    electronic equivalent of the copy of the \ifmasters thesis \else
+    dissertation \fi approved by York University for the award of
+    the degree. No alteration of the content has occurred and if
+    there are any minor variations in formatting, they are as a
+    result of the coversion to Adobe Acrobat format (or similar
+    software application).  \hugeskip
+    \begin{flushright}
+      \begin{minipage}[t]{4in}
+        Examination Committee Members: \@committeememberslist
+      \end{minipage}
+    \end{flushright}}}
+\def\makeabstract{%
+  \chapter*{Abstract}
+  \addcontentsline {toc}{chapter}{Abstract}
+  \noindent
+  \@input{\@abstractfile}}
+\def\makededication{%
+  %\chapter*{Abstract}
+  %\addcontentsline {toc}{chapter}{Abstract}
+  %\noindent
+  \newpage
+  \@input{\@dedicationfile}}
+\def\makepreface{%
+  \chapter*{Preface}
+  \addcontentsline {toc}{chapter}{Preface}
+  \noindent
+  \@input{\@prefacefile}}
+\def\makeabbreviations{%
+  \chapter*{Abbreviations}
+  \addcontentsline{toc}{chapter}{Abbreviations}
+  \noindent
+  \@input{\@abbreviationsfile}}
+\def\makeacknowledgements{%
+  \chapter*{Acknowledgements}
+  \addcontentsline{toc}{chapter}{Acknowledgements}
+  \noindent
+  \@input{\@acknowledgementsfile}}
+\newlength{\epigraphwidth}\setlength{\epigraphwidth}{.8\columnwidth}
+\newlength{\epigraphrule}\setlength{\epigraphrule}{.4\p@}
+\newcommand{\@epirule}{\rule[.5ex]{\epigraphwidth}{\epigraphrule}}
+\newcommand{\epigraph}[2]%
+  {\item #1\vspace{-12pt}\begin{flushright}#2\end{flushright}}
+\newcommand{\epigraphlabel}[1]{\hfill}
+\newenvironment{epigraphs}{%
+    \begin{flushright}
+      \begin{minipage}{\epigraphwidth}
+        \list{}%
+     {\itemindent\z@ \labelwidth\z@ \labelsep\z@
+      \leftmargin\z@ \rightmargin\z@
+      \let\makelabel\epigraphlabel}}%
+  {\endlist\vspace{-18pt}\@epirule\vspace{24pt}\end{minipage}\end{flushright}}
+\let\oldepigraphs\epigraphs \let\oldendepigraphs\endepigraphs
+\ifthenelse{\boolean{saving}}{}{%
+  \renewenvironment{epigraphs}{\oldepigraphs\spacing{1}}%
+       {\oldendepigraphs\spacing{2}}
+}
+\newenvironment{fquote}%
+  {\oldquote\footnotesize}%
+  {\oldendquote\normalsize}
+\newenvironment{fquotation}{\oldquotation\footnotesize}%
+     {\oldendquotation\normalsize}
+\newenvironment{fverse}{\oldverse\footnotesize}%
+     {\oldendverse\normalsize}
+\newcommand{\threestars}{\begin{center}%
+  *\hspace{.5in}*\hspace{.5in}*\hspace{.5in}\end{center}}
+\endinput
+%%
+%% End of file `york-thesis.cls'.
diff --git a/Master/texmf-dist/tpm/york-thesis.tpm b/Master/texmf-dist/tpm/york-thesis.tpm
index 773beda1a22..0ce796825cb 100644
--- a/Master/texmf-dist/tpm/york-thesis.tpm
+++ b/Master/texmf-dist/tpm/york-thesis.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/york-thesis.zip">
     <TPM:Name>york-thesis</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/09 01:00:45</TPM:Date>
+    <TPM:Date>2006/06/05 14:31:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -18,22 +18,20 @@ changes made in Spring 2005.
     <TPM:Author></TPM:Author>
     <TPM:Size>224841</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="18102">
+    <TPM:RunFiles size="14336">
 texmf-dist/tex/latex/york-thesis/york-thesis.cls
 texmf-dist/tpm/york-thesis.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="206739">
-texmf-dist/doc/latex/york-thesis/sample-thesis/.DS_Store
-texmf-dist/doc/latex/york-thesis/sample-thesis/abstract.tex
-texmf-dist/doc/latex/york-thesis/sample-thesis/acknowledgements.tex
-texmf-dist/doc/latex/york-thesis/sample-thesis/chapter-1.tex
-texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.bib
-texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.pdf
-texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.tex
+    <TPM:DocFiles size="228151">
+texmf-dist/doc/latex/york-thesis/README
+texmf-dist/doc/latex/york-thesis/york-thesis-Template.tex
+texmf-dist/doc/latex/york-thesis/york-thesis.el
 texmf-dist/doc/latex/york-thesis/york-thesis.pdf
-texmf-dist/doc/latex/york-thesis/york-thesis.tex
-texmf-dist/doc/latex/york-thesis/yorkTemplate.tex
     </TPM:DocFiles>
+    <TPM:SourceFiles size="43096">
+texmf-dist/source/latex/york-thesis/york-thesis.dtx
+texmf-dist/source/latex/york-thesis/york-thesis.ins
+    </TPM:SourceFiles>
     <TPM:Provides>Package/york-thesis</TPM:Provides>
   </rdf:Description>
 </rdf:RDF>
diff --git a/Master/texmf/lists/york-thesis b/Master/texmf/lists/york-thesis
index 194260b4810..78dd959cc70 100644
--- a/Master/texmf/lists/york-thesis
+++ b/Master/texmf/lists/york-thesis
@@ -1,14 +1,9 @@
-texmf-dist/doc/latex/york-thesis/sample-thesis/.DS_Store
-texmf-dist/doc/latex/york-thesis/sample-thesis/abstract.tex
-texmf-dist/doc/latex/york-thesis/sample-thesis/acknowledgements.tex
-texmf-dist/doc/latex/york-thesis/sample-thesis/chapter-1.tex
-texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.bib
-texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.pdf
-texmf-dist/doc/latex/york-thesis/sample-thesis/sample-thesis.tex
+texmf-dist/doc/latex/york-thesis/README
+texmf-dist/doc/latex/york-thesis/york-thesis-Template.tex
+texmf-dist/doc/latex/york-thesis/york-thesis.el
 texmf-dist/doc/latex/york-thesis/york-thesis.pdf
-texmf-dist/doc/latex/york-thesis/york-thesis.tex
-texmf-dist/doc/latex/york-thesis/yorkTemplate.tex
-
+texmf-dist/source/latex/york-thesis/york-thesis.dtx
+texmf-dist/source/latex/york-thesis/york-thesis.ins
 texmf-dist/tex/latex/york-thesis/york-thesis.cls
 texmf-dist/tpm/york-thesis.tpm