uothesis 2.5 (15mar11)

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

8 files changed, 277 insertions, 82 deletions

diff --git a/Master/texmf-dist/doc/latex/uothesis/README.txt b/Master/texmf-dist/doc/latex/uothesis/README.txt
new file mode 100644
index 00000000000..b77f1a9757d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/uothesis/README.txt
@@ -0,0 +1,37 @@
+----------------------------------------------------------------
+uothesis --- Support for University of Oregon Graduate School requirements
+for the formatting of doctoral dissertations and and masters theses
+E-mail: mander13@uoregon.edu
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+The uothesis bundle provides a LaTeX class file and documentation for the class
+file.  The class file generates documents that are suitable for submission to the
+Graduate School and conform with the style requirements for dissertations and theses
+as laid out in the Fall 2010 UO graduate school student manual.
+
+The basic format for this dtx and the associcated files are shamelessly mooched from
+the achemso package dtx and ins files.  My thanks to their authors for the excellent
+examples.
+
+Installation
+------------
+
+The package is supplied in dtx format.  To
+unpack the dtx, running 'tex uothesis.dtx' will extract
+the package whereas 'latex uothesis.dtx will extract it and also
+typeset the documentation.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly
+because of the number of demonstration items included in the
+text. To compile the documentation without error, you will
+need the packages:
+ - array
+ - booktabs
+ - hypdoc
+ - listings
+ - lmodern
+ - mathpazo
+ - microtype
diff --git a/Master/texmf-dist/doc/latex/uothesis/acs-uothesis.bib b/Master/texmf-dist/doc/latex/uothesis/acs-uothesis.bib
new file mode 100644
index 00000000000..c98ad94a9fc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/uothesis/acs-uothesis.bib
@@ -0,0 +1,9 @@
+This is an auxiliary file used by the `achemso' bundle.
+This file may safely be deleted. It will be recreated as required.
+ 
+@Control{achemso-control,
+  ctrl-use-title     =  "no",
+  ctrl-etal-number   =  "15",
+  ctrl-etal-firstonly =  "yes",
+}
+
diff --git a/Master/texmf-dist/doc/latex/uothesis/uothesis.hd b/Master/texmf-dist/doc/latex/uothesis/uothesis.hd
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/uothesis/uothesis.hd
diff --git a/Master/texmf-dist/doc/latex/uothesis/uothesis.pdf b/Master/texmf-dist/doc/latex/uothesis/uothesis.pdf
index de8f92b4af1..34c697cf685 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 955a855f79d..55a2c4b1d46 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}[2010/12/21 v2.4 Submission to University of Oregon Graduate School]
+\ProvidesFile{\jobname.dtx}[2011/02/18 v2.5 Submission to University of Oregon Graduate School]
 \documentclass[a4paper]{ltxdoc}
 \usepackage[T1]{fontenc}
 \usepackage{achemso,array,booktabs,lmodern}
@@ -114,7 +114,6 @@ uothesis.ins, and, uothesis.pdf.
 \usepackage[numbered]{hypdoc}
 \EnableCrossrefs
 \CodelineIndex
-\OnlyDescription
 \RecordChanges
 \begin{document}
   \DocInput{\jobname.dtx}
@@ -301,6 +300,10 @@ 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}
+%
+%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.  
+%
 %\section{Installation}
 %
 % The package is supplied in \file{dtx} format, running 
@@ -333,6 +336,7 @@ uothesis.ins, and, uothesis.pdf.
 %  \item \pkg{xcolor}
 %  \item \pkg{graphicx}
 %  \item \pkg{setspace}
+% \item \pkg{natbib}
 %  \item \pkg{lineno}
 %  \item \pkg{layouts}
 %  \item \pkg{todonotes}
@@ -343,7 +347,6 @@ uothesis.ins, and, uothesis.pdf.
 %Additional features and functionality may require the following packages:
 %\begin{multicols}{2}
 %\begin{itemize}
-%  \item \pkg{chemstyle} (for |chemistry|)
 %  \item \pkg{mhchem} (for |chemistry|)
 %  \item \pkg{amsmath} (for |amstex|)
 %  \item \pkg{amsthm} (for |amstex|)
@@ -428,6 +431,9 @@ uothesis.ins, and, uothesis.pdf.
 %\end{LaTeXdemo} 
 %The line would break at the point indicated.  This macro does not always work depending on how badly other typesetting rules are violated and should only be used in the square bracketed "short title" area.  Note that to conform to the \UOGS\ style manual the title in the square and curly brackets should be identical.  A second caveat to this command is that it is especially unstable with the use of ragged right text blocks.  The method that is used for the fully justified text block (\LaTeX\ default) is incompatible with the |Ragged2e| package, and so a second method, |\newline|, is used.  This method gives \LaTeX\ the option of allowing a page break in the middle of the TOC entry.
 %
+%\DescribeMacro{\ie}\DescribeMacro{\etc}\DescribeMacro{\etal}\DescribeMacro{\eg}
+%The following commands to provide macro's for common latin phrases.  These commands assume that it is desired for these phrases to be italicized and provide proper punctuation after the latin phase.  The code is taken from the Chemstyle package.  
+%
 %\subsection[Editing macros]{Editing macros (\opt{draftcopy, committeedraft})}
 %\DescribeMacro{\ednote{}} 
 %|\ednote{}| is a variation on standard margin notes.  A numbered margin note will be placed in the margin with a place holder in the text body at the location in the text.  A line will connect the place holder with the margin note and the text in the "|{}|"  will appear on the notes page in the draft copy of the document.  The macro is used so:
@@ -462,7 +468,6 @@ uothesis.ins, and, uothesis.pdf.
 %	 \cmath{(\text{Fd3m, } \langle 111\rangle_{SL} )} + Se ^ }
 %\end{LaTeXdemo}
 %
-%
 %\section{Manuscript organization}
 %It is suggested that you use some scheme for breaking up your document both for ease of editing and for debugging purposes.  The method that has been suggested in the past is to break up the manuscript into a header or root file and a series of dependent tex files that contain one chapter each contained in a directory folder.  These dependent tex files can then be included or excluded by using |\include{}| commands.  |uothesis| is set up to support this method of working.  The inclusion of the "|\% !TEX root =|\meta{path to root file}" command will aid in this.  The manuscript header example provided demonstrates one possible scheme for splitting of documents.  The different components of the header and will be provided in the next section.
 %
@@ -526,6 +531,7 @@ uothesis.ins, and, uothesis.pdf.
 %	\include{tappendix_1}	
 %
 %	REFERENCES
+%\formatbib
 %\bibliographystyle{unsrtnat}
 %\bibliography{bib}
 %\end{document}
@@ -533,7 +539,7 @@ uothesis.ins, and, uothesis.pdf.
 %Note that the various components of the document are kept separate with |\include| commands.  The exception is the |\input| command used for the |custom_cmds.tex|.  The difference comes from the fact that |\input| is treated as part of the header file itself and is processed in line with the rest of the code.  The |\import| command takes the output of the target file and adds that, resulting in pages breaks  after each |\include|.  This is handy, as the style manual requires that each chapter starts on a new page.
 %
 %\section{Manuscript meta-data}
-%
+%Pleas note that in all cases the below macro's are \emph{macro's} and not \emph{environments}.  As an example, most \LaTeX\ classes have a |\begin{abstract}|\ldots|\end{abstract}| environment that is used to handle the abstract text.  This is not the case with this class, the method used for handling the front-matter requires that these elements be passed to \LaTeX as strings in the macro's:  |\abstract{|\ldots|}|.
 %\subsection{Main information}
 %
 %\DescribeMacro{\covertitle{}}
@@ -594,47 +600,60 @@ uothesis.ins, and, uothesis.pdf.
 %Optional,  small text block.
 %
 %\subsection{The Curriculum Vitae}
-%
+%\changes{v2.5}{2011/02/18}{A significant rewrite of the CV handling.}
 %\DescribeMacro{\birthplace{}}
 %The birth place of the author
 %
 %\DescribeMacro{\birthday{}}
 %author's birthday
 %
-%\DescribeMacro{\schools{}}
-%List of the schools attended by the author, with their city and state of location.  Each school is on its own line with a blank line in between:
+%\DescribeMacro{\school{}}
+%\changes{v2.5}{2011/02/18}{changed the schools command, and turned it into a 1 entry macro.}
+%List of the schools attended by the author, with their city and state of location.  Each school is on its own |\school{}| entry:
 %\begin{LaTeXdemo}[code only]
-%	\schools{University of Somewhere, City, State
-%	
-%	 	University of Somewhere Else, City, State
-%		
-%		A State School, City, State}
+%	\school{University of Somewhere, City, State
+%	\school{University of Somewhere Else, City, State}
+%	\school{A State School, City, State}
 %\end{LaTeXdemo}
 %
-%\DescribeMacro{\degrees{}}
-%List of the education of the author.  The list takes the form of an entry followed by a blank line followed by the next entry. Each entry should be formatted so: \meta{full degree name} in \meta{field}, \meta{year}, \meta{school name}.  An example is below:
+%\DescribeMacro{\degree{}}
+%\changes{v2.5}{2011/02/18}{changed the degrees command, and turned it into a 1 entry macro.}
+%List of the education of the author.  Each degree has its own |\degree{}| entry. Each entry should be formatted so: \meta{full degree name} in \meta{field}, \meta{year}, \meta{school name}.  An example is below:
 %\begin{LaTeXdemo}[code only]
-%	\degrees{Doctor of Philosophy in submersible basketry, 2010, 
-%			University of Somewhere
-%	
-%	 	Master of Something in something important, 2005,
-%			University of Somewhere Else
-%		
-%		Bachelor of Something in something completely different, 2002, 
+%	\degree{Doctor of Philosophy in submersible basketry, 2010, 
+%			University of Somewhere}
+%	\degree{Master of Something in something important, 2005,
+%			University of Somewhere Else}
+%	\degree{Bachelor of Something in something completely different, 2002, 
 %			A State School.}
 %\end{LaTeXdemo}
 %
 %\DescribeMacro{\interests{}}
 %A comma delimited list of interests.
 %
-%\DescribeMacro{\experience{}}
-%Work history related to the authors research, as with |\schools{}| and |\degrees{}|, one entry per line with a blank line in between.
+%\DescribeMacro{\position{}}
+%\changes{v2.5}{2011/02/18}{changed the experience command, and turned it into a 1 entry macro.}
+%Work history related to the authors research, as with |\school{}| and |\degree{}|, one entry per macro call.
+%
+%\DescribeMacro{\award{}}
+%\changes{v2.5}{2011/02/18}{changed the awards command, and turned it into a 1 entry macro.}
+%Awards and honors, one per call to the macro as with |\school{}|, |\degree{}|, and |\position{}|.
 %
-%\DescribeMacro{\awards{}}
-%A list of awards and honors.
+%\DescribeMacro{\publication{}}
+%\changes{v2.5}{2011/02/18}{changed the publications command, and turned it into a 1 entry macro.}
+%This section should be formatted the same way as |\schools{}|, etc.  The actual entries must be formatted \emph{exactly} the same as the References Cited section of the document.  The easiest way to do this is to take a bibtex file with the authors publications, and create a .bib file for that using the same bibtex style and then copy and pasting it into this section each |\bibitem{}| being placed inside a |\publication{}| macro call\footnote{Yes, this is a little redundant, but it was done this way to avoid any potential conflicts with \BibTeX}. Bibdesk will do this by using one of the optional copy formats under file as should JabRef.  
 %
-%\DescribeMacro{\publications{}}
-%This section should be formatted the same way as |\schools{}|, etc.  The actual entries must be formatted \emph{exactly} the same as the References Cited section of the document.  The easiest way to do this is to take a bibtex file with the authors publications, and create a .bib file for that using the same bibtex style and then copy and pasting it into this section between the braces. Bibdesk will do this by using one of the optional copy formats under file as should JabRef.
+%\section{Trouble Shooting and FAQ's}
+%First, every attempt has been made to make this package as general and stable as is possible.  That said, bugs happen so please report them.  \emph{Before} reporting them however, there are somethings that you can do to trouble shoot.  It is suggested that you try to answer each of these questions yourself before you contact the maintainer:
+%\begin{itemize}
+%\item What does your compile log say? Are there any errors?
+%\item Are there any errors in your \BibTeX compile log?
+%\item Can you replicate the problem with a minimal example, i.e. A basic code chunk in a chapter with your header?  
+%\item Can you typeset just the front-matter (abstract, cv, etc.)?  
+%\item Do you have any extra packages installed?  
+%\item Have you checked to see if your problem is caused by a specific package or combination of packages?
+%\item Are you calling any packages that are already called by the class (section 3 of this document)?
+%\end{itemize}
 %
 %\StopEventually{^^A
 %  \PrintChanges
@@ -646,7 +665,8 @@ uothesis.ins, and, uothesis.pdf.
 %
 %    \begin{macrocode}
 %<*class>
-\ProvidesClass{uothesis} [2010/12/21 v2.4 Submission to University of Oregon Graduate School]
+\ProvidesClass{uothesis} [2010/12/21 v2.5 Submission to
+ University of Oregon Graduate School]
 %    \end{macrocode}
 %
 %Next, we print out some identifying text in the output window.
@@ -767,10 +787,12 @@ uothesis.ins, and, uothesis.pdf.
 \RequirePackage[dvipsnames]{xcolor}
 \RequirePackage{graphicx}
 \RequirePackage{setspace}
+\RequirePackage{xspace}
 \RequirePackage[left,pagewise]{lineno}
 \RequirePackage{layouts}
 \RequirePackage[colorinlistoftodos]{todonotes}
 \RequirePackage{ragged2e}
+\captionsetup{labelsep=space}
 \setlength\RaggedRightRightskip{0pt plus 1cm}
 \setlength\RaggedRightParindent{0.4in}
 %    \end{macrocode}
@@ -781,7 +803,6 @@ uothesis.ins, and, uothesis.pdf.
 %Here we define the result of calling the |chemistry| option.  We call |chemstyle| and |mhchem|.
 %    \begin{macrocode}
 \ifchem
-	\RequirePackage{chemstyle}
 	\RequirePackage[version=3]{mhchem}
 \fi
 %    \end{macrocode}
@@ -906,6 +927,19 @@ uothesis.ins, and, uothesis.pdf.
 	\ifx\@empty#1\@empty\else\label{#1}\fi\reactiontag\end{multline}}
 \fi
 %    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*{\cst@xspace}{\expandafter\xspace}
+\newcommand*{\cst@latin}{\expandafter\emph}
+\newcommand*{\etc}{\@ifnextchar.{\cst@etc}{\cst@etc.\cst@xspace}}
+\newcommand*{\invacuo}{\cst@latin{in vacuo}\cst@xspace}
+\newcommand*{\etal}{\@ifnextchar.{\cst@etal}{\cst@etal.\cst@xspace}}
+\newcommand*{\eg}{\cst@eg.}
+\newcommand*{\ie}{\cst@ie.}
+\newcommand*{\cst@etal}{\cst@latin{et~al}}
+\newcommand*{\cst@etc}{\cst@latin{etc}}
+\newcommand*{\cst@ie}{\cst@latin{i.e\spacefactor999\relax}}
+\newcommand*{\cst@eg}{\cst@latin{e.g\spacefactor999\relax}}
+%    \end{macrocode}
 %\end{macro}
 
 %\subsection{Internal Variables and Commands}
@@ -1134,6 +1168,7 @@ uothesis.ins, and, uothesis.pdf.
 %\end{macro}
 
 %\subsubsection{CV Internal 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.}
 %\begin{macro}{\cvoneline}
 % Define single line environment for CV
 %    \begin{macrocode}
@@ -1154,66 +1189,75 @@ uothesis.ins, and, uothesis.pdf.
 %    \begin{macrocode}
 \newlength{\@cvhangindent}
 %    \end{macrocode}
-% Set the hanging indent length.
+% Set the hanging indent length and deal with paragraph alignments within the CV.
 %    \begin{macrocode}
 \setlength{\@cvhangindent}{\parindent}
 \addtolength{\@cvhangindent}{1.5em}
-\long\def\cvpars#1#2{
-    	\par\vspace{1.5\baselineskip}\noindent
-    	{#1}:\nopagebreak\par #2}
+\long\def\cvpars#1{\par #1}
+\long\def\cvitem#1#2{\par\vspace{1.5\baselineskip}\noindent{#1}:\nopagebreak\par #2}
 %    \end{macrocode}
 %\end{macro}
 
 %\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.}
+%\begin{macro}{CV Variables}
+\gdef\@schools{}
+\gdef\@degrees{}
+\gdef\@birthplace{}
+\gdef\@birthday{}
+\gdef\@interests{}
+\gdef\@awards{}
+\gdef\@experience{}
+\gdef\@publications{}
 %\begin{macro}{\birthplace}
 %Define birthplace
 %    \begin{macrocode}
-\def\birthplace#1{\gdef\@birthplace{\cvoneline{PLACE OF BIRTH}{#1}}}	
+\def\birthplace#1{\gdef\@birthplace{#1}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\birthday}
 %Define birthday
 %    \begin{macrocode}
-\def\birthday#1{\gdef\@birthday{\cvoneline{DATE OF BIRTH}{#1}}}
+\def\birthday#1{\gdef\@birthdate{#1}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\schools}
 %Define educational history
 %    \begin{macrocode}
-\long\def\schools#1{\gdef\@schools{\cvpars{GRADUATE AND UNDERGRADUATE SCHOOLS ATTENDED}{#1}}}	
+\def\school#1{\expandafter\gdef\expandafter\@schools\expandafter{\@schools\cvpars{#1}}}	
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\degrees}
 %Define the degrees received.
 %    \begin{macrocode}
-\long\def\degrees#1{\gdef\@degrees{\cvpars{DEGREES AWARDED}{#1}}}
+\long\def\degree#1{\expandafter\gdef\expandafter\@degrees\expandafter{\@degrees\cvpars{#1}}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\interests}
 %Define interests
 %    \begin{macrocode}
-\long\def\interests#1{\gdef\@interests{\cvpars{AREAS OF SPECIAL INTEREST}{#1}}}
+\def\interests#1{\expandafter\gdef\expandafter\@interests\expandafter{\@interests\cvpars{#1}}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\experience}
 %Define professional experience.
 %    \begin{macrocode}
-\long\def\experience#1{\gdef\@experience{\cvpars{PROFESSIONAL EXPERIENCE}{#1}}}
+\def\position#1{\expandafter\gdef\expandafter\@experience\expandafter{\@experience\cvpars{#1}}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\awards}
 %Define awards. (optional)
 %    \begin{macrocode}
-\long\def\awards#1{\gdef\@awards{\cvpars{GRANTS, AWARDS AND HONORS}{#1}}}
+\def\award#1{\expandafter\gdef\expandafter\@awards\expandafter{\@awards\cvpars{#1}}}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\publications}
 %Define publications. (optional)
 %    \begin{macrocode}
-\long\def\publications#1{\gdef\@publications{\cvpars{PUBLICATIONS}{#1}}}
+\def\publication#1{\expandafter\gdef\expandafter\@publications\expandafter{\@publications\cvpars{#1}}}
 %    \end{macrocode}
 %\end{macro}
-
+%\end{macro}
 %\subsection{Preliminary page formatting, layout, and settings}
 %Set the text spacing to a little under double spacing.
 %    \begin{macrocode}
@@ -1811,34 +1855,35 @@ Title: \@abstracttitle\\*[\baselineskip]
 %    \begin{macrocode}
 \vspace*{3ex}
 %    \end{macrocode}
-% suppress indenting
-%    \begin{macrocode}
-\noindent
-%    \end{macrocode}
 % call author string.
 %    \begin{macrocode}
-NAME OF AUTHOR: \@author
+\noindent NAME OF AUTHOR:\quad \@author \vskip\baselineskip
 %    \end{macrocode}
 % call birthplace string.
 %    \begin{macrocode}
-\@optional{@birthplace}
+\noindent PLACE OF BIRTH:\quad \@birthplace \vskip\baselineskip
 %    \end{macrocode}
 % call birthday string.
 %    \begin{macrocode}
-\@optional{@birthday}
+\noindent DATE OF BIRTH:\quad \@birthdate \vskip\baselineskip
 \everypar={\hangindent=\@cvhangindent}
 %    \end{macrocode}
 % call the educational history string.
 %    \begin{macrocode}
+\noindent GRADUATE AND UNDERGRADUATE SCHOOLS ATTENDED:
 \@schools
+\vskip \baselineskip
 %    \end{macrocode}
 % call the degrees string.
 %    \begin{macrocode}
+\noindent DEGREES AWARDED:
 \@degrees
+\vskip \baselineskip
 %    \end{macrocode}
 % call the interests string.
 %    \begin{macrocode}
-\@optional{@interests}
+\noindent AREAS OF SPECIAL INTEREST:
+\@interests
 %    \end{macrocode}
 % change the paragraph spacing.
 %    \begin{macrocode}
@@ -1848,15 +1893,15 @@ NAME OF AUTHOR: \@author
 %    \end{macrocode}
 % call the experience string.
 %    \begin{macrocode}
-\@optional{@experience}
+\cvitem{PROFESSIONAL EXPERIENCE}{\@experience}
 %    \end{macrocode}
 % call the awards string.
 %    \begin{macrocode}
-\@optional{@awards}
+\cvitem{GRANTS, AWARDS AND HONORS}{\@awards}
 %    \end{macrocode}
 % call the publications string.
 %    \begin{macrocode}
-\@optional{@publications}
+\cvitem{PUBLICATIONS}{\@publications}
 %    \end{macrocode}
 % end the alternate paragraph spacing.
 %    \begin{macrocode}
@@ -2400,6 +2445,7 @@ Draft of \@longdraftdate\\
 %\end{macro}
 
 %\subsection{Bibliography Formatting}
+%\changes{v2.5}{2011/03/05}{Added formatbib}
 %\begin{macro}{\@bibsection}
 %Here we create the bibsection command from a chapter and add an entry to the TOC.
 %    \begin{macrocode}
@@ -2407,6 +2453,7 @@ Draft of \@longdraftdate\\
 	\clearpage
 	\addcontentsline{toc}{chapter}{#1}
 	\@startchapter{#1}
+	\singlespacing
 	\@mysingle
 	\vspace*{3ex}}
 %    \end{macrocode}
@@ -2425,6 +2472,10 @@ Draft of \@longdraftdate\\
 	\raggedright
 	\sfcode`\.=1000\relax}
 	\let\endthebibliography=\endlist
