umthesis 0.2 (17sep09)

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

7 files changed, 85 insertions, 168 deletions

diff --git a/Master/texmf-dist/doc/latex/umthesis/README b/Master/texmf-dist/doc/latex/umthesis/README
index b4aec82ba83..33b23f623b8 100644
--- a/Master/texmf-dist/doc/latex/umthesis/README
+++ b/Master/texmf-dist/doc/latex/umthesis/README
@@ -1,6 +1,7 @@
 LaTeX class file in conformance with the specifications set by the 
 University of Michigan for dissertations
-This class loads the standard book class and then modifies it as little as %% possible. Many of the modifications were taken from the beavtex class and
+This class loads the standard book class and then modifies it as little as 
+possible. Many of the modifications were taken from the beavtex class and
 the umdiss.cls
 
 Before using, please read the introductory comments in the umthesis.cls file
diff --git a/Master/texmf-dist/doc/latex/umthesis/appAeng.tex b/Master/texmf-dist/doc/latex/umthesis/appAeng.tex
deleted file mode 100644
index 8d1ab06b394..00000000000
--- a/Master/texmf-dist/doc/latex/umthesis/appAeng.tex
+++ /dev/null
@@ -1,134 +0,0 @@
-
-\setlength{\extrarowheight}{-7pt}  
-\section{English Nonwords}
-\label{S:engNon}
-\begin{footnotesize}
-  \begin{longtable}[c]{|*{2}{l|} *{14}{r|}}
-    \caption{English nonword stimuli used \label{T:engNonwordStimuli}}\\
-    \hline\hline
-    \hspace{3em}\rotth{7em}{spell} & 
-    \hspace{2.6em}\rotth{7em}{IPA} &
-    \rotth{7em}{posfreq}&
-    \rotth{7em}{biphone freq} & 
-    \rotth{7em}{Neighbors}& 
-    \rotth{7em}{Freq Neighbors} &
-    \rotth{7em}{\raggedright Lemma Freq Neighbors}& 
-    \rotth{7em}{syl1 Neighbors}& 
-    \rotth{7em}{syl1 Freq Neighbors}& 
-    \rotth{7em}{syl1 lemma Freq Neighbors}& 
-    \rotth{7em}{syl2 Neighbors} & 
-    \rotth{7em}{syl2 Freq Neighbors} &
-    \rotth{7em}{syl2 lemma Freq Neighbors}& 
-    \rotth{7em}{edit2 neighbors} & 
-    \rotth{7em}{edit2 Freq Neighbors} & 
-    \rotth{7em}{edit2 lemma Freq Neighbors}\\
-    \hline
-     & & & & & & & & & & & & & & & {\vspace*{-.1em}}\\
-    \endfirsthead
-    \caption[]{English nonword stimuli used (continued)}\\
-    \hline\hline
-    \hspace{3em}\rotth{7em}{spell} & 
-    \hspace{2.6em}\rotth{7em}{IPA} &
-    \rotth{7em}{posfreq}&
-    \rotth{7em}{biphone freq} & 
-    \rotth{7em}{Neighbors}& 
-    \rotth{7em}{Freq Neighbors} &
-    \rotth{7em}{\raggedright Lemma Freq Neighbors}& 
-    \rotth{7em}{syl1 Neighbors}& 
-    \rotth{7em}{syl1 Freq Neighbors}& 
-    \rotth{7em}{syl1 lemma Freq Neighbors}& 
-    \rotth{7em}{syl2 Neighbors} & 
-    \rotth{7em}{syl2 Freq Neighbors} &
-    \rotth{7em}{syl2 lemma Freq Neighbors}& 
-    \rotth{7em}{edit2 neighbors} & 
-    \rotth{7em}{edit2 Freq Neighbors} & 
-    \rotth{7em}{edit2 lemma Freq Neighbors}\\
-    \hline
-     & & & & & & & & & & & & & & & {\vspace*{-.1em}}\\
-    \endhead
-    \hline\hline
-    \endfoot
-      \input{table/engNonwordStimuliStats}
-  \end{longtable}
-\end{footnotesize}
-
-\begin{landscape}
-\section{English Words} 
-\label{S:engStimList}
-\begin{footnotesize}
-  \begin{longtable}[c]{|*{3}{l|} *{16}{r|}}
-    \caption{English word stimuli used \label{T:engWordStimuli}}\\
-    \hline\hline
-    \hspace{3em}\rotth{7em}{spell} & 
-    \hspace{2.6em}\rotth{7em}{IPA} &
-    \hspace{1.4em}\rotth{7em}{morph} &
-    \rotth{7em}{logFreq}& 
-    \rotth{7em}{lemmaLogFreq}& 
-    \rotth{7em}{posfreq}&
-    \rotth{7em}{biphone freq} & 
-    \rotth{7em}{Neighbors}& 
-    \rotth{7em}{Freq Neighbors} &
-    \rotth{7em}{\raggedright Lemma Freq Neighbors}& 
-    \rotth{7em}{syl1 Neighbors}& 
-    \rotth{7em}{syl1 Freq Neighbors}& 
-    \rotth{7em}{syl1 lemma Freq Neighbors}& 
-    \rotth{7em}{syl2 Neighbors} & 
-    \rotth{7em}{syl2 Freq Neighbors} &
-    \rotth{7em}{syl2 lemma Freq Neighbors}& 
-    \rotth{7em}{edit2 neighbors} & 
-    \rotth{7em}{edit2 Freq Neighbors} & 
-    \rotth{7em}{edit2 lemma Freq Neighbors}\\
-    \hline
-     & & & & & & & & & & & & & & & & & & {\vspace*{-.1em}}\\
-    \endfirsthead
-    \caption[]{English word stimuli used (continued)}\\
-    \hline\hline
-    \hspace{3em}\rotth{7em}{spell} & 
-    \hspace{2.6em}\rotth{7em}{IPA} &
-    \hspace{1.4em}\rotth{7em}{morph} &
-    \rotth{7em}{logFreq}& 
-    \rotth{7em}{lemmaLogFreq}& 
-    \rotth{7em}{posfreq}&
-    \rotth{7em}{biphone freq} & 
-    \rotth{7em}{Neighbors}& 
-    \rotth{7em}{Freq Neighbors} &
-    \rotth{7em}{\raggedright Lemma Freq Neighbors}& 
-    \rotth{7em}{syl1 Neighbors}& 
-    \rotth{7em}{syl1 Freq Neighbors}& 
-    \rotth{7em}{syl1 lemma Freq Neighbors}& 
-    \rotth{7em}{syl2 Neighbors} & 
-    \rotth{7em}{syl2 Freq Neighbors} &
-    \rotth{7em}{syl2 lemma Freq Neighbors}& 
-    \rotth{7em}{edit2 neighbors} & 
-    \rotth{7em}{edit2 Freq Neighbors} & 
-    \rotth{7em}{edit2 lemma Freq Neighbors}\\
-    \hline
-     & & & & & & & & & & & & & & & & & & {\vspace*{-.1em}}\\
-    \endhead
-    \hline\hline
-    \endfoot
-      \input{table/engWordStimuliStats}
-  \end{longtable}
-\end{footnotesize}
-\end{landscape}
-
-  \clearpage
-
-\setlength{\extrarowheight}{0pt}  
-  \begin{table}[htbp]
-    \caption{Distribution of Phonemes for English stimuli}
-    \label{T:engDist}
-  \centering
-    \begin{tabular}{*{21}{r}}
-    \hline\hline
-   \rule{0pt}{1.1em} phon &  C1& V1& C2& C3& V2& C4 & &  C1& V1& C2& C3& V2&
-   C4& &  C1& V1& C2& C3& V2& C4\\[.3em]
-    \hline
-    \rule{0pt}{1.1em} & \multicolumn{6}{c}{monomorphemes} & &
-    \multicolumn{6}{c}{bimorphemes} && \multicolumn{6}{c}{nonwords}\\[.3em]
-  \cline{2-7}\cline{9-14}\cline{16-21}
-       \input{table/engDist}
-    \hline\hline
-    \end{tabular}
-  \end{table}
- \clearpage 
diff --git a/Master/texmf-dist/doc/latex/umthesis/appendix.tex b/Master/texmf-dist/doc/latex/umthesis/appendix.tex
index 82f6d15fe2a..6b59611878b 100644
--- a/Master/texmf-dist/doc/latex/umthesis/appendix.tex
+++ b/Master/texmf-dist/doc/latex/umthesis/appendix.tex
@@ -1,3 +1,6 @@
 \chapter{The first appendix}
