diff options
author | Norbert Preining <preining@logic.at> | 2006-10-17 22:40:33 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2006-10-17 22:40:33 +0000 |
commit | 168c4abebd344cda13d71257a8f5882ddf75b461 (patch) | |
tree | 8a77f74ef5ce60f97952ee40ab54953f76140dbd /Master/texmf-dist/tex/latex/uiucthesis | |
parent | abf72be1c8d2ecea135ae14dcbdff593a8496321 (diff) |
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
Diffstat (limited to 'Master/texmf-dist/tex/latex/uiucthesis')
-rw-r--r-- | Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls | 109 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty | 109 |
2 files changed, 120 insertions, 98 deletions
diff --git a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls index 671ff9cf744..fef04c1a4e9 100644 --- a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls +++ b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.cls @@ -20,7 +20,7 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -\def\fileversion{v2.0} \def\filedate{2005/02/01} +\def\fileversion{v2.25} \def\filedate{2005/03/25} %% Package and Class "uiucthesis" for use with LaTeX2e. \NeedsTeXFormat{LaTeX2e} \ProvidesClass{uiucthesis} @@ -42,13 +42,15 @@ \newif\if@proquest \@proquestfalse \newif\if@edeposit \@edepositfalse \newif\if@thesisoffcenter \@thesisoffcenterfalse +\newif\if@centerchapter \@centerchapterfalse \DeclareOption{draftthesis}{\@thesisdrafttrue} \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} \DeclareOption{largecaps}{\@largecapstrue} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} \PassOptionsToClass{letterpaper,oneside}{book} @@ -68,7 +70,7 @@ \def\draftheader{\slshape Draft of \today\ at \ifnum\timehh<10 0\fi\number\timehh\,:\,\ifnum\timemm<10 0\fi\number\timemm}% \fi -\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}} @@ -105,13 +107,16 @@ {Use \protect\committee\space with members separated by \protect\\'s.}} \fi \def\copyrightnotice{\copyright~\@degreeyear~by \@author. All rights reserved.} +\newif\if@thesiscrpage \@thesiscrpagetrue +\let\nocopyrightpage\@thesiscrpagefalse +\if@thesisdraft\nocopyrightpage\fi \phdthesis -\department{Physics} +\department{Computer Science} \college{Graduate College} \def\@schools{} \def\@degreeyear{\number\year} \renewcommand\maketitle{ - \if@thesisdraft\else + \if@thesiscrpage \newpage \thispagestyle{empty} \null\vfill @@ -201,7 +206,7 @@ \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 \setlength\@tempdima{1.5em} \begingroup \leftskip \z@ \rightskip \@tocrmarg \parfillskip -\rightskip @@ -215,19 +220,19 @@ \penalty\@highpenalty \endgroup \fi} -\newif\ifthesis@addtoc \thesis@addtocfalse \let\thesis@tableofcontents=\tableofcontents -\def\tableofcontents{% - \@mkboth{\MakeUppercase{\contentsname}}{\MakeUppercase{\contentsname}}% - {\singlespacing\thesis@tableofcontents}% - \thesis@addtoctrue% -} +\def\tableofcontents{{\singlespacing\thesis@tableofcontents}} \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}} \newcommand*{\advisor}[1]{\gdef\@advisor{#1}} \newcommand*{\adviser}[1]{\gdef\@advisor{#1}} +\def\abstractname{Abstract} \if@proquest \def\maketitle{} \def\@advisor{% @@ -250,7 +255,7 @@ \aftergroup\endinput } \else - \newenvironment{abstract}{\chapter*{Abstract}}{} + \newenvironment{abstract}{\chapter*{\abstractname}}{} \fi \newenvironment{dedication}{ \newpage @@ -310,16 +315,6 @@ \@makechapterhead{#2}% \@afterheading \fi} -\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} \newskip\thesis@chapskip \AtBeginDocument{% \newdimen\chapternumberheight @@ -355,11 +350,14 @@ \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 @@ -370,7 +368,7 @@ \fi \fi \interlinepenalty\@M - \vspace*{\thesis@chapskip} + \vspace*{\thesis@chapskip}% \chaptertitlefont #1 \vfil }% @@ -380,6 +378,9 @@ \vbox to \chaptertitleheight{ \def\baselinestretch{1}\@normalsize \parindent \z@ \raggedright \normalfont + \if@centerchapter + \centering + \fi \interlinepenalty\@M \vspace*{\thesis@chapskip} \chaptertitlefont #1 @@ -402,11 +403,16 @@ {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% {\raggedright\normalfont\subsubsectiontitlefont}} +\let\thesis@appendix\appendix +\renewcommand\appendix{\thesis@appendix\@ifstar{\gdef\thechapter{}}{}} \renewcommand\bibname{References} -\let\thesis@thebib\thebibliography -\let\thesis@endbib\endthebibliography -\def\thebibliography{\begingroup\singlespacing\thesis@thebib} -\def\endthebibliography{\thesis@endbib\endgroup} +\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}} \let\thesis@theindex=\theindex \def\theindex{\addcontentsline{toc}{chapter}{\indexname}% \begingroup\singlespacing\thesis@theindex} @@ -417,24 +423,27 @@ \advance \topmargin by -\headsep \textheight 8.9in \if@fullpage - \oddsidemargin 0pt - \marginparwidth 0.5in - \textwidth\paperwidth - \advance\textwidth by -2in + \setlength{\textwidth}{\paperwidth} + \addtolength{\textwidth}{-2in} + \@settopoint\textwidth \fi -\if@thesisfancy - \if@thesisoffcenter - \advance\oddsidemargin by 36pt - \fi - \marginparwidth=\oddsidemargin - \advance\marginparwidth by 1in - \advance\marginparwidth by -\marginparsep - \advance\marginparwidth by -36pt +\setlength{\@tempdima}{\paperwidth} +\addtolength{\@tempdima}{-\textwidth} +\setlength{\oddsidemargin}{.5\@tempdima} +\addtolength{\oddsidemargin}{-1in} +\if@thesisoffcenter + \addtolength{\oddsidemargin}{0.5in} \reversemarginpar \fi -\let\evensidemargin=\oddsidemargin +\setlength{\marginparwidth}{\oddsidemargin} +\addtolength{\marginparwidth}{1in} +\addtolength{\marginparwidth}{-\marginparsep} +\addtolength{\marginparwidth}{-24pt} +\@settopoint\oddsidemargin +\@settopoint\marginparwidth +\setlength{\evensidemargin}{\oddsidemargin} \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 @@ -468,15 +477,15 @@ \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 @@ -486,7 +495,8 @@ \fi \fi \fi - ##1}}} + ##1}}% + \markboth{\@chaphead}{\@chaphead}} \fi \def\sectionmark##1{% \markright {\MakeUppercase{% @@ -531,6 +541,7 @@ \fi \pagestyle{plain} \renewcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi + \@mkboth{}{} \thispagestyle{plain} \global\@topnum\z@ \@afterindentfalse diff --git a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty index c06042716f5..08374b687bd 100644 --- a/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty +++ b/Master/texmf-dist/tex/latex/uiucthesis/uiucthesis.sty @@ -20,7 +20,7 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -\def\fileversion{v2.0} \def\filedate{2005/02/01} +\def\fileversion{v2.25} \def\filedate{2005/03/25} %% Package and Class "uiucthesis" for use with LaTeX2e. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{uiucthesis} @@ -42,13 +42,15 @@ \newif\if@proquest \@proquestfalse \newif\if@edeposit \@edepositfalse \newif\if@thesisoffcenter \@thesisoffcenterfalse +\newif\if@centerchapter \@centerchapterfalse \DeclareOption{draftthesis}{\@thesisdrafttrue} \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} \DeclareOption{largecaps}{\@largecapstrue} \ProcessOptions \if@proquest @@ -65,7 +67,7 @@ \def\draftheader{\slshape Draft of \today\ at \ifnum\timehh<10 0\fi\number\timehh\,:\,\ifnum\timemm<10 0\fi\number\timemm}% \fi -\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}} @@ -102,13 +104,16 @@ {Use \protect\committee\space with members separated by \protect\\'s.}} \fi \def\copyrightnotice{\copyright~\@degreeyear~by \@author. All rights reserved.} +\newif\if@thesiscrpage \@thesiscrpagetrue +\let\nocopyrightpage\@thesiscrpagefalse +\if@thesisdraft\nocopyrightpage\fi \phdthesis -\department{Physics} +\department{Computer Science} \college{Graduate College} \def\@schools{} \def\@degreeyear{\number\year} \renewcommand\maketitle{ - \if@thesisdraft\else + \if@thesiscrpage \newpage \thispagestyle{empty} \null\vfill @@ -198,7 +203,7 @@ \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 \setlength\@tempdima{1.5em} \begingroup \leftskip \z@ \rightskip \@tocrmarg \parfillskip -\rightskip @@ -212,19 +217,19 @@ \penalty\@highpenalty \endgroup \fi} -\newif\ifthesis@addtoc \thesis@addtocfalse \let\thesis@tableofcontents=\tableofcontents -\def\tableofcontents{% - \@mkboth{\MakeUppercase{\contentsname}}{\MakeUppercase{\contentsname}}% - {\singlespacing\thesis@tableofcontents}% - \thesis@addtoctrue% -} +\def\tableofcontents{{\singlespacing\thesis@tableofcontents}} \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}} \newcommand*{\advisor}[1]{\gdef\@advisor{#1}} \newcommand*{\adviser}[1]{\gdef\@advisor{#1}} +\def\abstractname{Abstract} \if@proquest \def\maketitle{} \def\@advisor{% @@ -247,7 +252,7 @@ \aftergroup\endinput } \else - \newenvironment{abstract}{\chapter*{Abstract}}{} + \newenvironment{abstract}{\chapter*{\abstractname}}{} \fi \newenvironment{dedication}{ \newpage @@ -307,16 +312,6 @@ \@makechapterhead{#2}% \@afterheading \fi} -\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} \newskip\thesis@chapskip \AtBeginDocument{% \newdimen\chapternumberheight @@ -352,11 +347,14 @@ \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 @@ -367,7 +365,7 @@ \fi \fi \interlinepenalty\@M - \vspace*{\thesis@chapskip} + \vspace*{\thesis@chapskip}% \chaptertitlefont #1 \vfil }% @@ -377,6 +375,9 @@ \vbox to \chaptertitleheight{ \def\baselinestretch{1}\@normalsize \parindent \z@ \raggedright \normalfont + \if@centerchapter + \centering + \fi \interlinepenalty\@M \vspace*{\thesis@chapskip} \chaptertitlefont #1 @@ -399,11 +400,16 @@ {-3.25ex\@plus -1ex \@minus -.2ex}% {1.5ex \@plus .2ex}% {\raggedright\normalfont\subsubsectiontitlefont}} +\let\thesis@appendix\appendix +\renewcommand\appendix{\thesis@appendix\@ifstar{\gdef\thechapter{}}{}} \renewcommand\bibname{References} -\let\thesis@thebib\thebibliography -\let\thesis@endbib\endthebibliography -\def\thebibliography{\begingroup\singlespacing\thesis@thebib} -\def\endthebibliography{\thesis@endbib\endgroup} +\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}} \let\thesis@theindex=\theindex \def\theindex{\addcontentsline{toc}{chapter}{\indexname}% \begingroup\singlespacing\thesis@theindex} @@ -414,24 +420,27 @@ \advance \topmargin by -\headsep \textheight 8.9in \if@fullpage - \oddsidemargin 0pt - \marginparwidth 0.5in - \textwidth\paperwidth - \advance\textwidth by -2in + \setlength{\textwidth}{\paperwidth} + \addtolength{\textwidth}{-2in} + \@settopoint\textwidth \fi -\if@thesisfancy - \if@thesisoffcenter - \advance\oddsidemargin by 36pt - \fi - \marginparwidth=\oddsidemargin - \advance\marginparwidth by 1in - \advance\marginparwidth by -\marginparsep - \advance\marginparwidth by -36pt +\setlength{\@tempdima}{\paperwidth} +\addtolength{\@tempdima}{-\textwidth} +\setlength{\oddsidemargin}{.5\@tempdima} +\addtolength{\oddsidemargin}{-1in} +\if@thesisoffcenter + \addtolength{\oddsidemargin}{0.5in} \reversemarginpar \fi -\let\evensidemargin=\oddsidemargin +\setlength{\marginparwidth}{\oddsidemargin} +\addtolength{\marginparwidth}{1in} +\addtolength{\marginparwidth}{-\marginparsep} +\addtolength{\marginparwidth}{-24pt} +\@settopoint\oddsidemargin +\@settopoint\marginparwidth +\setlength{\evensidemargin}{\oddsidemargin} \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 @@ -465,15 +474,15 @@ \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 @@ -483,7 +492,8 @@ \fi \fi \fi - ##1}}} + ##1}}% + \markboth{\@chaphead}{\@chaphead}} \fi \def\sectionmark##1{% \markright {\MakeUppercase{% @@ -528,6 +538,7 @@ \fi \pagestyle{plain} \renewcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi + \@mkboth{}{} \thispagestyle{plain} \global\@topnum\z@ \@afterindentfalse |