3 files changed, 54 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/uothesis/uothesis.pdf b/Master/texmf-dist/doc/latex/uothesis/uothesis.pdf
index 34c697cf685..8d9332001c1 100644
--- a/Master/texmf-dist/doc/latex/uothesis/uothesis.pdf
+++ b/Master/texmf-dist/doc/latex/uothesis/uothesis.pdf
diff --git a/Master/texmf-dist/source/latex/uothesis/uothesis.dtx b/Master/texmf-dist/source/latex/uothesis/uothesis.dtx
index 55a2c4b1d46..b5fc4297b21 100644
--- a/Master/texmf-dist/source/latex/uothesis/uothesis.dtx
+++ b/Master/texmf-dist/source/latex/uothesis/uothesis.dtx
@@ -106,7 +106,7 @@ uothesis.ins, and, uothesis.pdf.
 \NeedsTeXFormat{LaTeX2e}
 %</class>
 %<*driver>
-\ProvidesFile{\jobname.dtx}[2011/02/18 v2.5 Submission to University of Oregon Graduate School]
+\ProvidesFile{\jobname.dtx}[2011/04/10 v2.5.1 Submission to University of Oregon Graduate School]
 \documentclass[a4paper]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage{achemso,array,booktabs,lmodern}
@@ -300,9 +300,13 @@ uothesis.ins, and, uothesis.pdf.
 %\section{Introduction}
 %The |uothesis| class file provides support for generating properly formatted documents that comply with the \UOGS\ style guidelines for the preparation of dissertations and theses.  The use of this class does not replace the review process by the Thesis Editor or guarantee the document will pass that review perfectly.  Its intention is to simplify the formatting of the document and limit the type of possible corrections to minor fine tuning. This document summarizes the features of the class and provides an example header for the generation of a basic document.  This document is NOT intended as a substitute for the \UOGS\ manual and will not be repeating the specifics of document formatting, as the user is expected to have downloaded, read and understood that manual\footnote{\styref}.
 %
-%\subsection{New To This Version}
+%\subsection{New To This Version (2.5)}
 %
-%There have been a number of changes to this version to deal with a couple of persistent bugs in the code and to make the CV a little easier to write.  The changes to the CV are indicated below in the appropriate section\footnote{Please note that you will have to change your current CV structure to get a clean compile at this point}Second, the package |natbib| is now required and loaded by the cls.  Users should  add the |\usepackage| command from their header files as shown in the example header later in this document.  Customization of the citation formatting can be accomplished through the use of a list of options as described in the |natbib| documentation.  The last change is the requiring of the command |\formatbib| to the header file above the bibliography section as demonstrated in the example header later in this document.  
+%There have been a number of changes to this version to deal with a couple of persistent bugs in the code and to make the CV a little easier to write.  The changes to the CV are indicated below in the appropriate section\footnote{Please note that you will have to change your current CV structure to get a clean compile at this point}Second, the package |natbib| is now required by the cls.  Users should  add the |\usepackage| command from their header files as shown in the example header later in this document.  Customization of the citation formatting can be accomplished through the use of a list of options as described in the |natbib| documentation.  The last change is the requiring of the command |\formatbib| to the header file above the bibliography section as demonstrated in the example header later in this document.  
+%
+%\subsection{New To This Version (2.5.1)}
+%
+%The package |natbib| is still required by the cls, but now it is loaded directly, no user input is required to load |\natbib| by itself.  Customization of the citation formatting can now be accomplished through the use the options, as described in the |natbib| documentation, included in the options for the class itself.  This change is reflected in the example header in this document.  Last, the problem requiring the |\formatbib| command has been corrected and now is not needed.  Calling the |\formatbib| command will now produce an error.  
 %
 %\section{Installation}
 %
@@ -473,7 +477,7 @@ uothesis.ins, and, uothesis.pdf.
 %
 %\subsection{Manuscript header example}
 %\begin{verbatim}
