6 files changed, 71 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/ryethesis/Makefile b/Master/texmf-dist/doc/latex/ryethesis/Makefile
index f318721c73e..b08f4d996ca 100644
--- a/Master/texmf-dist/doc/latex/ryethesis/Makefile
+++ b/Master/texmf-dist/doc/latex/ryethesis/Makefile
@@ -2,7 +2,7 @@ FILEROOT=ryesample
 
 SHELL=/bin/sh
 
-VERSION=1.31
+VERSION=$(shell grep changes ryethesis.dtx | perl -wlne 'print $$1 if /v([0-9]+\.[0-9]+)/' | sort -n | tail -1)
 
 LATEX=pdflatex
 
@@ -10,7 +10,7 @@ TEXFILES=ryesample.tex
 BIBFILES=ryesample.bib
 FIGS=figure1.pdf
 FILES=README ryethesis.ins ryethesis.dtx ryethesis.pdf ryesample.pdf Makefile
-EXTRACLEAN=*.aux *.lof *.lot *.loa *.log *.bbl *.blg *.ind *.ilg *.toc *.idx *.gls *.glo *.out *~ *.nls *.nlo *.ist *.toa *.glg *.acn *.acr *.alg *.fdb_latexmk *.synctex.gz *.dvi auto
+EXTRACLEAN=*.aux *.lof *.lot *.loa *.log *.bbl *.blg *.ind *.ilg *.toc *.idx *.gls *.glo *.out *~ *.nls *.nlo *.ist *.toa *.glg *.acn *.acr *.alg *.fdb_latexmk *.synctex.gz *.dvi auto ryethesis-*.zip
 
 TEXMFFLAGS=-file-line-error -halt-on-error #-interaction=batchmode
 
diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf b/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf
index 9713d7530ed..2f4e91c8659 100644
--- a/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf
+++ b/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf
diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex b/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex
index c669ba4415b..782c75742b8 100644
--- a/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex
+++ b/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex
@@ -6,7 +6,8 @@
 % distribution is the easiest way to get up and running with TeX. See http://tug.org/texlive
 
 % Available options to ryethesis class:
-% draft - Produce a one-sided, double-spaced draft.
+% draft - Produce a one-sided, double-spaced draft (figures replaced by placeholders).
+% review - Produce a one-sided, 1.5-spaced version for review by examiners.
 % final (default) - Produce a two-sided, 1.5-spaced final version
 % lof (default) | nolof - Enable | disable a list of figures
 % lop | nolop (default) - Enable | disable a list of plates
@@ -47,6 +48,7 @@
 
 % If you wish to include pictures, I recommend the graphics package. This is not
 % loaded by the ryethesis class. 
+\usepackage{color}
 \usepackage{graphicx}
 
 % Add any other packages you wish to load here in the preamble. 
@@ -54,7 +56,7 @@
 
 % This sample uses a modified version of the Chicago Manual of Style bibtex style, 
 % which requires the inclusion of chicago.sty. 
-\usepackage{chicago}
+%\usepackage{chicago}
 
 % In the pre-amble, define some of necessary information for the document frontmatter.
 
@@ -240,7 +242,7 @@ In ornare turpis nec nunc venenatis ac tristique felis tempor. Fusce consectetur
 Phasellus et imperdiet justo. Pellentesque nec suscipit tortor. Aliquam ut nibh ac velit auctor congue quis at urna. Nulla convallis enim et nunc commodo varius. Sed elementum turpis ac purus sodales non luctus lacus dignissim. Cras id lorem id purus pulvinar convallis ac pulvinar elit. Morbi mattis, neque at condimentum lacinia, ipsum risus rutrum leo, non dignissim arcu eros a neque. Proin adipiscing, metus sed pulvinar suscipit, eros eros cursus velit, vel placerat turpis orci nec orci. Phasellus in dolor felis, id ultricies erat. Maecenas sollicitudin ultricies molestie.
 
 \subsection{Vivamus}
