uwthesis update (16apr08)

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

1 files changed, 175 insertions, 43 deletions

diff --git a/Master/texmf-dist/tex/latex/uwthesis/uwthesis.cls b/Master/texmf-dist/tex/latex/uwthesis/uwthesis.cls
index 3fda3487156..0519360ef0e 100644
--- a/Master/texmf-dist/tex/latex/uwthesis/uwthesis.cls
+++ b/Master/texmf-dist/tex/latex/uwthesis/uwthesis.cls
@@ -1,13 +1,46 @@
+%  ========================================================================
+%  Copyright (c) 1995-2008 The University of Washington
+%
+%  Licensed under the Apache License, Version 2.0 (the "License");
+%  you may not use this file except in compliance with the License.
+%  You may obtain a copy of the License at
+%
+%      http://www.apache.org/licenses/LICENSE-2.0
+%
+%  Unless required by applicable law or agreed to in writing, software
+%  distributed under the License is distributed on an "AS IS" BASIS,
+%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%  See the License for the specific language governing permissions and
+%  limitations under the License.
+%  ========================================================================
+%
+%
 % University of Washington Thesis class
 % by Jim Fox
 % fox@washington.edu
 %
 %    For the most recent edition of this class file see:
 %         http://staff.washington.edu/fox/tex/
+%    Or the CTAN archive
+%         macros/latex/contrib/uwthesis
 %
 %
 % Version history
 %
+% 6.12,04/15/08, Re-Fix first page bottom margin; raise quote slip 
+% 6.13,03/31/08, Fix first page bottom margin; 
+% 6.12,03/21/07, Better handling of label inside footnote with chapternotes
+% 6.11,08/02/06, Bold "abstract", "Page" heading on toc
+% 6.10,10/25/05, Fix co-chair lines
+% 6.9, 10/25/05, Several small changes for 2005 style guide
+% 6.8, 07/26/05, Add some single-spacing in prelim pages
+% 6.7, 06/29/05, Remove "by" from abstract page
+% 6.6, 06/08/05, Change signature page baseline to 1.0
+% 6.5, 03/10/05, Change bibliography baseline to 1.0
+% 6.4, 03/09/05, Quote slip copy to "Proquest Information and Learning"
+% 6.3, 09/22/04, Add column titles to lof and lot
+% 6.2, 07/23/04, Lowercase 'doctoral' in quote slip
+% 6.1, 07/08/04, Allow option 'natbib' to load natbib package correctly
 % 6.0, 07/14/03, Change names: thesis.xxx -> uwthesis.xxx
 % 5.8, 06/12/03, Minor changes to the endnotes pagenation
 % 5.7, 08/14/00, Minor changes to the quote slip
@@ -35,7 +68,7 @@
 % Documentation is in the companion document (uwthesis.tex)
 %
 
-\ProvidesClass{uwthesis}[2003/07/14]
+\ProvidesClass{uwthesis}[2008/04/15]
 \NeedsTeXFormat{LaTeX2e}
  
 %
@@ -59,6 +92,14 @@
   {\endnotestrue}
 
 %
+% ----  Timely loading of specific packages -----------------------------
+%
+\newif\if@natbib      % true if including natbib
+  \@natbibfalse
+\DeclareOption{natbib}% includes natbib package
+  {\@natbibtrue}
+
+%
 % ----  Thesis is a modified (default 12pt) book style  -----------------
 %
 
@@ -73,6 +114,10 @@
 \ProcessOptions
 \LoadClass{book}
 
+\if@natbib
+  \usepackage{natbib}
+\fi
+
 %
 % ---- page sizes ----------------------------------------------
 %
@@ -139,6 +184,7 @@
 %
 
 \let\n@teitem\relax