-%\documentclass[dissertation,justified,copyright,draftimages,final,
+%\documentclass[dissertation,justified,copyright,draftimages,final,numbers,sort&compress
 %gsmodern]{uothesis}
 %
 %\usepackage[english,UKenglish]{babel}
@@ -531,7 +535,6 @@ uothesis.ins, and, uothesis.pdf.
 %	\include{tappendix_1}	
 %
 %	REFERENCES
-%\formatbib
 %\bibliographystyle{unsrtnat}
 %\bibliography{bib}
 %\end{document}
@@ -665,7 +668,7 @@ uothesis.ins, and, uothesis.pdf.
 %
 %    \begin{macrocode}
 %<*class>
-\ProvidesClass{uothesis} [2010/12/21 v2.5 Submission to
+\ProvidesClass{uothesis} [2010/04/10 v2.5.1 Submission to
  University of Oregon Graduate School]
 %    \end{macrocode}
 %
@@ -691,6 +694,7 @@ uothesis.ins, and, uothesis.pdf.
 %
 %Here we declare the draft option flags and conditionals for the code.
 %
+%\changes{v2.5.1}{2010/04/10}{Added natbib if statement}
 %    \begin{macrocode}
 \newif\ifthesis
 \newif\ifdraftcopy
@@ -705,6 +709,7 @@ uothesis.ins, and, uothesis.pdf.
 \newif\ifamstex
 \newif\ifchem
 \newif\ifbound
+\newif\ifnatbib
 \newif\if@dissertation
 \newif\if@copyright
 \newif\if@gsmodern
@@ -713,8 +718,9 @@ uothesis.ins, and, uothesis.pdf.
 \newif\if@draftimage
 %    \end{macrocode}
 % Now we declare the class options and assign the flags for each option. 
+%\changes{v2.5.1}{2010/04/10}{Added natbib option}
 %    \begin{macrocode}
-\DeclareOption{dissertation}{\@dissertationtrue\thesistrue}
+\DeclareOption{dissertation}{\@dissertationtrue\thesistrue\natbibtrue}
 \DeclareOption{msthesis}{\@dissertationfalse\thesistrue}
 \DeclareOption{draftimages}{\draftimagetrue\PassOptionsToPackage{draft}{graphicx}}
 \DeclareOption{draftcopy}{\drafttrue\draftcopytrue\boundtrue}
@@ -732,6 +738,8 @@ uothesis.ins, and, uothesis.pdf.
 	\committeedraftfalse\latedraftfalse\finaltrue}
 \DeclareOption{lipsum}{\lipsumtrue}
 \DeclareOption{bound}{\boundtrue}
+\DeclareOption{natbib}{\natbibtrue}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{natbib}}
 %    \end{macrocode}
 %
 %  Finally, we process the options.
@@ -823,6 +831,15 @@ uothesis.ins, and, uothesis.pdf.
 \fi
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{natbib}
+% call natbib package if enabled, which is the default setting
+%\changes{v2.5.1}{2010/04/10}{Added natbib optional call here}
+%    \begin{macrocode}
+\ifnatbib
+	\RequirePackage{natbib}
+\fi
+%    \end{macrocode}
+%\end{macro}
 
 %\subsubsection{Draft Only Macros and Options}
 %\begin{macro}{draftwatermark}
@@ -961,6 +978,12 @@ uothesis.ins, and, uothesis.pdf.
 \def\@mysingle{\singlespace\large\normalsize\setstretch{1.7}}	
 %    \end{macrocode}
 %\end{macro}
+%\begin{macro}{\@mysinglespace}
+%Define third special single space environment.
+%    \begin{macrocode}
+\def\@mybibsingle{\singlespace\large\normalsize\setstretch{1}}	
+%    \end{macrocode}
+%\end{macro}
 %\begin{macro}{\@draftdate}
 %Define draftdate: YYYY/MM/DD
 %    \begin{macrocode}
@@ -1200,6 +1223,7 @@ uothesis.ins, and, uothesis.pdf.
 
 %\subsubsection{CV commands}
 %\changes{2.5}{2011/02/18}{Major restructuring of the CV area to allow for a more LaTeX-like experience.  Borrowing code ideas from alternate physics LaTeX Code.}
+%\changes{v2.5.1}{2010/04/10}{Added new single space command for the bibliography}
 %\begin{macro}{CV Variables}
 \gdef\@schools{}
 \gdef\@degrees{}
@@ -2446,6 +2470,7 @@ Draft of \@longdraftdate\\
 
 %\subsection{Bibliography Formatting}
 %\changes{v2.5}{2011/03/05}{Added formatbib}
+%\changes{v2.5.1}{2010/04/10}{Removed formatbib command and chaned single space call.}
 %\begin{macro}{\@bibsection}
 %Here we create the bibsection command from a chapter and add an entry to the TOC.
 %    \begin{macrocode}
