6 files changed, 67 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/latex/ryethesis/Makefile b/Master/texmf-dist/doc/latex/ryethesis/Makefile
index b08f4d996ca..6993fc56b9d 100644
--- a/Master/texmf-dist/doc/latex/ryethesis/Makefile
+++ b/Master/texmf-dist/doc/latex/ryethesis/Makefile
@@ -69,5 +69,5 @@ ryethesis.cls: Makefile ryethesis.ins ryethesis.dtx
 	@$(LATEX) $(TEXMFFLAGS) ryethesis.ins || ( cat ryethesis.log; exit 1 )
 
 ryethesis-$(VERSION).zip: ${FILES} ${TEXFILES} ${BIBFILES} ${FIGS}
-	zip $@ $^
+	@rm -f ryethesis-*.zip; rm -rf ./ryethesis; mkdir ryethesis; cp $^ ryethesis; zip $@ ryethesis/*; rm -rf ./ryethesis;
 
diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf b/Master/texmf-dist/doc/latex/ryethesis/ryesample.pdf
index 2f4e91c8659..0dbb10a8592 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 782c75742b8..54cfe376d37 100644
--- a/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex
+++ b/Master/texmf-dist/doc/latex/ryethesis/ryesample.tex
@@ -1,4 +1,7 @@
 \documentclass[final,los,index,glossary,loa]{ryethesis}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amsthm}
 %
 % Note that this usage example is not an introduction to using LaTeX. You are highly recommended to check out Leslie Lamport's "LaTeX: A Document Preparation System". Please read through this file to get started using the ryethesis document class, including all comments!
 %
diff --git a/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf b/Master/texmf-dist/doc/latex/ryethesis/ryethesis.pdf
index 7a83d4d5211..dc72ba7c607 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 decf6247905..8bdf5f37364 100644
--- a/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
+++ b/Master/texmf-dist/source/latex/ryethesis/ryethesis.dtx
@@ -22,7 +22,7 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{ryethesis}
 %<*class>
-    [2010/06/18 v1.3 Ryerson University thesis class definition]
+    [2014/04/23 v1.35 Ryerson University thesis class definition]
 %</class>
 %
 %<*driver>
@@ -39,7 +39,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{893}
+% \CheckSum{903}
 %
 % \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
@@ -73,6 +73,10 @@
 % \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.}
+% \changes{v1.35}{2014/04/23}{Removed dependence on
+% makeidx.sty. Replaced with equivalent commands. Moved \\addcontents
+% redefinition to avoid conflict with siunitx.sty. Thanks to
+% A. Penniston. }
 %
 % \GetFileInfo{ryethesis.dtx}
 %
@@ -905,8 +909,13 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 
 \ifthenelse{\boolean{@ryeindex}}
 {
-%\RequirePackage{index}\makeindex
-\RequirePackage{makeidx}\makeindex
+% In case underlying class does not define these parameters
+\providecommand*\see[2]{\emph{\seename} #1}
+\providecommand*\seealso[2]{\emph{\alsoname} #1}
+\providecommand\printindex{\@input@{\jobname.ind}}
+\providecommand\seename{see}
+\providecommand*\alsoname{see also}
+\makeindex
 \RequirePackage{multicol}
 \renewenvironment{theindex}
                {\begin{multicols}{2}[\@makeschapterhead{\indexname}\addcontentsline{toc}{chapter}{\indexname}%
@@ -980,22 +989,11 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 % \end{macro}
 % \end{macro}
 
-% \begin{macrocode}
-%Adjust |\addtocontents| to switch from toc to toa file if using List
-%of Appendices
-\newcommand{\Saved@addtocontents}{}
-\let\Saved@addtocontents\addtocontents
-\def\addtocontents#1#2{%
-\if@ryethesismatchtoc%
-{\ifthenelse{\equal{#1}{toc}}%
-{\Saved@addtocontents{toa}{#2}}
-{\Saved@addtocontents{#1}{#2}}}
-\else
-{\Saved@addtocontents{#1}{#2}}
-\fi}
-% \end{macrocode}
-
-% Final commands to issue at the end of the class. In the case of draft mode, the line spacing is set to double spacing. In final mode, a line spacing of 1.5 is used, as required by SGS. The |\usereferences| command is used to label the bibliographic section as ``References'' by default.
+% Final commands to issue at the end of the class. In the case of
+% draft mode, the line spacing is set to double spacing. In final
+% mode, a line spacing of 1.5 is used, as required by SGS. The
+% |\usereferences| command is used to label the bibliographic section
+% as ``References'' by default. 
 %    \begin{macrocode}
 
 \AtEndOfClass{
@@ -1005,14 +1003,37 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 {% Final mode uses 1.5 spacing as specified in SGS policy Sept. 2009.
 \onehalfspacing}
 \usereferences
+
+
 }
 %    \end{macrocode}
-% 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.
+% 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. Note that the |\addcontents| command is redefined here to
+% redirect List of Appendices entries into a separate file if so
+% desired. 
 %    \begin{macrocode}
 % Insert front matter & mainmatter settings before user's material
 % Fix for use of color package
 \RequirePackage{etoolbox}
 \AfterEndPreamble{
+
+%Adjust |\addtocontents| to switch from toc to toa file if using List
+%of Appendices. This is processed at the end of the class to avoid
+%conflicts with packages such as siunitx.
+
+\newcommand{\Saved@addtocontents}{}
+\let\Saved@addtocontents\addtocontents
+\def\addtocontents#1#2{%
+\if@ryethesismatchtoc%
+{\ifthenelse{\equal{#1}{toc}}%
+{\Saved@addtocontents{toa}{#2}}
+{\Saved@addtocontents{#1}{#2}}}
+\else
+{\Saved@addtocontents{#1}{#2}}
+\fi}
+
 \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 f2bb53fcf5c..92af164c356 100644
--- a/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls
+++ b/Master/texmf-dist/tex/latex/ryethesis/ryethesis.cls
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ryethesis}
-    [2010/06/18 v1.3 Ryerson University thesis class definition]
+    [2014/04/23 v1.35 Ryerson University thesis class definition]
 
 \RequirePackage{ifthen}
 \RequirePackage{fancyhdr}
@@ -466,7 +466,12 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 
 \ifthenelse{\boolean{@ryeindex}}
 {
-\RequirePackage{makeidx}\makeindex
+\providecommand*\see[2]{\emph{\seename} #1}
+\providecommand*\seealso[2]{\emph{\alsoname} #1}
+\providecommand\printindex{\@input@{\jobname.ind}}
+\providecommand\seename{see}
+\providecommand*\alsoname{see also}
+\makeindex
 \RequirePackage{multicol}
 \renewenvironment{theindex}
                {\begin{multicols}{2}[\@makeschapterhead{\indexname}\addcontentsline{toc}{chapter}{\indexname}%
@@ -525,17 +530,6 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 \newcommand{\usereferences}{\renewcommand{\bibname}{References}}
 \newcommand{\useendnotes}{\renewcommand{\bibname}{End Notes}}
 
-\newcommand{\Saved@addtocontents}{}
-\let\Saved@addtocontents\addtocontents
-\def\addtocontents#1#2{%
-\if@ryethesismatchtoc%
-{\ifthenelse{\equal{#1}{toc}}%
-{\Saved@addtocontents{toa}{#2}}
-{\Saved@addtocontents{#1}{#2}}}
-\else
-{\Saved@addtocontents{#1}{#2}}
-\fi}
-
 
 \AtEndOfClass{
 \ifthenelse{\boolean{@ryedraft}}
@@ -544,9 +538,23 @@ Ryerson University{\ifx\empty\ryethesis@partnerUniv\else{ and
 {% Final mode uses 1.5 spacing as specified in SGS policy Sept. 2009.
 \onehalfspacing}
 \usereferences
+
 }
 \RequirePackage{etoolbox}
 \AfterEndPreamble{
+
+
+\newcommand{\Saved@addtocontents}{}
+\let\Saved@addtocontents\addtocontents
+\def\addtocontents#1#2{%
+\if@ryethesismatchtoc%
+{\ifthenelse{\equal{#1}{toc}}%
+{\Saved@addtocontents{toa}{#2}}
+{\Saved@addtocontents{#1}{#2}}}
+\else
+{\Saved@addtocontents{#1}{#2}}
+\fi}
+
 \frontmatter\mainmatter
 }
 \AtEndDocument{\backmatter}