+\newcommand{\formatbib}{
+	\addcontentsline{toc}{chapter}{REFERENCES CITED}
+	\singlespacing
+	\renewcommand\bibname{REFERENCES CITED}}
 %    \end{macrocode}
 %\end{macro}
 
@@ -2645,4 +2696,4 @@ Draft of \@longdraftdate\\
 %\end{macro}
 %</class>
 %\Finale
-%
\ No newline at end of file
+%
diff --git a/Master/texmf-dist/source/latex/uothesis/uothesis.ins b/Master/texmf-dist/source/latex/uothesis/uothesis.ins
new file mode 100644
index 00000000000..5774eaad118
--- /dev/null
+++ b/Master/texmf-dist/source/latex/uothesis/uothesis.ins
@@ -0,0 +1,70 @@
+%%
+%% This is file `uothesis.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% uothesis.dtx  (with options: `install')
+%% ----------------------------------------------------------------
+%% uothesis --- Support for formatting of documents associated with the
+%% graduate requirements for the master and doctorate degrees as
+%% defined by the University of Oregon Graduate School in the fall of 2010.
+%% Contact:  All contact regarding this package should be to the UOGS.
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+----------------------------------------------------------------
+uothesis --- Support for formatting of documents associated with the
+graduate requirements for the master and doctorate degrees as
+defined by the University of Oregon Graduate School in the fall of 2010.
+Contact:  All contact regarding this package should be to the UOGS.
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+\endpreamble
+\postamble
+Originally written by Mark VandeWettering
+Modified by Chet Haase, Christian Frank, Lars Hansen,
+J. Paul Walser, Bei Li, Bart Massey, et al.
+
+It may be distributed and/or modified under the conditions of
+the LaTeX Project Public License (LPPL), either version 1.3c of
+this license or (at your option) any later version.  The latest
+version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+Michael D. Anderson
+
+This work consists of the file  uothesis.dtx and the derived files uothesis.cls,
+uothesis.ins, and, uothesis.pdf.
+\endpostamble
+\usedir{tex/latex/uothesis}
+\generate{
+  \file{\jobname.cls}{\from{\jobname.dtx}{class}}
+}
+
+\endbatchfile
+%% Originally written by Mark VandeWettering
+%% Modified by Chet Haase, Christian Frank, Lars Hansen,
+%% J. Paul Walser, Bei Li, Bart Massey, et al.
+%% 
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version.  The latest
+%% version of this license is in the file:
+%% 
+%% http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Michael D. Anderson
+%% 
+%% This work consists of the file  uothesis.dtx and the derived files uothesis.cls,
+%% uothesis.ins, and, uothesis.pdf.
+%%
+%% End of file `uothesis.ins'.
diff --git a/Master/texmf-dist/tex/latex/uothesis/uothesis.cls b/Master/texmf-dist/tex/latex/uothesis/uothesis.cls
index 5005ba1f9ea..73d3c3063d3 100644
--- a/Master/texmf-dist/tex/latex/uothesis/uothesis.cls
+++ b/Master/texmf-dist/tex/latex/uothesis/uothesis.cls
@@ -14,7 +14,8 @@
 %% See http://www.latex-project.org/lppl.txt
 %% ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{uothesis} [2010/12/21 v2.4 Submission to University of Oregon Graduate School]
+\ProvidesClass{uothesis} [2010/12/21 v2.5 Submission to
+ University of Oregon Graduate School]
 \typeout{UO Thesis Class}
 \typeout{}
 \typeout{Based on the UO Thesis macros by Bart Massey, et al.}
@@ -87,15 +88,16 @@
 \RequirePackage[dvipsnames]{xcolor}
 \RequirePackage{graphicx}
 \RequirePackage{setspace}
+\RequirePackage{xspace}
 \RequirePackage[left,pagewise]{lineno}
 \RequirePackage{layouts}
 \RequirePackage[colorinlistoftodos]{todonotes}
 \RequirePackage{ragged2e}
+\captionsetup{labelsep=space}
 \setlength\RaggedRightRightskip{0pt plus 1cm}
 \setlength\RaggedRightParindent{0.4in}
 
 \ifchem
-\RequirePackage{chemstyle}
 \RequirePackage[version=3]{mhchem}
 \fi
 \ifamstex
@@ -154,6 +156,17 @@ size=\scriptsize,caption={CITE \arabic{chapter}.\arabic{citation}: #1}]
 \newcommand{\Chem}[2][]{\begin{multline}\cee{#2}%
 \ifx\@empty#1\@empty\else\label{#1}\fi\reactiontag\end{multline}}
 \fi
+\newcommand*{\cst@xspace}{\expandafter\xspace}
+\newcommand*{\cst@latin}{\expandafter\emph}
+\newcommand*{\etc}{\@ifnextchar.{\cst@etc}{\cst@etc.\cst@xspace}}
+\newcommand*{\invacuo}{\cst@latin{in vacuo}\cst@xspace}
+\newcommand*{\etal}{\@ifnextchar.{\cst@etal}{\cst@etal.\cst@xspace}}
+\newcommand*{\eg}{\cst@eg.}
+\newcommand*{\ie}{\cst@ie.}
+\newcommand*{\cst@etal}{\cst@latin{et~al}}
+\newcommand*{\cst@etc}{\cst@latin{etc}}
+\newcommand*{\cst@ie}{\cst@latin{i.e\spacefactor999\relax}}
+\newcommand*{\cst@eg}{\cst@latin{e.g\spacefactor999\relax}}
 
 \newenvironment{normalspace}{\begin{singlespacing}}{\end{singlespacing}}
 \def\@mydouble{\endsinglespace\large\normalsize\setstretch{1.7}}
@@ -248,19 +261,25 @@ of this document.}
 \newlength{\@cvhangindent}
 \setlength{\@cvhangindent}{\parindent}
 \addtolength{\@cvhangindent}{1.5em}
-\long\def\cvpars#1#2{
-     \par\vspace{1.5\baselineskip}\noindent
-     {#1}:\nopagebreak\par #2}
-
-\def\birthplace#1{\gdef\@birthplace{\cvoneline{PLACE OF BIRTH}{#1}}}
-\def\birthday#1{\gdef\@birthday{\cvoneline{DATE OF BIRTH}{#1}}}
-\long\def\schools#1{\gdef\@schools{\cvpars{GRADUATE AND UNDERGRADUATE SCHOOLS ATTENDED}{#1}}}
-\long\def\degrees#1{\gdef\@degrees{\cvpars{DEGREES AWARDED}{#1}}}
-\long\def\interests#1{\gdef\@interests{\cvpars{AREAS OF SPECIAL INTEREST}{#1}}}
-\long\def\experience#1{\gdef\@experience{\cvpars{PROFESSIONAL EXPERIENCE}{#1}}}
-\long\def\awards#1{\gdef\@awards{\cvpars{GRANTS, AWARDS AND HONORS}{#1}}}
-\long\def\publications#1{\gdef\@publications{\cvpars{PUBLICATIONS}{#1}}}
+\long\def\cvpars#1{\par #1}
+\long\def\cvitem#1#2{\par\vspace{1.5\baselineskip}\noindent{#1}:\nopagebreak\par #2}
 
+\gdef\@schools{}
+\gdef\@degrees{}
+\gdef\@birthplace{}
+\gdef\@birthday{}
+\gdef\@interests{}
+\gdef\@awards{}
+\gdef\@experience{}
+\gdef\@publications{}
+\def\birthplace#1{\gdef\@birthplace{#1}}
+\def\birthday#1{\gdef\@birthdate{#1}}
+\def\school#1{\expandafter\gdef\expandafter\@schools\expandafter{\@schools\cvpars{#1}}}
+\long\def\degree#1{\expandafter\gdef\expandafter\@degrees\expandafter{\@degrees\cvpars{#1}}}
+\def\interests#1{\expandafter\gdef\expandafter\@interests\expandafter{\@interests\cvpars{#1}}}
+\def\position#1{\expandafter\gdef\expandafter\@experience\expandafter{\@experience\cvpars{#1}}}
+\def\award#1{\expandafter\gdef\expandafter\@awards\expandafter{\@awards\cvpars{#1}}}
+\def\publication#1{\expandafter\gdef\expandafter\@publications\expandafter{\@publications\cvpars{#1}}}
 \setstretch{1.7}
 \newcommand{\@normalheaderdims}{
 \textheight 620pt
@@ -454,20 +473,24 @@ Title: \@abstracttitle\\*[\baselineskip]
 \@startchapter{CURRICULUM VITAE}
 \begin{singlespacing}
 \vspace*{3ex}
-\noindent
-NAME OF AUTHOR: \@author
-\@optional{@birthplace}
-\@optional{@birthday}
+\noindent NAME OF AUTHOR:\quad \@author \vskip\baselineskip
+\noindent PLACE OF BIRTH:\quad \@birthplace \vskip\baselineskip
+\noindent DATE OF BIRTH:\quad \@birthdate \vskip\baselineskip
 \everypar={\hangindent=\@cvhangindent}
+\noindent GRADUATE AND UNDERGRADUATE SCHOOLS ATTENDED:
 \@schools
+\vskip \baselineskip
+\noindent DEGREES AWARDED:
 \@degrees
-\@optional{@interests}
+\vskip \baselineskip
+\noindent AREAS OF SPECIAL INTEREST:
+\@interests
 \everypar={\parskip=0.75\baselineskip
 \hangindent=\@cvhangindent
                 \interlinepenalty=\@M}
-\@optional{@experience}
-\@optional{@awards}
-\@optional{@publications}
+\cvitem{PROFESSIONAL EXPERIENCE}{\@experience}
+\cvitem{GRANTS, AWARDS AND HONORS}{\@awards}
+\cvitem{PUBLICATIONS}{\@publications}
 \par
 \end{singlespacing}}
 
@@ -842,6 +865,7 @@ extra appendices; rerun LaTeX}
 \clearpage
 \addcontentsline{toc}{chapter}{#1}
 \@startchapter{#1}
+\singlespacing
 \@mysingle
 \vspace*{3ex}}
 \def\thebibliography{
@@ -855,6 +879,10 @@ extra appendices; rerun LaTeX}
 \raggedright
 \sfcode`\.=1000\relax}
 \let\endthebibliography=\endlist
