From 168c4abebd344cda13d71257a8f5882ddf75b461 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 17 Oct 2006 22:40:33 +0000 Subject: various additions to tpm-ctan-check, and updated to packages unitsdef, undertilde, ushort, units, umich-thsis, uiucthesis git-svn-id: svn://tug.org/texlive/trunk@2343 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/uiucthesis/uiucthesis.dtx | 362 +++++++++++++-------- 1 file changed, 222 insertions(+), 140 deletions(-) (limited to 'Master/texmf-dist/source/latex/uiucthesis') diff --git a/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx b/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx index 70cc249ab42..b6e383ad587 100644 --- a/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx +++ b/Master/texmf-dist/source/latex/uiucthesis/uiucthesis.dtx @@ -1,4 +1,4 @@ -\def\fileversion{v2.0} \def\filedate{2005/02/01} +\def\fileversion{v2.25} \def\filedate{2005/03/25} % \iffalse % this is a METACOMMENT ! %% Package and Class "uiucthesis" for use with LaTeX2e. % @@ -21,7 +21,7 @@ % % \fi % -% \CheckSum{1103} +% \CheckSum{1143} % % \MakeShortVerb{\|} % @@ -67,13 +67,12 @@ % The |[draftthesis]| option causes each page to have a header % proclaiming the document to be a draft copy, along with the % current time and date. -% It also omits the preliminary part of the -% thesis---currently only the copyright page. -% This is marginally useful for saving paper before you -% produce the final version of the thesis. +% It also omits the copyright page and prints out any marginal notes +% added with the |\note| macro. % The |[fancy]| style option produces slightly fancier chapter headings. % The |[fullpage]| style option makes the margins as small as the -% format requirements allow. Because wide text columns are generally +% format requirements allow and uses double-spacing for the text. +% Because wide text columns are generally % considered harder on the reader % this is not the default, but is provided as an option because people % seem to want it. @@ -81,10 +80,10 @@ % one or the other. % % \DescribeMacro{[proquest]} -% This option is meant to be used when you are ready to deposit your thesis. +% The |[proquest]| option is meant to be used when you are ready to deposit your thesis. % For doctorates, the Grad College requires the submission of a specially % formatted abstract for the ProQuest publication service. To produce this -% abstract, include the |[proquest]| option are reprocess your file. Everything +% abstract, include the |[proquest]| option and reprocess your file. Everything % in your \LaTeX\ document will be ignored except the contents of the \env{abstract} % environment, which are printed out in the format required. Once the option is % removed from the |\documentclass| command, you can reprocess your thesis as @@ -93,24 +92,28 @@ % below). % % \DescribeMacro{[edeposit]} -% Use this option if you are depositing your thesis electronically. The title page +% Use the |[edeposit]| option if you are depositing your thesis electronically. The title page % is different and the page numbering is slightly different since the committee % approval form is not included with your thesis. If this option is used, you % must specify your committee members with the |\committee| command (see below). % -% \DescribeMacro{[toclabels]} -% This option includes the ``Page'' label on the right-hand side of the first page -% in the Table of Contents, List of Figures, and List of Tables. This is required by -% some departments (or you may just like the way it looks). -% % \DescribeMacro{[offcenter]} -% In the last version of \pkg{uiucthesis}, the |[fancy]| option produced text with -% asymmetric margins so that enough room for the chapter numbers was available -% in the left margin. This version by default uses symmetric margins, even with the -% |[fancy]| option. If you have a lot of chapters, your chapter numbers may spill into -% the 1 inch margin required by the Grad College. In this case, the previous behavior -% can be reproduced with the |[offcenter]| option, which shifts the margins approximately -% 1/2 inch to the right. +% The |[offcenter]| option adds 1/2 inch to the left margin of all pages. +% This can be done to allow some extra space there for binding purposes, or +% if you use the |[fancy]| option, to allow for more space for the chapter +% numbers at the left side of the page. +% In past versions of \pkg{uiucthesis}, the |[fancy]| option did this by default. +% This version uses symmetric margins by default, even with the +% |[fancy]| option. If you have a lot of chapters (i.e., more than 9), your chapter +% numbers may spill into +% the 1 inch margin required by the Grad College without using this option. +% This option should not be used with the |[fullpage]| option. +% +% \DescribeMacro{[centerchapter]} +% Normally, the chapter headings are all left-justified on the opening page of +% each chapter. These headings can all be centered by using the |[centerchapter]| +% option for the class. This option is not recommended for use with the |[fancy]| +% option. % % \subsection{The Title Page} % @@ -125,15 +128,15 @@ % \DescribeMacro{\college} % Use the |\phdthesis| or |\msthesis| to set the correct thesis type. % If your thesis isn't for a ``Ph.D.'' or ``M.S.'', you can specify -% your degree with either\linebreak +% your degree with either\\ % |\otherdoctorate{|\meta{degree name}|}{|\meta{abbreviation}|}| or\\ % |\othermasters{|\meta{degree name}|}{|\meta{abbreviation}|}|.\\ % For example, specifying |\phdthesis| is equivalent to giving the command\\ % |\otherdoctorate{Doctor of Philosophy}{Ph.D.}|.\\ % The default thesis type is |\phdthesis|. Set your department with\linebreak -% |\department{|\meta{department}|}|. This defines the field your degree will be in, so leave out -% ``Department of.'' -% The default department is ``Physics''. +% |\department{|\meta{department}|}|. This defines the field your degree +% will be in, so leave out ``Department of.'' +% The default department is ``Computer Science''. % Define your college with |\college{|\meta{college}|}|. % The default is college is ``Graduate College''; % you shouldn't need to change it. @@ -149,7 +152,8 @@ % % \DescribeMacro{\advisor} % \DescribeMacro{\adviser} -% Use |\advisor{|\meta{advisor name}|}| or |\adviser{|\meta{advisor name}|}| to specify the name of your +% Use |\advisor{|\meta{advisor name}|}| or |\adviser{|\meta{advisor name}|}| +% to specify the name of your % advisor. This is needed to produce the ProQuest abstract % (see the |[proquest]| option above). You only need to submit a % ProQuest abstract if you are a doctoral candidate. @@ -161,7 +165,7 @@ % electronically deposited theses. % % \DescribeMacro{\volume} -% This macro provides nominal support for very long theses that must +% The |\volume| macro provides nominal support for very long theses that must % be broken up into multiple volumes. Use |\volume{|\meta{number}|}| % to specify the volume number (a single arabic numeral). All this macro % does is place the word VOLUME with the number you specify on the title @@ -200,14 +204,15 @@ % (The title page is page i, and the certificate % of committee approval, the ``red-bordered form,'' is page ii.) % -% \DescribeMacro{abstract} +% \DescribeEnv{abstract} % The abstract should appear in the \env{abstract} environment. Normally, -% this just produces another chapter with |\chapter*{Abstract}|, +% this just produces another chapter with |\chapter*{\abstractname}|, +% where |\abstractname| is ``Abstract'' (see User Customization below), % but if the |[proquest]| option % is specified, then the contents of this environment are used % for the ProQuest abstract. % -% \DescribeMacro{dedication} +% \DescribeEnv{dedication} % A dedication page can be printed with the \env{dedication} environment. % This produces a separate page with the dedication centered horizontally % and vertically, with the text in italics. @@ -218,10 +223,10 @@ % to generate them. % In the \pkg{uiucthesis} format these lists are all single spaced. % -% \DescribeMacro{symbollist} -% \DescribeMacro{symbollist*} +% \DescribeEnv{symbollist} +% \DescribeEnv{symbollist*} % Optionally, these tables can be followed by a List of Abbreviations and/or -% List of Symbols. Introduce these with the |\chapter*| command. To aid in +% List of Symbols. Introduce these with the |\chapter| command. To aid in % making these lists, the \env{symbollist} and \env{symbollist*} environments are % defined in \pkg{uiucthesis}. These environments produce a two-column list % as illustrated below. By default the left column is 1 inch wide but can @@ -251,7 +256,7 @@ To Father and Mother. %% Create an Acknowledgements page, many departments require you to %% include funding support in this. -\chapter*{Acknowledgements} +\chapter*{Acknowledgments} This project would not have been possible without the support of many people. Many thanks to my adviser, Lawrence T. Strongarm, who @@ -264,28 +269,30 @@ financial means to complete this project. And finally, thanks to my husband, parents, and numerous friends who endured this long process with me, always offering support and love. -%% The thesis format requires these lists to come in the following -%% order, all major sections after the Table of Contents must be listed -%% therein, which is automatically taken care of in uiucthesis: +%% The thesis format requires the Table of Contents to come +%% before any other major sections, all of these sections after +%% the Table of Contents must be listed therein (i.e., use \chapter, +%% not \chapter*). Common sections to have between the Table of +%% Contents and the main text are: %% -%% Table of Contents %% List of Tables -%% List of Figures or List of Illustrations -%% List of Symbols and/or Abbreviations +%% List of Figures +%% List Symbols and/or Abbreviations +%% etc. \tableofcontents \listoftables \listoffigures -% \end{verbatim} \hrule \end{quote} % \iffalse % % \fi +% \end{verbatim} \hrule \end{quote} % % If you want a List of Symbols or Abbreviations, you can do so as follows: % \begin{quote} \hrule \begin{verbatim} %% Create a List of Abbreviations. The left column %% is 1 inch wide and left-justified -\chapter*{List of Abbreviations} +\chapter{List of Abbreviations} \begin{symbollist*} \item[CA] Caffeine Addict. @@ -294,7 +301,7 @@ process with me, always offering support and love. %% Create a List of Symbols. The left column %% is 0.7 inch wide and centered -\chapter*{List of Symbols} +\chapter{List of Symbols} \begin{symbollist}[0.7in] \item[$\tau$] Time taken to drink one cup of coffee. @@ -333,22 +340,27 @@ process with me, always offering support and love. \chapter{Conclusions} We conclude that graduate students like coffee. - -% \end{verbatim} \hrule \end{quote} % \iffalse % % \fi +% \end{verbatim} \hrule \end{quote} % % \subsection{Reference Matter} % % \DescribeMacro{\appendix} % To switch from the body of your thesis to the reference material % at the end, you should use the standard \LaTeX\ |\appendix| command. +% In \pkg{uiucthesis}, there is also a starred version of this command +% that eliminates the lettering of the appendices (use if you have +% a single appendix). Note that if you use |\appendix*| along with +% the |[fancy]| option, you may want to put ``Appendix:'' at +% the beginning of the chapter title. +% % % \begin{quote} \hrule \begin{verbatim} -\appendix +\appendix* -\include{A-data.tex} +\include{Appendix.tex} % \end{verbatim} \hrule \end{quote} % \iffalse % @@ -360,17 +372,16 @@ We conclude that graduate students like coffee. % The last few chapters in your thesis should not have chapter % numbers, but should be listed in the Table of Contents. % These chapters include the Bibliography, the Index, -% and the Vita. \LaTeX's |\backmatter| command provides the correct -% formatting for these chapters. +% and the Vita. \LaTeX's |\backmatter| command accomplishes this. % % \DescribeMacro{\bibliography} % Use the standard \LaTeX\ bibliography commands to -% create your bibliography. Most people will use Bib\TeX to do this. +% create your bibliography. Most people will use Bib\TeX\ to do this. % (See \cite{Lamport}). For those in the sciences, you may want to % check out the \pkg{cite} package (it's pretty standard), which % will produce numerical citations that are sorted and compressed. -% You can also use the \pkg{natbib} package, although it creates a -% problem if the |headings| pagestyle is used. +% You can also use the \pkg{natbib} package. Both of these packages +% can do either bracketed citations or superscript citations. % % \DescribeMacro{\vita} % The |\vita| command begins a new chapter for your vita. @@ -409,6 +420,20 @@ Juan Valdez was born\ldots. % If you're unhappy with that, you can override it by redefining the % |\thesisspacing| command. % +% \DescribeMacro{\nocopyrightpage} +% Unless the |[draftthesis]| option is used, a page with the copyright notice +% is printed before the title page. If you don't want this page to +% appear, even in the final version, put the |\nocopyrightpage| macro +% somewhere in the preamble. +% +% \DescribeMacro{\toclabels} +% Some departments require the Table of Contents, List of Tables and +% List of Figures to have a ``Page'' heading over the page numbers +% on the first page. This can be accomplished by putting the |\toclabels| +% command somewhere before the |\tableofcontents| command. (NOTE: if you put +% the |\tableofcontents| command in a separate file that you |\include| in +% the main file, the |\toclabels| command must also be in that file.) +% % \DescribeMacro{\chaptertitlefont} % \DescribeMacro{\sectiontitlefont} % \DescribeMacro{\subsectiontitlefont} @@ -425,11 +450,11 @@ Juan Valdez was born\ldots. % |\renewcommand| to redefine this macro in the preamble. % % \DescribeMacro{\chaptertitleheight} -% This is the amount of space allotted for the chapter title at the top +% |\chaptertitleheight| is the amount of space allotted for the chapter title at the top % of the page. You can redefine it using |\setlength| in the preamble. % % \DescribeMacro{\bibname} -% This is a standard \LaTeX\ macro that contains the title of the reference +% |\bibname| is a standard \LaTeX\ macro that contains the title of the reference % section at the end of your thesis; ``References'' by default. Use % |\renewcommand| to redefine it in the preamble. % @@ -438,13 +463,31 @@ Juan Valdez was born\ldots. % The Grad College allows ``Vita'', ``Author's Biography'', or ``Curriculum Vitae'', % each of which is slightly different in format. See \cite{Handbook}. % +% \DescribeMacro{\abstractname} +% Like above, but for the abstract. By default, ``Abstract''. +% +% \DescribeMacro{other "name"s} +% Similarly, the titles for the Table of Contents, List of Figures, and List of Tables +% are stored in the macros |\contentsname|, |\listfigurename|, and |\listtablename|, +% respectively. Their default values are the names in the previous sentence. There are +% also the macros |\chaptername|, |\appendixname|, |\indexname|, |\partname|, +% |\tablename|, and |\figurename| that contain the appellations for chapter and appendix +% headings (not applicable with the |[fancy]| option), the index, parts, tables, and figures. +% Their default values are Chapter, Appendix, Index, Part, Table, and Figure, respectively. +% All of these macros can +% be redefined in the preamble with |\renewcommand|. These macros are all part of +% the standard \LaTeX\ formalism, they are just included here for the reader's convenience. +% For example, some departments require chapter headings to be in all caps, which can +% be done by changing the |\chaptername| macro to be CHAPTER. +% % \DescribeMacro{\note} % This command inserts a marginal note just like |\marginpar| with two distinctions: -% First, the note is single-spaced for compactness. Second, it is only printed when +% First, the note is single-spaced in a smaller type for compactness. +% Second, it is only printed when % the |[draftthesis]| option is used. Since marginal notes are not allowed in the final % draft, the |\note| command is recommended over the |\marginpar| command. % -% \section{Compatibility} +% \section{Backwards Compatibility} % % Compatibility with previous versions of \pkg{uiucthesis} are supported. Previously it % was implemented as a package rather than a class, in which case you opened the document @@ -458,6 +501,31 @@ Juan Valdez was born\ldots. % used the \env{preliminary} and \env{thesis} environments, which are now deprecated % but backwards-compatibility support is still provided. % +% \section{Other Issues} +% +% \subsection{Paper Size and PDF Files} +% +% The default paper size for most \LaTeX\ distributions is A4, which is slightly different +% the 8.5 x 11 size for letter paper in the U.S\@. The Graduate College requires theses +% to be letter paper size. In addition, many departments want soft copies of the thesis +% in PDF format. Unfortunately, the program used to convert the dvi file to PDF format +% (|dvipdfm| on my computer, which is a Windows machine with Mik\TeX installed on it) +% often produces PDF files in A4 format, even if |letterpaper| +% is specifically specified in the your \TeX source file. If you're having this problem, +% either run the PDF conversion utility from the command line with the right flag --- +% for example, |dvipdfm -p letter| on my computer --- or change the default paper size in +% the config file for your PDF conversion utility, which will then fix this problem +% permanently. On my computer, this can be done by going to the |dvipdfm\config| +% subdirectory off of the main \TeX installation directory (usually |C:\texmf|). In this +% directory is a file called |config| that has a line for the default paper size. +% +% \subsection{Reference Lists at the Chapter Level} +% +% The \pkg{cite} package includes a style file \pkg{chapterbib.sty} that can be used +% to do a list of references for each chapter instead of just one big list at the +% end of the thesis. I've not used this style before so you're on your own if you +% want to do this, but I think it is rather straightforward\ldots. +% % \StopEventually{% % \begin{thebibliography}{9} % \bibitem{Handbook} @@ -515,6 +583,7 @@ Juan Valdez was born\ldots. \newif\if@proquest \@proquestfalse \newif\if@edeposit \@edepositfalse \newif\if@thesisoffcenter \@thesisoffcenterfalse +\newif\if@centerchapter \@centerchapterfalse % \end{macrocode} % % \begin{macrocode} @@ -522,9 +591,10 @@ Juan Valdez was born\ldots. \DeclareOption{fancy}{\@thesisfancytrue} \DeclareOption{fullpage}{\@fullpagetrue} \DeclareOption{proquest}{\@proquesttrue} -\DeclareOption{toclabels}{\AtBeginDocument{\fancytoc}} +\DeclareOption{toclabels}{\AtBeginDocument{\toclabels}} \DeclareOption{edeposit}{\@edeposittrue} \DeclareOption{offcenter}{\@thesisoffcentertrue} +\DeclareOption{centerchapter}{\@centerchaptertrue} % \end{macrocode} % % The |[largecaps]| option causes the title and author's name to @@ -575,11 +645,11 @@ Juan Valdez was born\ldots. \fi % \end{macrocode} % -% Define the |\fancytoc| command which prints the headings in the Table of Contents, -% List of Figures and List of Tables if the |[toclabels]| option is used. +% Define the |\toclabels| command which prints the headings in the Table of Contents, +% List of Figures and List of Tables. % % \begin{macrocode} -\newcommand{\fancytoc}{% +\newcommand{\toclabels}{% \addtocontents{toc}{\vspace*{-\baselineskip}\hfill Page\endgraf}% \addtocontents{lof}{\vspace*{-\baselineskip}~Figure\hfill Page\endgraf}% \addtocontents{lot}{\vspace*{-\baselineskip}~Table\hfill Page\endgraf}} @@ -660,11 +730,20 @@ Juan Valdez was born\ldots. \def\copyrightnotice{\copyright~\@degreeyear~by \@author. All rights reserved.} % \end{macrocode} % \end{macro} +% \begin{macro}{\nocopyrightpage} +% The printing of the copyright page can also be turned off with the +% |\nocopyrightpage| command (must come before |\maketitle|): +% \begin{macrocode} +\newif\if@thesiscrpage \@thesiscrpagetrue +\let\nocopyrightpage\@thesiscrpagefalse +\if@thesisdraft\nocopyrightpage\fi +% \end{macrocode} +% \end{macro} % % Set the default title page elements. % \begin{macrocode} \phdthesis -\department{Physics} +\department{Computer Science} \college{Graduate College} \def\@schools{} \def\@degreeyear{\number\year} @@ -678,9 +757,9 @@ Juan Valdez was born\ldots. % \begin{macrocode} \renewcommand\maketitle{ % \end{macrocode} -% If this is not a draft version, print the copyright page. +% Print the copyright page if we're supposed to. % \begin{macrocode} - \if@thesisdraft\else + \if@thesiscrpage \newpage \thispagestyle{empty} \null\vfill @@ -821,15 +900,11 @@ Juan Valdez was born\ldots. % First we make sure that if a pagebreak should occur, it occurs % \emph{before} this entry. Also a little whitespace is added and a % group begun to keep changes local. -% \changes{v1.2i}{1994/04/28}{Don't print a toc line when the tocdepth -% counter is less then 0} -% \changes{v1.3b}{1955/05/23}{Added missing braces around argument -% to \cs{addpenalty}.} % \begin{macrocode} \renewcommand*\l@chapter[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% - \vskip 1.0em \@plus\p@ + \vskip 1.0em \@plus 0.2em \@minus 0.2em % \end{macrocode} % % The macro |\numberline| requires that the width of the box that @@ -864,11 +939,6 @@ Juan Valdez was born\ldots. % \end{macrocode} % \end{macro} % -% Create a flag that is set after the Table of Contents where every chapter (even -% the starred chapters) are put in the TOC. -% \begin{macrocode} -\newif\ifthesis@addtoc \thesis@addtocfalse -% \end{macrocode} % \begin{macro}{\tableofcontents} % We want the Table of Contents to be single-spaced, so % we save the original definition, and then arrange it so @@ -876,25 +946,23 @@ Juan Valdez was born\ldots. % the original definition. Then set the flag mentioned above. % \begin{macrocode} \let\thesis@tableofcontents=\tableofcontents -\def\tableofcontents{% - \@mkboth{\MakeUppercase{\contentsname}}{\MakeUppercase{\contentsname}}% - {\singlespacing\thesis@tableofcontents}% - \thesis@addtoctrue% -} +\def\tableofcontents{{\singlespacing\thesis@tableofcontents}} % \end{macrocode} % \end{macro} % % \begin{macro}{\listoftables} % \begin{macro}{\listoffigures} % Similarly, redefine |\listoftables| and |\listoffigures| so -% that they use single spacing. Why bother, you ask? -% Well, it {\em is} possible that some user might -% call |\listoffigures| without calling |\tableofcontents|. Right? +% that they use single spacing. % \begin{macrocode} \let\thesis@listoftables=\listoftables -\def\listoftables{{\singlespacing\thesis@listoftables}} +\def\listoftables{\newpage% + \addcontentsline{toc}{chapter}{\listtablename}% + {\singlespacing\thesis@listoftables}} \let\thesis@listoffigures=\listoffigures -\def\listoffigures{{\singlespacing\thesis@listoffigures}} +\def\listoffigures{\newpage% + \addcontentsline{toc}{chapter}{\listfigurename}% + {\singlespacing\thesis@listoffigures}} % \end{macrocode} % \end{macro} % \end{macro} @@ -919,6 +987,7 @@ Juan Valdez was born\ldots. % not specified. Then define the abstract environment to create the ProQuest abstract % and then end the document. % \begin{macrocode} +\def\abstractname{Abstract} \if@proquest \def\maketitle{} \def\@advisor{% @@ -946,7 +1015,7 @@ Juan Valdez was born\ldots. % the \env{abstract} environment to start a regular chapter. % \begin{macrocode} \else - \newenvironment{abstract}{\chapter*{Abstract}}{} + \newenvironment{abstract}{\chapter*{\abstractname}}{} \fi % \end{macrocode} % \end{environment} @@ -1029,7 +1098,9 @@ Juan Valdez was born\ldots. % |secnumdepth| is larger than $-1$ and, in the book % class, |\@mainmatter| is true, we display the chapter % number. We also inform the user that a new chapter is about to be -% typeset by writing a message to the terminal. +% typeset by writing a message to the terminal. This definition +% is the same as that in \pkg{book.cls} except that it makes different +% entries in the table of contents for fancy chapter heads. % \begin{macrocode} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth >\m@ne @@ -1072,29 +1143,12 @@ Juan Valdez was born\ldots. \fi} % \end{macrocode} % \end{macro} -% \begin{macro}{\@schapter} -% The macro |\@schapter| is called when |\chapter*{...}| is called. We need -% to modify it so that if the |thesis@addtoc| flag is set, an entry to the -% Table of Contents is made. -% \begin{macrocode} -\def\@schapter#1{\if@twocolumn - \@topnewpage[\@makeschapterhead{#1}]% - \else - \@makeschapterhead{#1}% - \@afterheading - \fi - \ifthesis@addtoc - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}} - \addcontentsline{toc}{chapter}{#1} - \fi} -% \end{macrocode} -% \end{macro} % % For fancy chapter headings, compute the correct height to use for the % chapter number. I want the chapter number to be centered on the first line % of the chapter title. If $a$ is the height of the chapter number and $b$ is % the height of the chapter title, then if we set the chapter number in a -% box of height $b + (a-b)/2=(a+b)/2$ then it aligns correctly. +% box of height $b+(a-b)/2=(a+b)/2$ then it aligns correctly. % % We arrange for this value to be computed at the beginning of the document % in case the user loads a style file that changed the default fonts. @@ -1157,11 +1211,14 @@ Juan Valdez was born\ldots. \vbox to \chaptertitleheight{ \def\baselinestretch{1}\@normalsize \parindent \z@ \raggedright \normalfont + \if@centerchapter + \centering + \fi \ifnum \c@secnumdepth >\m@ne \if@mainmatter \thesis@chapskip=\z@ \if@thesisfancy - \vspace*{10\p@} + \vspace*{10\p@}% \leavevmode\llap{\vbox to \chapternumberheight{\hbox{% \chapternumberfont\thechapter\,}\vss}}% \else @@ -1172,7 +1229,7 @@ Juan Valdez was born\ldots. \fi \fi \interlinepenalty\@M - \vspace*{\thesis@chapskip} + \vspace*{\thesis@chapskip}% \chaptertitlefont #1 \vfil }% @@ -1191,6 +1248,9 @@ Juan Valdez was born\ldots. \vbox to \chaptertitleheight{ \def\baselinestretch{1}\@normalsize \parindent \z@ \raggedright \normalfont + \if@centerchapter + \centering + \fi \interlinepenalty\@M \vspace*{\thesis@chapskip} \chaptertitlefont #1 @@ -1241,6 +1301,16 @@ Juan Valdez was born\ldots. % \end{macro} % \end{macro} % +% \subsection{Appendices} +% +% \begin{macro}{\appendix} +% Redefine the |\appendix| macro so that it can take a star +% if unlettered appendices are desired. +% \begin{macrocode} +\let\thesis@appendix\appendix +\renewcommand\appendix{\thesis@appendix\@ifstar{\gdef\thechapter{}}{}} +% \end{macrocode} +% \end{macro} % % \subsection{Bibliography} % @@ -1254,15 +1324,20 @@ Juan Valdez was born\ldots. % \end{macro} % % \begin{environment}{thebibliography} -% Note that due to the redefinition of the |\@schapter| command, the -% bibliography is inserted into the Table of Contents as is and no modification -% to the standard definition of \env{thebibliography} environment is really needed. -% However, for aesthetics it is nice to have it single-spaced. -% \begin{macrocode} -\let\thesis@thebib\thebibliography -\let\thesis@endbib\endthebibliography -\def\thebibliography{\begingroup\singlespacing\thesis@thebib} -\def\endthebibliography{\thesis@endbib\endgroup} +% The standard definition of \env{thebibliography} environment issues the |\chapter*| +% command, which does not make the necessary entry to the TOC. Here the environment +% is redefined so that the unstarred version is used instead. In addition, +% the environment is also single-spaced for aesthetics. These modifications are done +% at the beginning of the document since some packages (\pkg{natbib} in particular) +% change the definition of \env{thebibliography} environment. +% \begin{macrocode} +\AtBeginDocument{\let\thesis@thebib\thebibliography + \let\thesis@endbib\endthebibliography + \def\thebibliography{\begingroup\singlespacing% + \chapter{\bibname}% + \let\chapter\@gobbletwo% + \thesis@thebib} + \def\endthebibliography{\thesis@endbib\endgroup}} % \end{macrocode} % \end{environment} % @@ -1303,39 +1378,44 @@ Juan Valdez was born\ldots. % The |[fullpage]| option sets one-inch margins. % \begin{macrocode} \if@fullpage - \oddsidemargin 0pt - \marginparwidth 0.5in - \textwidth\paperwidth - \advance\textwidth by -2in + \setlength{\textwidth}{\paperwidth} + \addtolength{\textwidth}{-2in} + \@settopoint\textwidth \fi % \end{macrocode} % In the old version of \pkg{uiucthesis}, the ``fancy'' thesis style used -% an asymmetrical page layout, +% an asymmetric page layout, % shifting the text column slightly over to the right to leave % room for the chapter number to the left of the chapter title. This layout -% is still used if the |[offcenter]| option is given, otherwise symmetrical +% is still used if the |[offcenter]| option is given, otherwise symmetric % margins are used. % \begin{macrocode} -\if@thesisfancy - \if@thesisoffcenter - \advance\oddsidemargin by 36pt - \fi +\setlength{\@tempdima}{\paperwidth} +\addtolength{\@tempdima}{-\textwidth} +\setlength{\oddsidemargin}{.5\@tempdima} +\addtolength{\oddsidemargin}{-1in} +\if@thesisoffcenter + \addtolength{\oddsidemargin}{0.5in} + \reversemarginpar +\fi % \end{macrocode} -% Set |\marginparwidth|, leaving 36pt for the right margin. +% Set |\marginparwidth|, leaving 24pt for the right margin. % Note that you're not allowed to actually use a marginal paragraph % this close to the edge in the final version of a thesis, but it is still -% handy for leaving notes to yourself in the draft. +% handy for leaving notes to yourself in the draft (with the |\note| +% command, see below). % \begin{macrocode} - \marginparwidth=\oddsidemargin - \advance\marginparwidth by 1in - \advance\marginparwidth by -\marginparsep - \advance\marginparwidth by -36pt +\setlength{\marginparwidth}{\oddsidemargin} +\addtolength{\marginparwidth}{1in} +\addtolength{\marginparwidth}{-\marginparsep} +\addtolength{\marginparwidth}{-24pt} % \end{macrocode} -% Put the marginal paragraphs on the left side, where there's more room. +% Use the same margins for even and odd pages. Use the \LaTeX macro +% |\@settopoint| to truncate arithmetic errors. % \begin{macrocode} - \reversemarginpar -\fi -\let\evensidemargin=\oddsidemargin +\@settopoint\oddsidemargin +\@settopoint\marginparwidth +\setlength{\evensidemargin}{\oddsidemargin} % \end{macrocode} % % @@ -1347,7 +1427,7 @@ Juan Valdez was born\ldots. % then these notes are not printed. % \begin{macrocode} \if@thesisdraft - \newcommand{\note}[1]{\marginpar{\singlespacing\small\raggedright #1}} + \newcommand{\note}[1]{\marginpar{\def\baselinestretch{1}\small\raggedright #1}} \else \newcommand{\note}[1]{} \let\thesis@marginpar\marginpar @@ -1402,15 +1482,15 @@ Juan Valdez was born\ldots. \let\@mkboth\markboth \if@thesisdraft \def\chaptermark##1{% - \markright {\MakeUppercase{% + \markboth {\MakeUppercase{% \ifnum \c@secnumdepth >\m@ne \if@mainmatter \@chapapp\ \thechapter% \fi - \fi}}} + \fi}}{}} \else \def\chaptermark##1{% - \markright {\MakeUppercase{% + \def\@chaphead{\MakeUppercase{% \ifnum \c@secnumdepth >\m@ne \if@mainmatter \if@thesisfancy @@ -1420,7 +1500,8 @@ Juan Valdez was born\ldots. \fi \fi \fi - ##1}}} + ##1}}% + \markboth{\@chaphead}{\@chaphead}} \fi \def\sectionmark##1{% \markright {\MakeUppercase{% @@ -1476,6 +1557,7 @@ Juan Valdez was born\ldots. % even chapter openings should have page numbers in UIUC theses. % \begin{macrocode} \renewcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi + \@mkboth{}{} \thispagestyle{plain} \global\@topnum\z@ \@afterindentfalse -- cgit v1.2.3