uotehsis 2.5.1 (13apr11)

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

1 files changed, 15 insertions, 8 deletions

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}