From a95d1a90845bf6c1c7f2ee629fbe10a20d5863ce Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Sep 2009 23:33:58 +0000 Subject: umthesis 0.2 (17sep09) git-svn-id: svn://tug.org/texlive/trunk@15346 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/umthesis/umthesis.cls | 67 ++++++++++++++--------- 1 file changed, 41 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex/umthesis') diff --git a/Master/texmf-dist/tex/latex/umthesis/umthesis.cls b/Master/texmf-dist/tex/latex/umthesis/umthesis.cls index 7017e7eabaa..0baeda572cb 100644 --- a/Master/texmf-dist/tex/latex/umthesis/umthesis.cls +++ b/Master/texmf-dist/tex/latex/umthesis/umthesis.cls @@ -68,17 +68,19 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%foo \newcommand{\filename}{umthesis} -\newcommand{\fileversion}{$Revision: 16 $} -\newcommand{\filedate}{2007/02/21} +\newcommand{\fileversion}{$Revision: 55 $} +\newcommand{\filedate}{2008/02/14} \newcommand{\fileauthor}{$Author: robfelty $} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{\filename}[\filedate \fileversion % : University of Michigan thesis class - based on book] -\RequirePackage{setspace} -\RequirePackage{ifthen} +\RequirePackage{setspace} %for spacing +\RequirePackage{ifthen} % advanced control structures +\RequirePackage{etex} % enable advanced tex features, particularly don't limit the number of dimensions to 256 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} @@ -187,7 +189,7 @@ \if@mainmatter \refstepcounter{chapter} \typeout{\@chapapp\space\thechapter.} - \addcontentsline{\ext@toc}{\if@appendix app\else chapter\fi}{\if@appendix \chaptername\ \protect\numberline{\thechapter}#1\else \textbf{\chaptername\ \protect\numberline{\thechapter}#1}\fi} + \addcontentsline{\ext@toc}{\if@appendix chapter\else chapter\fi}{\if@appendix \chaptername\ \protect\numberline{\thechapter}#1\else \textbf{\chaptername\ \protect\numberline{\thechapter}#1}\fi} \else \addcontentsline{\ext@toc}{chapter}{#1} \fi @@ -196,8 +198,8 @@ \fi \chaptermark{#1} % Gap between figures/tables of different chapters or not? -% \addtocontents{\ext@figure}{\protect\addvspace{10\p@}} -% \addtocontents{\ext@table}{\protect\addvspace{10\p@}} + \addtocontents{\ext@figure}{\protect\addvspace{10\p@}} + \addtocontents{\ext@table}{\protect\addvspace{10\p@}} \if@twocolumn \@topnewpage[\@makechapterhead{#2}] \else @@ -224,9 +226,9 @@ \begin{center} \normalfont \heading %\huge \bf \ifnum \c@secnumdepth >\m@ne - \if@mainmatter\bf\@chapapp\ \thechapter\\[1em] \fi + \if@mainmatter\bf\@chapapp\ \thechapter\\[.5em] \fi \fi - \bf #1\\[2em] + \bf #1\\[1em] \end{center} } \end{singlespacing} @@ -256,7 +258,7 @@ \chapter*{\listtablename}% \begin{singlespacing} \addcontentsline{toc}{chapter}{\textbf{\listtablename}}% - \@mkboth{\listtablename}{} + \@mkboth{\listtablename}\listtablename{} \vskip 1em {\parindent \z@ \raggedright \bf Table{}\par} \@starttoc{lot}% @@ -272,7 +274,7 @@ \chapter*{\listfigurename}% \begin{singlespacing} \addcontentsline{toc}{chapter}{\textbf{\listfigurename}}% - \@mkboth{\listfigurename}{} + \@mkboth{\listfigurename}{\listfigurename} \vskip 1em {\parindent \z@ \raggedright \bf Figure{}\par} \@starttoc{lof}% @@ -289,17 +291,20 @@ \chapter*{\listappendixname}% \begin{singlespacing} \addcontentsline{toc}{chapter}{\textbf{\listappendixname}}% - \@mkboth{\listappendixname}{} + \@mkboth{\listappendixname}\listappendixname{} \vskip 1em {\parindent \z@ \raggedright \bf \appendixname{}\par} + %% the setcounter lines can be used if you wish to not list sections in the + %% list of appendices. This is a bit of a hack + %\setcounter{tocdepth}{0} \@starttoc{loa}% + %\setcounter{tocdepth}{4} \if@restonecol\twocolumn\fi \end{singlespacing} } %this redefines the section headings somewhat, most importantly whether to include sections in the appendix in the list of appendices instead of in the table of contents \def\@sect#1#2#3#4#5#6[#7]#8{% - \begin{singlespacing} \ifnum #2>\c@secnumdepth \let\@svsec\@empty \else @@ -309,6 +314,7 @@ \@tempskipa #5\relax \ifdim \@tempskipa>\z@ \begingroup + \singlespacing #6{% \@hangfrom{\hskip #3\relax\@svsec}% \interlinepenalty \@M #8\@@par}% @@ -331,8 +337,8 @@ #7}}% %\fi \fi - \end{singlespacing} - \@xsect{#5}} + \@xsect{#5} +} % Make quote environment single-spaced. \let\oldquote\quote \let\oldendquote\endquote @@ -343,9 +349,16 @@ \let\oldendquotation\endquotation \renewenvironment{quotation}{\oldquotation\singlespace}{\oldendquotation} -%% this is mostly copied from umdiss.cls. It defines the additional necessary commands for creating the title page and other frontmatter material, e.g. preface, copyright. +%% this is mostly copied from umdiss.cls. It defines the additional necessary +% commands for creating the title page and other frontmatter material, e.g. +% preface, copyright. +%% for the committemembers, the commands allow an optional +% argument, to specify the institution for outside members + %%DJM: added to detect when have gotten to second or later cochairs, for %% use in abstract page. not fixed for special members... +%% RAF 2007.03.19 fixed this for special members + \newif\iffirstcochair\firstcochairtrue \newtoks\chairtokenlist @@ -377,7 +390,9 @@ \def\@spcochaircm[#1]#2#3{% \def\abschairname{Co-Chairs:}% \addto@hook{\chairtokenlist}{& #3 #2, Co-Chair, #1\\}% - \addto@hook{\abstokenlist}{& #3 #2, #1}} + \iffirstcochair\addto@hook{\abstokenlist}{& #1 } + \else\addto@hook{\abstokenlist}{and #2 }\fi + \firstcochairfalse} \def\@regcochaircm#1#2{% \def\abschairname{Co-Chairs:}% @@ -408,7 +423,7 @@ \@restonecolfalse \fi \chapter*{\contentsname - \@mkboth{\contentsname}{}}% + \@mkboth{\contentsname}\contentsname{}}% \begin{singlespacing} \pdfbookmark[0]{\contentsname}{contents} \@starttoc{toc}% @@ -501,10 +516,10 @@ \the\abstokenlist \end{tabular} \vspace{0.25in}\par -\begin{onehalfspacing} + \begin{doublespacing} }{% -\end{onehalfspacing} +\end{doublespacing} \end{titlepage} } @@ -522,7 +537,7 @@ \newenvironment{acknowledgments}{ \@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn\else\newpage\fi% - \chapter*{\acknowledgmentsname\@mkboth{\acknowledgmentsname}{}} + \chapter*{\acknowledgmentsname\@mkboth{\acknowledgmentsname}\acknowledgmentsname{}} \addcontentsline{toc}{chapter}{\textbf{\acknowledgmentsname}} }{ \if@restonecol\twocolumn \else \newpage \fi% @@ -530,7 +545,7 @@ \newenvironment{preface}{% \@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn\else\newpage\fi% - \chapter*{\prefacename\@mkboth{\prefacename}{}} + \chapter*{\prefacename\@mkboth{\prefacename}\prefacename{}} \addcontentsline{toc}{chapter}{\textbf{\prefacename}} }{ \if@restonecol\twocolumn \else \newpage \fi% @@ -538,7 +553,7 @@ \newenvironment{abstract}{% \@restonecolfalse\if@twocolumn\@restonecoltrue\onecolumn\else\newpage\fi% - \chapter*{\abstractname\@mkboth{\abstractname}{}} + \chapter*{\abstractname\@mkboth{\abstractname}{\abstractname}} \addcontentsline{toc}{chapter}{\textbf{\abstractname}} }{ \if@restonecol\twocolumn \else \newpage \fi% @@ -651,16 +666,16 @@ {\list{}{\labelwidth\z@ \itemindent-\leftmargin \let\makelabel\descriptionlabel\descripthook}} {\endlist} -\renewcommand{\itemhook}{\singlespacing +\renewcommand{\itemhook}{\setstretch{1} \setlength{\topsep}{0pt}% \setlength{\parskip}{0pt}% - \setlength{\partopsep}{0pt}% + \setlength{\partopsep}{.5\baselineskip}% \setlength{\parsep}{0pt}% \setlength{\itemsep}{0pt}% } % enumerate environment lengths -\renewcommand{\enumhook}{\singlespacing +\renewcommand{\enumhook}{\setstretch{1} \setlength{\topsep}{0pt}% \setlength{\parskip}{0pt}% \setlength{\partopsep}{0pt}% -- cgit v1.2.3