+\def\@n@teitem#1{\def\@currentlabel{#1}\item[#1]}
 
 \def\@chapternotetext{\begingroup
   \catcode`\^^M=12\newlinechar=`\^^M
@@ -147,7 +193,7 @@
 
 \long\def\d@chapternote#1{%
   \immediate \write\tf@not
-      {\n@teitem[\note@label] #1\relax}%
+      {\n@teitem{\note@label} #1\relax}%
   \endgroup}
 
 %
@@ -166,7 +212,7 @@
   \@startnotes
   \def\note@label{\arabic{footnote}}
   \def\printchapternotes{% Prints the accumulated notes
-    \ifnum\c@footnote>1
+    \ifnum\c@footnote>0
       \clearpage
       \begin{center} Notes to Chapter \arabic{chapter} \end{center}\par
       \addcontentsline{toc}{section}{\protect
@@ -174,7 +220,7 @@
       \begin{description}
       \immediate\closeout\tf@not
       \catcode`@=11
-      \let\n@teitem\item
+      \let\n@teitem\@n@teitem
       \@input{\jobname.not}
       \end{description}
       \clearpage
@@ -201,7 +247,7 @@
     \begin{description}
     \immediate\closeout\tf@not
     \catcode`@=11
-    \let\n@teitem\item
+    \let\n@teitem\@n@teitem
     \@input{\jobname.not}
     \end{description}
     \@startnotes  % allows multiple endnotes
@@ -227,14 +273,15 @@
 \def\textofAppendix#1{\gdef\@textofAppendix{#1}}  \textofAppendix{Appendix}
 
 \def\textpages{% Start of text pages
-   \clearpage\pagestyle{empty}
-   \cleardoublepage\pagestyle{myheadings}\markboth{}{}
+     \advance\textheight by\footskip % has to be done before the clearpage
+   \clearpage
+   \pagestyle{empty}
+   \cleardoublepage
+   \pagestyle{myheadings}\markboth{}{}
    \def\@chapapp{\protect\@textofChapter}
    \def\Thechapter{\arabic{chapter}}
    \pagenumbering{arabic}
-   \advance\textheight by\footskip % no bottom-of-page numbers now
      \footskip\z@
-   % \ifarchitect \textwidth 614\p@ \oddsidemargin 36\p@ \twocolumn\fi
    }
  
 \def\appendix{\par
@@ -246,11 +293,59 @@
  
  
 %
+%  Parts
+%
+\def\@makeparthead#1{ \vspace*{2pc} {\centering
+ \ifnum \c@secnumdepth >\m@ne \large Part \thepart \par
+ \vspace{10\p@} \fi 
+  \def\baselinestretch{1.0}\normalfont
+  \large\bf \uppercase\expandafter{#1}\par
+ \nobreak \vspace{20\p@}} }
+%
+\def\@makesparthead#1{ \vspace*{2pc} {\centering
+ \large\bf \uppercase\expandafter{#1}\par
+ \nobreak \vspace{20\p@}} }
+%
+\def\part{%
+   \printchapternotes
+   \if@openright\cleardoublepage\else\clearpage\fi
+   % \thispagestyle{empty}%
+   \global\@topnum\z@
+   \@afterindenttrue
+   % \let\\\relax
+   \secdef\@part\@spart}
+%
+%  Complication is added here to allow line breaks
+%  in the part titles (via \\).
+%
+\def\@part[#1]#2{
+  \ifnum \c@secnumdepth >\m@ne
+  \refstepcounter{part}
+  \typeout{<<\thepart>>}
+  {\def\\{ }  % allow \\ in title
+   \addcontentsline{toc}{part}{\protect
+     \numberline{Part\ \thepart:}#1}}\else
+  {\def\\{ }  % allow \\ in title
+   \addcontentsline{toc}{part}{#1}}\fi
+ \addtocontents{lof}{\protect\addvspace{5\p@}}
+ \addtocontents{lot}{\protect\addvspace{5\p@}}
+ \if@twocolumn
+  \@topnewpage[\@makeparthead{#2}]
+  \else \@makeparthead{#2}
+  \@afterheading \fi}
+\def\@spart#1{\if@twocolumn \@topnewpage[\@makesparthead{#1}]
+  \else \@makesparthead{#1}
+  \@afterheading\fi}
+
+
+%
 %  Chapter headings
 %
 \def\@makechapterhead#1{ \vspace*{2pc} {\centering
  \ifnum \c@secnumdepth >\m@ne \large \@chapapp{} \Thechapter \par
- \vspace{10\p@} \fi \large\bf \uppercase\expandafter{#1}\par
+ \vspace{10\p@} \fi 
+  \def\baselinestretch{1.0}\normalfont
+  \large\bf \uppercase\expandafter{#1}\par
  \nobreak \vspace{20\p@}} }
 %
 \def\@makeschapterhead#1{ \vspace*{2pc} {\centering
@@ -278,8 +373,8 @@
      \numberline{\@chapapp\ \thechapter:}#1}}\else
   {\def\\{ }  % allow \\ in title
    \addcontentsline{toc}{chapter}{#1}}\fi
- \addtocontents{lof}{\protect\addvspace{10\p@}}
- \addtocontents{lot}{\protect\addvspace{10\p@}}
+ \addtocontents{lof}{\protect\addvspace{5\p@}}
+ \addtocontents{lot}{\protect\addvspace{5\p@}}
  \if@twocolumn
   \@topnewpage[\@makechapterhead{#2}]
   \else \@makechapterhead{#2}
@@ -294,7 +389,7 @@
   \@startsection {section}{1}{\z@}%
        {-3.5ex \@plus -1ex \@minus -.2ex}%
        {2.3ex \@plus.2ex}%
-       {\reset@font\normalsize\bfseries\slshape}}
+       {\def\baselinestretch{1.0}\reset@font\normalsize\bfseries\slshape}}
 \renewcommand\subsection{%
   \@startsection{subsection}{2}{\z@}%
        {-3.25ex\@plus -1ex \@minus -.2ex}%
@@ -306,6 +401,15 @@
        {1.5ex \@plus .2ex}%
        {\reset@font\normalsize\mdseries\itshape}}
 
+% part
+\renewcommand\l@part[2]{%
+  \ifnum \c@tocdepth >\m@ne
+    \addpenalty{-\@highpenalty}%
+    \vskip 1.0em \@plus\p@
+    \setlength\@tempdima{75\p@}%
+    \@dottedtocline{0}{\z@}{\@tempdima}{#1}{#2}%
+  \fi}
+
 %
 %  Provide for `Chapter ' in the toc
 %  (increase \@tempdima)
@@ -314,16 +418,30 @@
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
     \vskip 1.0em \@plus\p@
-    \setlength\@tempdima{85\p@}%
-    \begingroup
-      \parindent \z@ \rightskip \@pnumwidth
-      \parfillskip -\@pnumwidth
-      \leavevmode \bfseries
-      \advance\leftskip\@tempdima
-      \hskip -\leftskip
-      #1\nobreak\hfil \nobreak\hbox to\@pnumwidth{\hss #2}\par
-      \penalty\@highpenalty
-    \endgroup
+    \setlength\@tempdima{75\p@}%
+    \@dottedtocline{0}{\z@}{\@tempdima}{#1}{#2}%
+  \fi}
+
+% 
+% extra space between toc entries
+%
+\def\@dottedtocline#1#2#3#4#5{%
+  \ifnum #1>\c@tocdepth \else
+    \vskip -\baselineskip % \@plus.2\p@%
+    \vskip 1.2\baselineskip
+    {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+     \parindent #2\relax\@afterindenttrue
+     \interlinepenalty\@M
+     \leavevmode
+     \@tempdima #3\relax
+     \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+     {#4}\nobreak
+     \leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor #5}%
+     \par}%
   \fi}
 
 %
@@ -467,7 +585,6 @@
    \setcounter{page}{1}
    \footskip 30\p@ % allowance for the roman page numbers
     \advance\textheight by-\footskip  
-   % \ifarchitect \textwidth 450\p@ \oddsidemargin 118\p@\fi
    }
 %
 %      (The following macros are used once and discarded)
@@ -493,13 +610,14 @@
 \def\titlepage{                   % Prints the title page
     \vspace{7pc}
     \begin{center}
-      {\Large
+      {\def\baselinestretch{1.0}\normalfont\Large
       \lineskip 3ex
       \@Title\par}
       \par\vskip\z@ plus4fill\relax
       \@Author
       \par\vskip\z@ plus4fill\relax
-      \@Degreetext
+      {\def\baselinestretch{1.0}\normalfont
+      \@Degreetext\par}
       \par\vskip\z@ plus2fill\relax
       \@Degree
       \par\vskip\z@ plus2fill\relax
@@ -507,7 +625,8 @@
       \par\vskip\z@ plus1fill\relax
       \@Year
       \par\vskip\z@ plus4fill\relax
-      \@Programtext \@Program
+       {\def\baselinestretch{1.0}\normalfont
+      \@Programtext \@Program\par}
       \par\vskip\z@ plus1fill\relax
     \end{center}
      \vspace{2pc}\relax
@@ -518,7 +637,7 @@
 %
 
 \def\textofChair#1{\gdef\@textofChair{#1}}  
-       \textofChair{Chair of Supervisory Committee}
+       \textofChair{Chair of the Supervisory Committee}
 \def\textofDate#1{\gdef\@textofDate{#1}}  \textofDate{Date}
 
 \newcount\@Chair \@Chair0
@@ -526,7 +645,7 @@
   \global\@namedef{C:\expandafter\the\@Chair}{#1}
   \global\@namedef{T:\expandafter\the\@Chair}{#2}
   \global\@namedef{D:\expandafter\the\@Chair}{#3}
-  \ifnum\@Chair>0\textofChair{Co-Chairs of Supervisory Committee}\fi
+  \ifnum\@Chair>0\textofChair{Co-Chairs of the Supervisory Committee}\fi
   \global\advance\@Chair by1}
 
 
@@ -538,6 +657,7 @@
 \def\signaturepage{     % Prints the dissertation signature page
    \cleardoublepage
     \begin{center}
+      \def\baselinestretch{1.0}\normalfont
       \@School
       \par
       \@GSchool
@@ -579,6 +699,7 @@
 \def\thesissignaturepage{  % Prints the masters thesis signature page
    \cleardoublepage
     \begin{center}
+      \def\baselinestretch{1.0}\normalfont
       \@School
       \par
       \@GSchool
@@ -613,9 +734,10 @@
 \def\textofSignature#1{\gdef\@textofSignature{#1}}  \textofSignature{Signature}
 \long\def\quoteslip#1{
    \cleardoublepage
-   \null
+   % \null
    {\hyphenpenalty1000
-   \vskip\z@ plus1fill\relax
+   % \vskip\z@ plus1fill\relax
+     \def\baselinestretch{1.0}\normalfont
    \noindent #1\par
    }
    \vskip3pc
@@ -636,7 +758,7 @@
 \long\def\thesisquoteslip{%
    \quoteslip{%
    In presenting this thesis in partial fulfillment of the requirements
-   for a Master's degree at the University of Washington, I agree
+   for a master's degree at the University of Washington, I agree
    that the Library shall make its copies freely available for inspection.
    I further agree that extensive copying of this thesis is allowable
    only for scholarly purposes, consistent with ``fair use'' as prescribed
@@ -646,13 +768,13 @@
 \long\def\doctoralquoteslip{%
    \quoteslip{%
    In presenting this dissertation in partial fulfillment of the requirements
-   for the Doctoral degree at the University of Washington, I agree
+   for the doctoral degree at the University of Washington, I agree
    that the Library shall make its copies freely available for inspection.
    I further agree that extensive copying of this dissertation is allowable
    only for scholarly purposes, consistent with ``fair use'' as prescribed
    in the U.S. Copyright Law.  Requests for copying or reproduction
-   of this dissertation may be referred to Bell and Howell Information and
-   Learning, 300 North Zeeb Road, Ann Arbor, MI 48106-1346, to whom
+   of this dissertation may be referred to Proquest Information and Learning,
+   300 North Zeeb Road, Ann Arbor, MI 48106-1346, 1-800-521-0600, to whom
    the author has granted ``the right to reproduce and sell (a) copies
    of the manuscript in microform and/or (b) printed copies of
    the manuscript made from microform.''
@@ -660,13 +782,13 @@
 \long\def\doctoralabstractquoteslip{%
    \quoteslip{%
    In presenting this dissertation in partial fulfillment of the requirements
-   for the Doctoral degree at the University of Washington, I agree
+   for the doctoral degree at the University of Washington, I agree
    that the Library shall make its copies freely available for inspection.
    I further agree that extensive copying of this dissertation is allowable
    only for scholarly purposes, consistent with ``fair use'' as prescribed
    in the U.S. Copyright Law.  Requests for copying or reproduction
-   of this dissertation may be referred to Bell and Howell Information and
-   Learning, 300 North Zeeb Road, Ann Arbor, MI 48106-1346,
+   of this dissertation may be referred to Proquest Information and Learning,
+   300 North Zeeb Road, Ann Arbor, MI 48106-1346, 1-800-521-0600,
    or to the author.
    }}
 
@@ -685,20 +807,22 @@
    \begin{center}
       \@School
       \par\vskip1pc
-      \@textofAbstract
+      {\bf\@textofAbstract}%
       \par\vskip1pc
-      {\large \@Title \par}
+      {\def\baselinestretch{1.0}\normalfont\large \@Title \par}
       \par\vskip1pc
-      by \@Author
+      \@Author
       \par\vskip1pc
+       {\def\baselinestretch{1.0}\normalfont
       \@textofChair:
       \par 
       \count1=0
       \@whilenum \count1<\@Chair \do
-       {\vskip12\p@ \baselineskip12pt
+       {% \vskip12\p@ \baselineskip12pt
         \csname T:\the\count1\endcsname\ \csname C:\the\count1\endcsname
-        \par \csname D:\the\count1\endcsname
+        \par \csname D:\the\count1\endcsname\par\vskip6\p@
         \advance\count1 by1}
+       \par}
       \par\vskip1pc
    \end{center}
    \if@twoside
@@ -724,18 +848,23 @@
    \pagestyle{plain}
    \thispagestyle{plain}
    \setcounter{page}{1}
+   \hbox to\textwidth{\hfill Page}
    {\let\footnotemark\relax  % in case one is in the title
+    \def\baselinestretch{1.0}\normalfont
    \@starttoc{toc}
     }
    }
 %
 %   List of figures
 %
+
 \def\textofLoF#1{\gdef\@textofLoF{#1}}  \textofLoF{List of Figures}
 \def\listoffigures{\chapter*{\@textofLoF\@mkboth{}{}}
    \thispagestyle{plain}
    \addcontentsline{toc}{chapter}{\protect\@textofLoF}
+   \hbox to\textwidth{Figure Number \hfill Page}
    {\let\footnotemark\relax  % in case one is in the title
+    \def\baselinestretch{1.0}\normalfont
    \@starttoc{lof}
     }
    }
@@ -746,7 +875,9 @@
 \def\listoftables{\chapter*{\@textofLoT\@mkboth{}{}}
    \thispagestyle{plain}
    \addcontentsline{toc}{chapter}{\protect\@textofLoT}
+   \hbox to\textwidth{Table Number \hfill Page}
    {\let\footnotemark\relax  % in case one is in the title
+    \def\baselinestretch{1.0}\normalfont
    \@starttoc{lot}
     }
    }
@@ -762,6 +893,7 @@
  \usecounter{enumi}}
  \def\newblock{\hskip .11em plus .33em minus .07em}
  \sloppy\clubpenalty4000\widowpenalty4000
+ \def\baselinestretch{1.0}\normalfont
  \sfcode`\.=1000\relax}
  
 %