From 7e1743eb22f0bb6cf5f753eb654c06baa95114d1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Apr 2008 17:26:33 +0000 Subject: uwthesis update (16apr08) git-svn-id: svn://tug.org/texlive/trunk@7524 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bib/uwthesis/uwthesis.bib | 84 -------- Master/texmf-dist/doc/latex/uwthesis/LICENSE | 17 ++ Master/texmf-dist/doc/latex/uwthesis/README | 18 +- Master/texmf-dist/doc/latex/uwthesis/uwthesis.bib | 82 ++++++++ Master/texmf-dist/doc/latex/uwthesis/uwthesis.dvi | Bin 49200 -> 0 bytes Master/texmf-dist/doc/latex/uwthesis/uwthesis.pdf | Bin 0 -> 211632 bytes Master/texmf-dist/doc/latex/uwthesis/uwthesis.tex | 116 ++++++----- Master/texmf-dist/tex/latex/uwthesis/uwthesis.cls | 218 +++++++++++++++++---- 8 files changed, 352 insertions(+), 183 deletions(-) delete mode 100644 Master/texmf-dist/bibtex/bib/uwthesis/uwthesis.bib create mode 100644 Master/texmf-dist/doc/latex/uwthesis/LICENSE create mode 100644 Master/texmf-dist/doc/latex/uwthesis/uwthesis.bib delete mode 100644 Master/texmf-dist/doc/latex/uwthesis/uwthesis.dvi create mode 100644 Master/texmf-dist/doc/latex/uwthesis/uwthesis.pdf (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/bibtex/bib/uwthesis/uwthesis.bib b/Master/texmf-dist/bibtex/bib/uwthesis/uwthesis.bib deleted file mode 100644 index 0275795ddd2..00000000000 --- a/Master/texmf-dist/bibtex/bib/uwthesis/uwthesis.bib +++ /dev/null @@ -1,84 +0,0 @@ - -Bibtex (bib) file for the thesis style document. - -@string{Knuth="Donald E. Knuth"} - -@book{book, - author = knuth, - title = "The {\TeX} book", - publisher = "Addison-Wesley", - year = 1984} - -@book{Tbook, - author = knuth, - title = "{\TeX}: The Program", - publisher = "Addison-Wesley", - year = 1986} - -@book{Metafont, - author = knuth, - title = "The Metafont book", - publisher = "Addison-Wesley", - year = 1986} - -@book{CMT, - author = knuth, - title = "Computer Modern Typefaces", - publisher = "Addison-Wesley", - year = 1986} - -@book{Lbook, - author = "Leslie Lamport", - title = "{\LaTeX}: A Document Preparation System", - edition = "2nd", - publisher = "Addison-Wesley", - year = 1994} - -@book{companion, - author = "M{ichel} Goossens and F{rank} Mittelbach and A{lexander} Samarin", - title = "The {\LaTeX} Companion", - publisher = "Addison-Wesley", - year = 1994} - - - -@article{TUG:h-l, - author = "Editor", - title = "Hyphenation Exception Log", - journal = "TUGboat", - volume = 7, - number = 3, - year = 1986, - pages = "145"} - - -@book{Hamlet, - author = "William Shakespeare", - title = "Hamlet", - publisher = "F.S.~Crofts~\&~Co., Inc.", - address = "NY", - year = 1946, - note = "Act~I, Scene~3, Lines~70-72, are apropos."} - -Following author fields is not standard -@book{JTeX, - author = "{Spivak, M.D., Ph.D.}", - title = "The Joy of {\TeX}", - publisher = "American Mathematical Society", - address = "RI", - year = 1986} - -@book{PCTeX, - author = "{Spivak, M.D., Ph.D.}", - title = "PC{\TeX}\ Manual", - publisher = "Personal {\TeX}, Inc.", - address = "CA", - year = 1985} - -@booklet{SP, - title = "Style and Policy Manual for Theses and Dissertations", - author = "University of Washington, Graduate School", - year = 2000} - - - diff --git a/Master/texmf-dist/doc/latex/uwthesis/LICENSE b/Master/texmf-dist/doc/latex/uwthesis/LICENSE new file mode 100644 index 00000000000..856c7673331 --- /dev/null +++ b/Master/texmf-dist/doc/latex/uwthesis/LICENSE @@ -0,0 +1,17 @@ +% ======================================================================== +% Copyright (c) 1995-2007 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. +% ======================================================================== +% + diff --git a/Master/texmf-dist/doc/latex/uwthesis/README b/Master/texmf-dist/doc/latex/uwthesis/README index 9c4508adc68..b537e8e228c 100644 --- a/Master/texmf-dist/doc/latex/uwthesis/README +++ b/Master/texmf-dist/doc/latex/uwthesis/README @@ -1,22 +1,18 @@ This is source and documentation for the latex thesis package at the University of Washington, Seattle, WA, USA. -Retrieve all three files (uwthesis.tex, uwthesis.bib, and uwthesis.cls). The tex file is both a thesis template and the documentation, -format it for the documentation; e.g. - $ latex uwthesis - $ bibtex uwthesis - $ latex uwthesis - $ latex uwthesis +uwthesis.cls The class file +uwthesis.tex Documentation and example +uwthesis.bib Bibliography for the documentation +uwthesis.pdf Preformatted uwthesis document -and print the resulting dvi file. -Jim Fox - -July 14, 2003 +All files are distributed under the Apache 2.0 license. +Jim Fox http://staff.washington.edu/fox/ -fox@u.washington.edu +fox@washington.edu diff --git a/Master/texmf-dist/doc/latex/uwthesis/uwthesis.bib b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.bib new file mode 100644 index 00000000000..ccf85d43e21 --- /dev/null +++ b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.bib @@ -0,0 +1,82 @@ + +Bibtex (bib) file for the thesis style document. + +@string{Knuth="Donald E. Knuth"} + +@book{book, + author = knuth, + title = "The {\TeX} book", + publisher = "Addison-Wesley", + year = 1984} + +@book{Tbook, + author = knuth, + title = "{\TeX}: The Program", + publisher = "Addison-Wesley", + year = 1986} + +@book{Metafont, + author = knuth, + title = "The Metafont book", + publisher = "Addison-Wesley", + year = 1986} + +@book{CMT, + author = knuth, + title = "Computer Modern Typefaces", + publisher = "Addison-Wesley", + year = 1986} + +@book{Lbook, + author = "Leslie Lamport", + title = "{\LaTeX}: A Document Preparation System", + edition = "2nd", + publisher = "Addison-Wesley", + year = 1994} + +@book{companion, + author = "M{ichel} Goossens and F{rank} Mittelbach and A{lexander} Samarin", + title = "The {\LaTeX} Companion", + publisher = "Addison-Wesley", + year = 1994} + +@article{TUG:h-l, + author = "Editor", + title = "Hyphenation Exception Log", + journal = "TUGboat", + volume = 7, + number = 3, + year = 1986, + pages = "145"} + + +@book{Hamlet, + author = "William Shakespeare", + title = "Hamlet", + publisher = "F.S.~Crofts~\&~Co., Inc.", + address = "NY", + year = 1946, + note = "Act~I, Scene~3, Lines~70-72, are apropos."} + +Following author fields is not standard +@book{JTeX, + author = "{Spivak, M.D., Ph.D.}", + title = "The Joy of {\TeX}", + publisher = "American Mathematical Society", + address = "RI", + year = 1986} + +@book{PCTeX, + author = "{Spivak, M.D., Ph.D.}", + title = "PC{\TeX}\ Manual", + publisher = "Personal {\TeX}, Inc.", + address = "CA", + year = 1985} + +@booklet{SP, + title = "Style and Policy Manual for Theses and Dissertations", + author = "University of Washington, Graduate School", + year = 2005} + + + diff --git a/Master/texmf-dist/doc/latex/uwthesis/uwthesis.dvi b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.dvi deleted file mode 100644 index ba31dbd7f08..00000000000 Binary files a/Master/texmf-dist/doc/latex/uwthesis/uwthesis.dvi and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/uwthesis/uwthesis.pdf b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.pdf new file mode 100644 index 00000000000..d7149a3b6f0 Binary files /dev/null and b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/uwthesis/uwthesis.tex b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.tex index 05bb8571c0a..62d1ffcb0e8 100644 --- a/Master/texmf-dist/doc/latex/uwthesis/uwthesis.tex +++ b/Master/texmf-dist/doc/latex/uwthesis/uwthesis.tex @@ -1,16 +1,25 @@ -% Documentation for UW thesis document style for LaTeX -% by Jim Fox -% fox@washington.edu +% ======================================================================== +% Copyright (c) 2006-2008 The University of Washington % -% revised: July 14, 2003 +% 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 % -% I renamed the class and documentation for a couple of reasons: +% http://www.apache.org/licenses/LICENSE-2.0 % -% 1) At the tex world archive (CTAN) there are other thesis -% packages, but only this one for UW. +% 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. +% ======================================================================== % -% 2) It formats a UW thesis, not a generic one. + +% Documentation for UW thesis document style for LaTeX +% by Jim Fox +% fox@washington.edu % +% Revised for version 2008/04/15 of uwthesis.cls % % This document is contained in a single file ONLY because % I wanted to be able to distribute it easily. A real thesis ought @@ -30,7 +39,7 @@ % Printed in twoside style now that that's allowed % -\documentclass [11pt, twoside, endnotes] {uwthesis} +\documentclass [11pt, twoside] {uwthesis} % % The following line would print the thesis in a postscript font @@ -77,8 +86,8 @@ for Thesis Preparation by Technical and\\ Non-technical Degree Candidates} \Author{Jim Fox} -\Year{2000} -\Program{Computing \& Communications} +\Year{2008} +\Program{UW Technology Services} % \titlepage % --- sample stuff only ----- @@ -185,6 +194,8 @@ each particular usage. \item[back-up] a copy of a file to be used when catastrophe strikes the original. People who make no back-ups deserve no sympathy. +\item[class] a set of macros that combine for a single +purpose. This thesis package constitute a class. \item[control sequence] the normal form of a command to \LaTeX. \item[delimiter] something, often a character, that indicates the beginning and ending of an argument. @@ -210,16 +221,16 @@ material according to instructions embedded in the text. A word-processor, on the other hand, is normally controlled by keyboard strokes that move text about on a display. \item[\LaTeX] simply the ultimate in computerized typesetting. -\item[macro] a user-defined control sequence. -\item[macro package] a set of macros that combine for a single -purpose. These thesis macros -constitute a macro package. +\item[macro] a complex control sequence composed of +other control sequences. \item[pica] a unit of length. One pica is twelve points and six picas is about an inch. \item[point] a unit of length. 72.27 points equals one inch. -\item[roman] a conventional printing typestyle. This thesis -is set in roman type. +\item[roman] a conventional printing typestyle using serifs. +the decorations on the ends of letter strokes. +This thesis is set in roman type. \item[rule] a straight printed line; e.g., \hrulefill. +\item[serif] the decoration at the ends of letter strokes. \item[table] information placed in a columnar arrangement. \item[thesis] either a master's thesis or a doctoral dissertation. This document also refers to itself as a thesis, although it @@ -233,11 +244,17 @@ really is not one. \acknowledgments{% \vskip2pc % {\narrower\noindent The author wishes to express sincere appreciation to - University Computing Services, where he has had the opportunity + University of Washington, where he has had the opportunity to work with the \TeX\ formatting system, and to the author of \TeX, Donald Knuth, {\it il miglior fabbro}. % \par} } + +% +% ----- dedication +% +\dedication{\begin{center}to my dear wife, Joanna\end{center}} + % % end of the preliminary pages @@ -251,11 +268,12 @@ really is not one. % ========== Chapter 1 -\chapter{Introduction} +\chapter {Introduction} The utility of a clean, professionally prepared thesis is well documented% -\footnote{See, for example, W. Shakespeare\cite{Hamlet} for an early treatment.} +\footnote{See, for example, + W.~Shakespeare\cite{Hamlet} for a recent discussion.} but, until recently, a degree candidate had no recourse but to submit his or her thesis to a typist for completion. Revisions were difficult and time consuming, and even at its best the @@ -280,7 +298,7 @@ are available about the campus. This sample is both a demonstration of the quality and propriety of a \LaTeX\footnote{We mean the \LaTeXe\ version -of \LaTeX. Earlier versions, now called \LaTeX2.09 were much +of \LaTeX. Earlier versions, now called \LaTeX2.10 were much different.} formatted thesis, and is documentation for the preparation of a thesis. It has made extensive use of a custom class file @@ -347,9 +365,9 @@ Table of Contents?} \TeX\ is a formatter. A document's format is controlled by commands embedded in the text. -The peculiar look to the names indicate that \TeX\ is also -a typesetting program. Each character and rule on the page -is precisely positioned. +% The peculiar look to the names indicate that \TeX\ is also +% a typesetting program. Each character and rule on the page +% is precisely positioned. \LaTeX\ is a special version of \TeX---preloaded with a voluminous set of macros that simplify most formatting tasks. @@ -437,8 +455,13 @@ Most \LaTeX\ implementations at the University are tailored for the English language. However, \LaTeX\ will format many other languages. Consult your department or contact the -Humanities and Arts Computing Center for assistance with -non-English formatting. +Center for Advanced Research Technology in the Arts and Humanities (CARTAH), +\smallskip +\begin{center} +{\tt cartha@u.washington.edu}, +\end{center} +\smallskip +for assistance with non-English formatting. Unusual characters can be defined via the font maker \hbox{\mffont METAFONT} (documented by Knuth\cite{Metafont}). @@ -459,7 +482,7 @@ custom fonts may soon proclaim, \chapter{The Thesis Unformatted} This chapter describes the uwthesis class (\texttt{uwthesis.cls}, -version dated 2003/07/14) +version dated 2008/04/15) in detail and shows how it was used to format the thesis. A working knowledge of Lamport's \LaTeX\ manual\cite{Lbook} is assumed. @@ -539,7 +562,8 @@ but contains no text of its own. \end{fullpage} \end{figure} -The first section defines the document class and options. +The first section, from the \verb"\documentclass" to +the \verb"\begin\{document\}", defines the document class and options. This thesis has specified two-sided formatting, which is now allowed by the Graduate School. Two sided printing is now actually \LaTeX's default. If you want one sided printing @@ -551,9 +575,15 @@ Default is 12 points, which is the preference of the Graduate School. If you choose a smaller size be sure to check with the Graduate School for acceptability. The smaller fonts can produce very small sub and superscripts. + +Include most additional formatting packages with \verb"\usepackage", +as describe by Lamport\cite{Lbook}. The one exception to this +rule is the \verb"natbib" package. Include it with the \verb"natbib" +document option. Use the \verb"\includeonly" command to format only a part of your thesis. See Lamport\cite[sec. 4.4]{Lbook} for usage and limitations. + \section{The Text Pages} @@ -706,17 +736,16 @@ horizontal also. \LaTeX\ will format landscape material for you if a couple of conditions are met. You have to have a printer and printer driver that allow rotations and you have to have a couple of add-on \LaTeX\ packages. -Users of PostScript printers and Uniform Access computers -at the University of Washington will conform to both requirements, -as will users of PC\TeX\ if they use postscript. + +% Users of PostScript printers and Uniform Access computers +% at the University of Washington will conform to both requirements, +% as will users of PC\TeX\ if they use postscript. Include the \texttt{rotating} package \begin{demo} \\usepackage[figuresright]\{rotating\} \end{demo} and read the documentation that comes with the package. -Documentation can also be found on many of our systems in -\verb"/usr/local/share/texmf/doc/...". Figure~\ref{sideways} is an example of how a landscape table might be formatted. @@ -793,7 +822,7 @@ The title page of this thesis was printed with% for Thesis Preparation by Technical and\\\\ Non-technical Degree Candidates\} \\Author\{Jim Fox\} -\\Program\{Computing \& Communications\} +\\Program\{UW Technology Services\} \\Year\{1999\} \\titlepage \end{demo} @@ -1012,30 +1041,27 @@ contains many formatting examples which you may find useful. The bibliography database, {\tt uwthesis.bib}, contains instructions to BibTeX to create and format the bibliography. -You can find these files in the following locations: +You can find the latest of these files in the following locations: \begin{itemize} -\item Web +\item CTAN \begin{description} -\item[] \verb%http://staff.washington.edu/fox/tex/uwthesis.html% +\item[] \verb%http://tug.ctan.org/tex-archive/macros/latex/contrib/uwthesis/% \end{description} -\item The \TeX\ input path on UCS UNIX computers +\item My page. \begin{description} -\item[] \verb%/usr/local/share/teTeX/texmf/tex/latex/uw/% +\item[] \verb%http://staff.washington.edu/fox/tex/uwthesis.html% \end{description} \end{itemize} - \vita{Jim Fox is a Senior Software Engineer at the University of Washington. -In addition to a wide variety of other duties, he maintains -the thesis class file and documentation for University of Washington -theses and dissertations. +His duties do not include maintaining this package. It is rather +an avocation which he maintains as he deems fit. -For many years Mr. Fox was a columnist for RS/Magazine and SunExpert. +He welcomes your comments to {\tt fox@washington.edu}. } - \end{document} 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} % @@ -58,6 +91,14 @@ \DeclareOption{endnotes}% selects end-of-thesis notes {\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 @@ -245,12 +292,60 @@ \def\thechapter{\Alph{chapter}}} +% +% 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} % -- cgit v1.2.3