-Vivamus dictum ligula vitae ante ornare hendrerit. Quisque ac dolor nibh, eu ornare sem. Cras sit amet neque odio. Nulla bibendum bibendum turpis at congue. Nunc ultricies scelerisque sem, ut dapibus tellus dignissim sollicitudin. Curabitur sed sapien nibh, nec consectetur ante. Aliquam erat volutpat. Fusce tempor orci in ante venenatis nec pharetra diam aliquet. Nullam pretium elementum mauris, non commodo metus eleifend vel. Cras vel ante dolor. Suspendisse potenti. Quisque vel odio eget lorem posuere ultrices. Duis et volutpat diam. In sit amet pulvinar lacus. Vestibulum lacinia, turpis ut interdum venenatis, lorem sem eleifend diam, in hendrerit nisi tellus in lorem.
+\textcolor{red}{Vivamus dictum ligula vitae ante ornare hendrerit.} Quisque ac dolor nibh, eu ornare sem. Cras sit amet neque odio. Nulla bibendum bibendum turpis at congue. Nunc ultricies scelerisque sem, ut dapibus tellus dignissim sollicitudin. Curabitur sed sapien nibh, nec consectetur ante. Aliquam erat volutpat. Fusce tempor orci in ante venenatis nec pharetra diam aliquet. Nullam pretium elementum mauris, non commodo metus eleifend vel. Cras vel ante dolor. Suspendisse potenti. Quisque vel odio eget lorem posuere ultrices. Duis et volutpat diam. In sit amet pulvinar lacus. Vestibulum lacinia, turpis ut interdum venenatis, lorem sem eleifend diam, in hendrerit nisi tellus in lorem.
 }
 
 \typeout{**************************************************************************}
diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf b/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf
index b08ed71c96a..7a83d4d5211 100644
--- a/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf
+++ b/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf
diff --git a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
index 84c6c60c61c..decf6247905 100644
--- a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
+++ b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
@@ -39,7 +39,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{845}
+% \CheckSum{893}
 %
 % \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
@@ -67,6 +67,12 @@
 % problems for users with List of Appendices. Fixed \\cleardoublepage
 % for two-sided mode to insert empty page. Fixed draft mode to be
 % one-sided. }
+% \changes{v1.31}{2010/08/08}{Fixed small issues.}
+% \changes{v1.32}{2010/09/09}{Added 'review' option for producing
+% near-final version for examiners.}
+% \changes{v1.33}{2010/09/14}{Added front matter to TOC}
+% \changes{v1.34}{2014/01/04}{Replaced \\AtBeginDocument with etoolbox
+% package and \\AfterEndPreamble. Thanks to A. Penniston.}
 %
 % \GetFileInfo{ryethesis.dtx}
 %
@@ -264,7 +270,8 @@
 
 % Class options to control what appears in the document
 
