From 96eef86dd6ca48e839d2dd1a1cd9851320fd54bc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 Mar 2011 22:14:42 +0000 Subject: uothesis 2.5 (15mar11) git-svn-id: svn://tug.org/texlive/trunk@21734 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/uothesis/uothesis.cls | 72 ++++++++++++++++------- 1 file changed, 50 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex') 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} -- cgit v1.2.3