+\section{a section}
 
 \chapter{The second appendix}
+\section{a section}
+\subsection{a subsection}
diff --git a/Master/texmf-dist/doc/latex/umthesis/example.pdf b/Master/texmf-dist/doc/latex/umthesis/example.pdf
index 573701a386a..ac2a036efa5 100644
--- a/Master/texmf-dist/doc/latex/umthesis/example.pdf
+++ b/Master/texmf-dist/doc/latex/umthesis/example.pdf
diff --git a/Master/texmf-dist/doc/latex/umthesis/example.tex b/Master/texmf-dist/doc/latex/umthesis/example.tex
index 29c37847312..067ec3de118 100644
--- a/Master/texmf-dist/doc/latex/umthesis/example.tex
+++ b/Master/texmf-dist/doc/latex/umthesis/example.tex
@@ -10,7 +10,7 @@
 \usepackage{ifpdf} % check to see if compiling as dvi or pdf
 \usepackage{rotating} % rotate some text
 \usepackage{graphicx} % include graphics files
-\usepackage[all]{xy} %for making simple graphs
+%\usepackage[all]{xy} %for making simple graphs
 \usepackage{index} %this is newer and more fully featured than makeidx
 \usepackage{hhline} %fancy rules
 \usepackage{amsmath,amssymb} %extra math commands and symbols