-% Draft is equivalent to the book class sense of draft.
+% Draft is equivalent to the book class sense of draft (figures
+% replaced with placeholders
 \DeclareOption{draft}{
    \typeout{Ryerson-Thesis Class Option: `draft'}
    \ExecuteOptions{10pt,oneside}
@@ -272,6 +279,15 @@
    \setboolean{@ryedraft}{true}
 }
 
+% Review option is for producing a single-sided review copy for
+% examiners.
+\DeclareOption{review}{
+   \typeout{Ryerson-Thesis Class Option: `review'}
+   \ExecuteOptions{10pt,oneside}
+   \PassOptionsToClass{final,oneside}{book}
+   \setboolean{@ryedraft}{false}
+}
+
 % Final is the opposite of draft. This is the default mode. 
 \DeclareOption{final}{
    \typeout{Ryerson-Thesis Class Option: `final'}
@@ -451,7 +467,7 @@
  \pagenumbering{roman}
   \pagestyle{plain}
   \maketitle
-  \ryethesis@insertdeclaration
+ \ryethesis@insertdeclaration
   \ryethesis@insertabstract
   \ryethesis@insertacknowledgements
   \ryethesis@insertdedication
@@ -691,7 +707,9 @@
 \newcommand{\ryethesis@insertdeclaration}{%
 \ifthenelse{\boolean{@ryedraft}}
 {}
-{\ryethesis@clearpage\declaration}
+{
+\ryethesis@clearpage\phantomsection\label{declaration}\addcontentsline{toc}{section}{\textit{\mdseries{}Declaration}}\declaration
+}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -704,6 +722,7 @@
 \newcommand{\abstract}[1]{\ifx\empty#1\else\gdef\ryethesis@theabstract{\begin{center}\section*{Abstract}\end{center}#1}\fi}
 \newcommand{\ryethesis@insertabstract}{%
 \ryethesis@clearpage
+\phantomsection\label{abstract}\addcontentsline{toc}{section}{\textit{\mdseries{}Abstract}}
 % A UMI/ProQuest compatible abstract
 \begin{spacing}{2}
 \begin{center}
@@ -736,6 +755,7 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \newcommand{\ryethesis@insertacknowledgements}{%
 \ifx\empty\ryethesis@theacknowledgements\else{
 \ryethesis@clearpage
+\phantomsection\label{acknowledgements}\addcontentsline{toc}{section}{\textit{\mdseries{}Acknowledgements}}
 \begin{center}
 \section*{Acknowledgements}
 \end{center}
@@ -748,6 +768,7 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \newcommand{\ryethesis@insertdedication}{%
 \ifx\empty\ryethesis@thededication\else{
 \ryethesis@clearpage
+\phantomsection\label{dedication}\addcontentsline{toc}{section}{\textit{\mdseries{}Dedication}}
 \begin{center}
 \section*{Dedication}
 \end{center}
@@ -821,25 +842,29 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 }
 
 \newcommand{\ryethesis@insertlot}{
-\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\listoftables}{}
+\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\phantomsection\label{listoftab}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+    of Tables}}\listoftables}{}
 }
 
 \ifthenelse{\boolean{@ryelistofplates}}
 {\RequirePackage{float}\newfloat{plate}{h}{lop}}{}
 
 \newcommand{\ryethesis@insertlop}{
-\ifthenelse{\boolean{@ryelistofplates}}{\ryethesis@clearpage\listof{plate}{List of Plates}}{}
+\ifthenelse{\boolean{@ryelistofplates}}{\ryethesis@clearpage\phantomsection\label{listofplates}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+    of Plates}}\listof{plate}{List of Plates}}{}
 }
 
 \newcommand{\ryethesis@insertlof}{
-\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\listoffigures}{}
+\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\phantomsection\label{listoffig}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+    of Figures}}\listoffigures}{}
 }
 
 \ifthenelse{\boolean{@ryelistofillustrations}}
 {\RequirePackage{float}\newfloat{illustration}{h}{loi}}{}
  
 \newcommand{\ryethesis@insertloi}{
-\ifthenelse{\boolean{@ryelistofillustrations}}{\ryethesis@clearpage\listof{illustration}{List of Illustrations}}{}
+\ifthenelse{\boolean{@ryelistofillustrations}}{\ryethesis@clearpage\phantomsection\label{listofillustrations}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+      of Illustrations}}\listof{illustration}{List of Illustrations}}{}
 }
 
 \ifthenelse{\boolean{@ryelistofappendices}}
@@ -850,7 +875,8 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 {}
 
 \newcommand{\ryethesis@insertloa}{%
-\ifthenelse{\boolean{@ryelistofappendices}}{\ryethesis@clearpage\listofappendices}{}
+\ifthenelse{\boolean{@ryelistofappendices}}{\ryethesis@clearpage\phantomsection\label{listofapp}\addcontentsline{toc}{section}
+  {\textit{\mdseries{}List of Appendices}}\listofappendices}{}
 }
 
 \renewcommand{\appendix}[1]{\ifx\empty#1\else\gdef\ryethesis@theappendices{#1}\fi}
@@ -859,7 +885,6 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 % If a list of appendices is requested, redirect the toc entries into a different file 
 \ifx\empty\ryethesis@theappendices\else{
 \ryethesis@clearpage
-\renewcommand{\thechapter}{\Alph{chapter}}
 \renewcommand{\chaptername}{Appendix}
 \setcounter{chapter}{0}
 \ryethesis@theappendices
@@ -985,7 +1010,9 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 % The |\AtBeginDocument| and |\AtEndDocument| are used to insert the front, main, and back matter in the correct place for the user. This tightly controls the order of appearance of each type of content.
 %    \begin{macrocode}
 % Insert front matter & mainmatter settings before user's material
-\AtBeginDocument{
+% Fix for use of color package
+\RequirePackage{etoolbox}
+\AfterEndPreamble{
 \frontmatter\mainmatter
 }
 % Insert back matter at the end
diff --git a/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls b/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls
index 69b04fa47c0..f2bb53fcf5c 100644
--- a/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls
+++ b/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls
@@ -50,6 +50,13 @@
    \setboolean{@ryedraft}{true}
 }
 
+\DeclareOption{review}{
+   \typeout{Ryerson-Thesis Class Option: `review'}
+   \ExecuteOptions{10pt,oneside}
+   \PassOptionsToClass{final,oneside}{book}
+   \setboolean{@ryedraft}{false}
+}
+
 \DeclareOption{final}{
    \typeout{Ryerson-Thesis Class Option: `final'}
    \ExecuteOptions{10pt,twoside}
@@ -182,7 +189,7 @@
  \pagenumbering{roman}
   \pagestyle{plain}
   \maketitle
-  \ryethesis@insertdeclaration
+ \ryethesis@insertdeclaration
   \ryethesis@insertabstract
   \ryethesis@insertacknowledgements
   \ryethesis@insertdedication
@@ -324,12 +331,15 @@
 \newcommand{\ryethesis@insertdeclaration}{%
 \ifthenelse{\boolean{@ryedraft}}
 {}
-{\ryethesis@clearpage\declaration}
+{
+\ryethesis@clearpage\phantomsection\label{declaration}\addcontentsline{toc}{section}{\textit{\mdseries{}Declaration}}\declaration
+}
 }
 
 \newcommand{\abstract}[1]{\ifx\empty#1\else\gdef\ryethesis@theabstract{\begin{center}\section*{Abstract}\end{center}#1}\fi}
 \newcommand{\ryethesis@insertabstract}{%
 \ryethesis@clearpage
+\phantomsection\label{abstract}\addcontentsline{toc}{section}{\textit{\mdseries{}Abstract}}
 \begin{spacing}{2}
 \begin{center}
 \normalsize
@@ -350,6 +360,7 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \newcommand{\ryethesis@insertacknowledgements}{%
 \ifx\empty\ryethesis@theacknowledgements\else{
 \ryethesis@clearpage
+\phantomsection\label{acknowledgements}\addcontentsline{toc}{section}{\textit{\mdseries{}Acknowledgements}}
 \begin{center}
 \section*{Acknowledgements}
 \end{center}
@@ -362,6 +373,7 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \newcommand{\ryethesis@insertdedication}{%
 \ifx\empty\ryethesis@thededication\else{
 \ryethesis@clearpage
+\phantomsection\label{dedication}\addcontentsline{toc}{section}{\textit{\mdseries{}Dedication}}
 \begin{center}
 \section*{Dedication}
 \end{center}
@@ -393,25 +405,29 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 }
 
 \newcommand{\ryethesis@insertlot}{
-\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\listoftables}{}
+\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\phantomsection\label{listoftab}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+    of Tables}}\listoftables}{}
 }
 
 \ifthenelse{\boolean{@ryelistofplates}}
 {\RequirePackage{float}\newfloat{plate}{h}{lop}}{}
 
 \newcommand{\ryethesis@insertlop}{
-\ifthenelse{\boolean{@ryelistofplates}}{\ryethesis@clearpage\listof{plate}{List of Plates}}{}
+\ifthenelse{\boolean{@ryelistofplates}}{\ryethesis@clearpage\phantomsection\label{listofplates}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+    of Plates}}\listof{plate}{List of Plates}}{}
 }
 
 \newcommand{\ryethesis@insertlof}{
-\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\listoffigures}{}
+\ifthenelse{\boolean{@ryelistoftables}}{\ryethesis@clearpage\phantomsection\label{listoffig}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+    of Figures}}\listoffigures}{}
 }
 
 \ifthenelse{\boolean{@ryelistofillustrations}}
 {\RequirePackage{float}\newfloat{illustration}{h}{loi}}{}
 
 \newcommand{\ryethesis@insertloi}{
-\ifthenelse{\boolean{@ryelistofillustrations}}{\ryethesis@clearpage\listof{illustration}{List of Illustrations}}{}
+\ifthenelse{\boolean{@ryelistofillustrations}}{\ryethesis@clearpage\phantomsection\label{listofillustrations}\addcontentsline{toc}{section}{\textit{\mdseries{}List
+      of Illustrations}}\listof{illustration}{List of Illustrations}}{}
 }
 
 \ifthenelse{\boolean{@ryelistofappendices}}
@@ -422,7 +438,8 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 {}
 
 \newcommand{\ryethesis@insertloa}{%
-\ifthenelse{\boolean{@ryelistofappendices}}{\ryethesis@clearpage\listofappendices}{}
+\ifthenelse{\boolean{@ryelistofappendices}}{\ryethesis@clearpage\phantomsection\label{listofapp}\addcontentsline{toc}{section}
+  {\textit{\mdseries{}List of Appendices}}\listofappendices}{}
 }
 
 \renewcommand{\appendix}[1]{\ifx\empty#1\else\gdef\ryethesis@theappendices{#1}\fi}
@@ -430,7 +447,6 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \newcommand{\ryethesis@insertappendix}{%
 \ifx\empty\ryethesis@theappendices\else{
 \ryethesis@clearpage
-\renewcommand{\thechapter}{\Alph{chapter}}
 \renewcommand{\chaptername}{Appendix}
 \setcounter{chapter}{0}
 \ryethesis@theappendices
@@ -529,7 +545,8 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \onehalfspacing}
 \usereferences
 }
-\AtBeginDocument{
+\RequirePackage{etoolbox}
+\AfterEndPreamble{
 \frontmatter\mainmatter
 }
 \AtEndDocument{\backmatter}