@@ -2454,14 +2479,14 @@ Draft of \@longdraftdate\\
 	\addcontentsline{toc}{chapter}{#1}
 	\@startchapter{#1}
 	\singlespacing
-	\@mysingle
+	\@mybibsingle
 	\vspace*{3ex}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\thebibliography}
 %Here we build the bibliography using the bibsection command.
 %    \begin{macrocode}
-\def\thebibliography{	
+\def\thebibliography#1{	
 	\@bibsection{REFERENCES CITED}\list
 	{[\arabic{enumi}]}{\labelwidth\z@ \itemindent-\parindent
 	\leftmargin\parindent
@@ -2472,10 +2497,10 @@ Draft of \@longdraftdate\\
 	\raggedright
 	\sfcode`\.=1000\relax}
 	\let\endthebibliography=\endlist
-\newcommand{\formatbib}{
-	\addcontentsline{toc}{chapter}{REFERENCES CITED}
-	\singlespacing
-	\renewcommand\bibname{REFERENCES CITED}}
+%%\newcommand{\formatbib}{
+%%	\addcontentsline{toc}{chapter}{REFERENCES CITED}
+%%	\renewcommand\bibname{REFERENCES CITED}}
+\AtEndOfClass{\renewcommand\bibname{REFERENCES CITED}}
 %    \end{macrocode}
 %\end{macro}
 
@@ -2696,4 +2721,4 @@ Draft of \@longdraftdate\\
 %\end{macro}
 %</class>
 %\Finale
-%
+%
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/uothesis/uothesis.cls b/Master/texmf-dist/tex/latex/uothesis/uothesis.cls
index 73d3c3063d3..a82ded469c9 100644
--- a/Master/texmf-dist/tex/latex/uothesis/uothesis.cls
+++ b/Master/texmf-dist/tex/latex/uothesis/uothesis.cls
@@ -14,7 +14,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{uothesis} [2010/12/21 v2.5 Submission to
+\ProvidesClass{uothesis} [2010/04/10 v2.5.1 Submission to
  University of Oregon Graduate School]
 \typeout{UO Thesis Class}
 \typeout{}
@@ -39,13 +39,14 @@
 \newif\ifamstex
 \newif\ifchem
 \newif\ifbound
+\newif\ifnatbib
 \newif\if@dissertation
 \newif\if@copyright
 \newif\if@gsmodern
 \newif\if@numsections
 \newif\if@contnumb
 \newif\if@draftimage
-\DeclareOption{dissertation}{\@dissertationtrue\thesistrue}
+\DeclareOption{dissertation}{\@dissertationtrue\thesistrue\natbibtrue}
 \DeclareOption{msthesis}{\@dissertationfalse\thesistrue}
 \DeclareOption{draftimages}{\draftimagetrue\PassOptionsToPackage{draft}{graphicx}}
 \DeclareOption{draftcopy}{\drafttrue\draftcopytrue\boundtrue}
@@ -63,6 +64,8 @@
 \committeedraftfalse\latedraftfalse\finaltrue}
 \DeclareOption{lipsum}{\lipsumtrue}
 \DeclareOption{bound}{\boundtrue}
+\DeclareOption{natbib}{\natbibtrue}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{natbib}}
 \ProcessOptions
 \ifthesis\else
 \typeout{warning: Neither msthesis nor dissertation specified}
@@ -106,6 +109,9 @@
 \iflipsum
 \RequirePackage{lipsum}
 \fi
+\ifnatbib
+\RequirePackage{natbib}
+\fi
 
 \ifdraft
 \RequirePackage{draftwatermark}
@@ -171,6 +177,7 @@ size=\scriptsize,caption={CITE \arabic{chapter}.\arabic{citation}: #1}]
 \newenvironment{normalspace}{\begin{singlespacing}}{\end{singlespacing}}
 \def\@mydouble{\endsinglespace\large\normalsize\setstretch{1.7}}
 \def\@mysingle{\singlespace\large\normalsize\setstretch{1.7}}
+\def\@mybibsingle{\singlespace\large\normalsize\setstretch{1}}
 \def\@draftdate{{\the\year/\/\two@digits{\the\month}/\/\two@digits{\the\day}}}
 \def\@longdraftdate{\today}
 \if@dissertation
@@ -866,9 +873,9 @@ extra appendices; rerun LaTeX}
 \addcontentsline{toc}{chapter}{#1}
 \@startchapter{#1}
 \singlespacing
-\@mysingle
+\@mybibsingle
 \vspace*{3ex}}
-\def\thebibliography{
+\def\thebibliography#1{
 \@bibsection{REFERENCES CITED}\list
 {[\arabic{enumi}]}{\labelwidth\z@ \itemindent-\parindent
 \leftmargin\parindent
@@ -879,10 +886,10 @@ extra appendices; rerun LaTeX}
 \raggedright
 \sfcode`\.=1000\relax}
 \let\endthebibliography=\endlist
-\newcommand{\formatbib}{
-\addcontentsline{toc}{chapter}{REFERENCES CITED}
-\singlespacing
-\renewcommand\bibname{REFERENCES CITED}}
+%%\newcommand{\formatbib}{
+%% \addcontentsline{toc}{chapter}{REFERENCES CITED}
+%% \renewcommand\bibname{REFERENCES CITED}}
+\AtEndOfClass{\renewcommand\bibname{REFERENCES CITED}}
 
 \def\thefigure{\@arabic\c@figure}
 \def\fnum@figure{FIGURE \thefigure}