@@ -44,9 +44,9 @@
 %\usepackage[dvips]{geometry} %tells dvips about paper size options
 %\usepackage{svn} % to keep track of revisions
 %\SVN $Author: robfelty $
-%\SVN $Revision: 17 $
-%\SVN $Date: 2007-03-06 10:58:33 -0500 (Tue, 06 Mar 2007) $
-%\SVN $Id: example.tex 17 2007-03-06 15:58:33Z robfelty $
+%\SVN $Revision: 24 $
+%\SVN $Date: 2007-05-10 15:13:37 -0400 (Thu, 10 May 2007) $
+%\SVN $Id: example.tex 24 2007-05-10 19:13:37Z robfelty $
 %\usepackage{timestamp} % to give me a timestamp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -161,7 +161,7 @@
 %\doublespacing
 %% The class file automatically singles spaces stuff which should
 %% be single spaced according to rackham, like the bibliography,
-%% titles and such
+%% titles, long quotations and such
 %% However, if you want to, you can also change spacing for 
 %% a portion of text like so:
 %%\begin{singlespacing} ... \end{singlespacing}
@@ -173,10 +173,13 @@
 \author{\LaTeX}
 \program{Professional Typesetting}
 \degree{Doctor of Philosophy}
+% if you only have chair, use \chaircommitteemember
+% if you have outside members, you can specify their institution in the
+% optional argument 
 \cochaircommitteemember{John Smith}{Professor}
 \cochaircommitteemember{Mary Johnson}{Assistant Professor}
+\committeemember[University of Hard Knocks]{Robert Hughes}{Professor}
 \committeemember{Emily Dickens}{Assistant Professor}
-\committeemember{Robert Hughes}{Professor}
 \title{The most Rackham-standards compliant dissertation ever}
 
 \makeindex %if you are including an index
@@ -247,11 +250,14 @@ appendix
 \end{preface}
 
 \tableofcontents
+
+% only use these commands if you have more than figure, table, and/or
+% appendix, respectively
 \listoftables
 \listoffigures
 \listofappendices
 
-% the normal abstract is formatted the same as preface and acknowledgements,
+% the normal abstract is formatted the same as preface and acknowledgments,
 % and is listed in the table of contents
 \begin{abstract}
   your abstract here
diff --git a/Master/texmf-dist/doc/latex/umthesis/exp1.tex b/Master/texmf-dist/doc/latex/umthesis/exp1.tex
index c76fdbe8606..2bfe19bda3a 100644
--- a/Master/texmf-dist/doc/latex/umthesis/exp1.tex
+++ b/Master/texmf-dist/doc/latex/umthesis/exp1.tex
@@ -1,4 +1,5 @@
 \chapter{My first experiment}
+\label{ch:firstExp}
 
 This is my first experiment. I will try to prove the following things:
 (Note that lists are single spaced, as Rackham wants, and that lists should
@@ -20,4 +21,29 @@ If you do not have this package, you should comment it out.
 \cite{Rumelhart1986}}
 \label{F:PDP}
 \end{figure*}
+The rest of this chapter proceeds as follows. Section \ref{sec:design}
+describes the experiment design, while section~\ref{subsec:req} details the
+requirements and section~\ref{subsubsec:setup} describes the experiment setup.
+Section ~\ref{sec:method} describes my methods, while
+section~\ref{subsec:procedures} gives details of the procedures and
+section~\ref{subsubsec:firstSteps} goes over the first steps.
+
+\section{Experiment design}
+\label{sec:design}
+I describe my first experiment in this section. 
+\subsection{Experiment requirements}
+\label{subsec:req}
+Good design is expected.
+\subsubsection{Experiment setup}
+\label{subsubsec:setup}
+The sound lab is needed.
+\section{Method}
+\label{sec:method}
+I describe my methods in this section
+\subsection{Procedures}
+\label{subsec:procedures}
+The following procedures were followed.
+\subsubsection{First steps}
+\label{subsubsec:firstSteps}
+We carried out the experiment with the undergrads.
 
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}%