+\newcommand{\formatbib}{
+\addcontentsline{toc}{chapter}{REFERENCES CITED}
+\singlespacing
+\renewcommand\bibname{REFERENCES CITED}}
 
 \def\thefigure{\@arabic\c@figure}
 \def\fnum@figure{FIGURE \thefigure}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ae5a5fd17ca..fd82e724bdd 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1579,6 +1579,7 @@ $standardsource='\.(c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
  'makecell',	'makecell.dtx',
  'mylatexformat', 'mylatexformat.dtx',
  'namespc',	'namespc.dtx',
+ 'uothesis',	'uothesis.dtx',
  'pageslts',	'pagesLTS.dtx',
  'paper',	'install',
  'papermas',	"$package.dtx",
@@ -4138,14 +4139,13 @@ sub POSTbiber {
     my $tl_platform = $tl_platform{$biber_platform};
     die "unknown biber platform $biber_platform, goodbye" if ! $tl_platform;
 
-    my $bindir = "$TOPDEST/bin/$tl_platform";
-    &SYSTEM ("mkdir -p $bindir");
-    &SYSTEM ("$CP $biber_binary $bindir/");
-    #
     my $builddir = "$BUILDDEST/utils/biber/bin/$tl_platform";
     &SYSTEM ("mkdir -p $builddir/");
     &SYSTEM ("$MV $biber_binary $builddir/$biber_binary");
-    
+    #
+    # really need to do svn cp here.
+    my $bindir = "$TOPDEST/bin/$tl_platform";
+    &SYSTEM ("$CP $biber_binary $bindir/"); # bindir should already exist    
   }
 
   # don't keep binary archive around in Master tree.