diff --git a/.vscode/settings.json b/.vscode/settings.json index 26c1636..0c6211f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -38,7 +38,6 @@ "name": "makeglossaries", "command": "makeglossaries", "args": [ - "--shell-escape", "%DOCFILE%" ], "env": {} diff --git a/README.md b/README.md index 16a4a95..7ed6835 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ One catch is that to see the acronyms the `makeglossaries` command needs to be i "name": "makeglossaries", "command": "makeglossaries", "args": [ - "--shell-escape", "%DOCFILE%" ], "env": {} diff --git a/listings-modelica.cfg.tex b/listings-modelica.cfg.tex index aa160e8..e02aa58 100644 --- a/listings-modelica.cfg.tex +++ b/listings-modelica.cfg.tex @@ -19,24 +19,24 @@ \lstdefinelanguage{modelica} { - morekeywords=[1]{ - algorithm,and,annotation,as,assert,block,break,case,class,connect,connector, - constant,constrainedby,der,discrete,each,else,elseif,elsewhen,encapsulated, - end,enumeration,equality,equation,expandable,extends,external,failure,final, - flow,for,function,guard,if,import,in,initial,inner,input,List,local,loop, - match,matchcontinue,model,not,operator,Option,or,outer,output,package,parameter, - partial,protected,public,record,redeclare,replaceable,return,stream, - subtypeof,then,Tuple,type,uniontype,when,while}, - morekeywords=[2]{true, false}, - % Do not make true,false keywords because fn(true,x, false ) shows up as fn(true,x, *false*) - morekeywords=[3]{optimization,constraint}, % Optimica keywords - morekeywords=[4]{objective,startTime,finalTime,initialGuess}, - sensitive=true, - comment=[l]//, - morecomment=[s]{/*}{*/}, - alsodigit={.,-}, - morestring=[b]', - morestring=[b]", + morekeywords=[1]{ + algorithm,and,annotation,as,assert,block,break,case,class,connect,connector, + constant,constrainedby,der,discrete,each,else,elseif,elsewhen,encapsulated, + end,enumeration,equality,equation,expandable,extends,external,failure,final, + flow,for,function,guard,if,import,in,initial,inner,input,List,local,loop, + match,matchcontinue,model,not,operator,Option,or,outer,output,package,parameter, + partial,protected,public,record,redeclare,replaceable,return,stream, + subtypeof,then,Tuple,type,uniontype,when,while}, + morekeywords=[2]{true, false}, + % Do not make true,false keywords because fn(true,x, false ) shows up as fn(true,x, *false*) + morekeywords=[3]{optimization,constraint}, % Optimica keywords + morekeywords=[4]{objective,startTime,finalTime,initialGuess}, + sensitive=true, + comment=[l]//, + morecomment=[s]{/*}{*/}, + alsodigit={.,-}, + morestring=[b]', + morestring=[b]", }[keywords,comments,strings] \definecolor{keywordcolor1}{rgb}{0,0,.4} @@ -47,19 +47,19 @@ % \definecolor{listingbgcolor}{rgb}{0.95,0.95,0.95} \lstset{ - breaklines=true, - language=modelica, - basicstyle=\ttfamily, - keywordstyle=[1]\color{keywordcolor1}\bfseries, - keywordstyle=[2]\color{keywordcolor2}, - keywordstyle=[3]\color{keywordcolor3}\bfseries, - keywordstyle=[4]\color{keywordcolor4}, - stringstyle=\color{stringcolor}, - % backgroundcolor=\color{listingbgcolor}, - framexleftmargin=5pt, - xleftmargin=5pt, - xrightmargin=5pt, - showstringspaces=false + breaklines=true, + language=modelica, + basicstyle=\ttfamily, + keywordstyle=[1]\color{keywordcolor1}\bfseries, + keywordstyle=[2]\color{keywordcolor2}, + keywordstyle=[3]\color{keywordcolor3}\bfseries, + keywordstyle=[4]\color{keywordcolor4}, + stringstyle=\color{stringcolor}, + % backgroundcolor=\color{listingbgcolor}, + framexleftmargin=5pt, + xleftmargin=5pt, + xrightmargin=5pt, + showstringspaces=false } \newcommand{\code}[1]{\lstinline|#1|} diff --git a/main-cu-phd-thesis.pdf b/main-cu-phd-thesis.pdf index 159b869..4f36933 100644 Binary files a/main-cu-phd-thesis.pdf and b/main-cu-phd-thesis.pdf differ diff --git a/main-cu-phd-thesis.tex b/main-cu-phd-thesis.tex index 0c2fadf..f866a30 100644 --- a/main-cu-phd-thesis.tex +++ b/main-cu-phd-thesis.tex @@ -25,7 +25,7 @@ \usepackage{subfiles} \usepackage{subcaption} \usepackage[export]{adjustbox} % allow margin definition in tables (center images) -\usepackage[acronym,toc,nomain]{glossaries} +\usepackage[acronym,nomain]{glossaries} \loadglsentries{acronyms} \makeglossaries % for acronyms \renewcommand*{\glspostdescription}{} % Removes dots at the end of each entry. diff --git a/main-cu-prospectus.pdf b/main-cu-prospectus.pdf index e5fcd2c..d7757d8 100644 Binary files a/main-cu-prospectus.pdf and b/main-cu-prospectus.pdf differ diff --git a/main-cu-prospectus.tex b/main-cu-prospectus.tex index 83c18e6..1808e86 100644 --- a/main-cu-prospectus.tex +++ b/main-cu-prospectus.tex @@ -18,14 +18,14 @@ colorlinks = true, %Colours links instead of ugly boxes urlcolor = blue, %Colour for external hyperlinks linkcolor = blue, %Colour of internal links - citecolor = blue %Colour of citations + citecolor = blue %Colour of citations } % custom added \usepackage{subfiles} \usepackage{subcaption} \usepackage[export]{adjustbox} % allow margin definition in tables (center images) -\usepackage[acronym,toc,nomain]{glossaries} +\usepackage[acronym,nomain]{glossaries} \loadglsentries{acronyms} \makeglossaries % for acronyms \renewcommand*{\glspostdescription}{} % Removes dots at the end of each entry. diff --git a/prospectus.cls b/prospectus.cls index 25dfcc8..a6441af 100644 --- a/prospectus.cls +++ b/prospectus.cls @@ -72,31 +72,31 @@ % Invalid options - normally used in report.cls and others, but not here: \DeclareOption{titlepage} - {\ClassWarning{thesis}{Title page always generated. Option ignored.}} +{\ClassWarning{thesis}{Title page always generated. Option ignored.}} \DeclareOption{notitlepage} - {\ClassWarning{thesis}{Option 'notitlepage' not available for thesis.}} +{\ClassWarning{thesis}{Option 'notitlepage' not available for thesis.}} \DeclareOption{twoside} - {\ClassWarning{thesis}{Option 'twoside' not available for thesis.}} +{\ClassWarning{thesis}{Option 'twoside' not available for thesis.}} \DeclareOption{twocolumn} - {\ClassWarning{thesis}{Option 'twocolumn' not available for thesis.}} +{\ClassWarning{thesis}{Option 'twocolumn' not available for thesis.}} \DeclareOption{landscape} - {\ClassWarning{thesis}{Option 'landscape' not available for thesis.}} +{\ClassWarning{thesis}{Option 'landscape' not available for thesis.}} \DeclareOption{legalpaper} - {\ClassWarning{thesis}{Option 'legalpaper' not available for thesis.}} +{\ClassWarning{thesis}{Option 'legalpaper' not available for thesis.}} \DeclareOption{a4paper} - {\ClassWarning{thesis}{Option 'a4paper' not available for this class.}} +{\ClassWarning{thesis}{Option 'a4paper' not available for this class.}} \DeclareOption{a5paper} - {\ClassWarning{thesis}{Option 'a5paper' not available for this class.}} +{\ClassWarning{thesis}{Option 'a5paper' not available for this class.}} \DeclareOption{executivepaper} - {\ClassWarning{thesis}{Option 'executivepaper' not available.}} +{\ClassWarning{thesis}{Option 'executivepaper' not available.}} \DeclareOption{b5paper} - {\ClassWarning{thesis}{Option 'b5paper' not available for this class.}} +{\ClassWarning{thesis}{Option 'b5paper' not available for this class.}} \DeclareOption{letterpaper} - {\ClassWarning{thesis}{Option 'letterpaper' superfluous. Ignored.}} +{\ClassWarning{thesis}{Option 'letterpaper' superfluous. Ignored.}} \DeclareOption{onecolumn} - {\ClassWarning{thesis}{Option 'onecolumn' superfluous. Ignored.}} +{\ClassWarning{thesis}{Option 'onecolumn' superfluous. Ignored.}} \DeclareOption{oneside} - {\ClassWarning{thesis}{Option 'oneside' superfluous. Ignored.}} +{\ClassWarning{thesis}{Option 'oneside' superfluous. Ignored.}} %%%%%%%%%%% CUSTOM OPTIONS: % Options for no decimal numbering, or decimal number nested over 3 deep: @@ -139,28 +139,28 @@ \DeclareOption{fixedheadsize}{ \@fixedHeadSztrue } \DeclareOption{varheadsize}{\@headSizeTwelvePtfalse}% Hidden option. Don't use. \DeclareOption{numberchapteronly}{ - \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse - \@centerChaptertrue\@centerSectiontrue - \@inlineSubSubSectiontrue\@numberSubSubSectionfalse } + \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse + \@centerChaptertrue\@centerSectiontrue + \@inlineSubSubSectiontrue\@numberSubSubSectionfalse } \DeclareOption{allheadings}{ - \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingstrue - \@centerChaptertrue\@centerSectionfalse - \@inlineSubSubSectionfalse\@numberSubSubSectiontrue} + \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingstrue + \@centerChaptertrue\@centerSectionfalse + \@inlineSubSubSectionfalse\@numberSubSubSectiontrue} \DeclareOption{typewriterstyle}{ \@emphisboldfalse - \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse - \@centerChaptertrue\@centerSectiontrue\@chapterCapstrue - \@inlineSubSubSectiontrue\@numberSubSubSectionfalse - \@boldheadfalse\@fixedHeadSztrue} + \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse + \@centerChaptertrue\@centerSectiontrue\@chapterCapstrue + \@inlineSubSubSectiontrue\@numberSubSubSectionfalse + \@boldheadfalse\@fixedHeadSztrue} \DeclareOption{modernstyle}{ \@emphisboldtrue - \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse - \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse - \@inlineSubSubSectiontrue\@numberSubSubSectionfalse - \@boldheadtrue\@fixedHeadSzfalse} + \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse + \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse + \@inlineSubSubSectiontrue\@numberSubSubSectionfalse + \@boldheadtrue\@fixedHeadSzfalse} \DeclareOption{defaultstyle}{ \@emphisboldtrue - \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse - \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse - \@inlineSubSubSectionfalse\@numberSubSubSectiontrue - \@boldheadtrue\@fixedHeadSzfalse} + \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse + \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse + \@inlineSubSubSectionfalse\@numberSubSubSectiontrue + \@boldheadtrue\@fixedHeadSzfalse} % Now we load the report class with certain options by default. It % will process any other options specified. Then, we process the @@ -188,29 +188,29 @@ % commands. \newcommand{\th@ExecChkOptArg}[3]{ -\ifthenelse{\equal{\th@DefArg}{#2}}{ - #1{#3} - }{ - #1[#2]{#3}} + \ifthenelse{\equal{\th@DefArg}{#2}}{ + #1{#3} + }{ + #1[#2]{#3}} } % Controls the heading styles. You can change the size to suit your needs. \if@fixedHeadSz - \newcommand*{\th@ChSz}{\normalsize} - \newcommand*{\th@ScSz}{\normalsize} + \newcommand*{\th@ChSz}{\normalsize} + \newcommand*{\th@ScSz}{\normalsize} \else\if@headSizeTwelvePt - \newcommand*{\th@ChSz}{\normalsize\fontsize{12}{12}\selectfont} - \newcommand*{\th@ScSz}{\normalsize\fontsize{12}{12}\selectfont} -\else - \newcommand*{\th@ChSz}{\normalsize\Large} - \newcommand*{\th@ScSz}{\normalsize\large} -\fi\fi + \newcommand*{\th@ChSz}{\normalsize\fontsize{12}{12}\selectfont} + \newcommand*{\th@ScSz}{\normalsize\fontsize{12}{12}\selectfont} + \else + \newcommand*{\th@ChSz}{\normalsize\Large} + \newcommand*{\th@ScSz}{\normalsize\large} + \fi\fi \if@boldhead - \newcommand*{\th@HdFnt}{\normalfont\bfseries} + \newcommand*{\th@HdFnt}{\normalfont\bfseries} \else - \newcommand*{\th@HdFnt}{\normalfont} + \newcommand*{\th@HdFnt}{\normalfont} \fi % The style commands proper. Controlled by a flag. @@ -226,12 +226,12 @@ % depending on the startup flags. \newcommand*{\EmphReset}{ - \if@emphisbold - \let\em\bfseries - \let\emph\textbf - \else - \ULforem - \fi + \if@emphisbold + \let\em\bfseries + \let\emph\textbf + \else + \ULforem + \fi } % Makes the chapter heading label, putting it in the desired style. @@ -240,14 +240,14 @@ \newcommand*{\th@DoChapCenter}{\if@centerChapter\centering\fi} \newcommand*{\th@ChapHead}[1]{ - \protect\th@ChapterStyle - \protect\th@DoChapCenter #1} + \protect\th@ChapterStyle + \protect\th@DoChapCenter #1} %%%%%%% DEFINE DOUBLE-SPACING (THE DEFAULT) AND OTHER SPACING: \def\setspace@size{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi} \def\doublespacing{ \ifcase \@ptsize \relax - \def \baselinestretch {2.004}% 10pt + \def \baselinestretch {2.004}% 10pt \or \def \baselinestretch {1.771}% 11pt \or \def \baselinestretch {1.660}% 12pt \fi \setspace@size} @@ -258,12 +258,12 @@ \baselineskip \baselinestretch\baselineskip \parskip \baselinestretch\parskip \setbox\strutbox \hbox{ \vrule height.7\baselineskip depth.3\baselineskip - width\z@} \skip\footins \baselinestretch\skip\footins + width\z@} \skip\footins \baselinestretch\skip\footins \normalbaselineskip\baselineskip#3#4} %%%%%%%%% floats & footnotes singlespaced %%%%%%%%% \let\latexx@xfloat=\@xfloat \def\@xfloat #1[#2]{\latexx@xfloat #1[#2] -\def\baselinestretch{1}\@normalsize \normalsize} + \def\baselinestretch{1}\@normalsize \normalsize} \long\def\@footnotetext#1{ \insert\footins{ \def\baselinestretch {1} @@ -275,7 +275,7 @@ \protected@edef\@currentlabel{ \csname p@footnote\endcsname\@thefnmark} \color@begingroup \@makefntext{ - \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} \color@endgroup}} \long\def\@mpfootnotetext#1{ \global\setbox\@mpfootins\vbox{ @@ -286,8 +286,8 @@ \protected@edef\@currentlabel{ \csname p@mpfootnote\endcsname\@thefnmark} \color@begingroup \@makefntext{ - \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} - \color@endgroup}} + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} + \color@endgroup}} %%%%%%%% single / double spacing %%%%%%%%% \def\singlespace{ \vskip \baselineskip \def\baselinestretch {1} \setspace@size \vskip -\baselineskip } @@ -296,7 +296,7 @@ \def\endspacing{ \par \vskip \parskip \vskip \baselineskip \endgroup \vskip -\parskip \vskip -\baselineskip } \def\doublespace{ \ifcase \@ptsize \relax - \spacing{2.004}% 10pt + \spacing{2.004}% 10pt \or \spacing{1.771}% 11pt \or \spacing{1.660}% 12pt \fi } @@ -308,50 +308,50 @@ % margins... Initialize several global document properties, but do so % *before* the beginning of the document to forces these changes. \AtBeginDocument{ - \setlength{\topmargin}{-0.30in} - \setlength{\headheight}{0.20in} - \setlength{\headsep}{0.0in} - \setlength{\topskip}{0.40in} % first line, down from page number - \setlength{\textheight}{9.10in} % 9"-(topmargin+headsep+headheight) - \setlength{\footskip}{0pt} - \setlength{\oddsidemargin}{0.00in} - \setlength{\evensidemargin}{0.00in} - \setlength{\parindent}{0.40in} % somewhere between 0.3" and 0.5" - \setlength{\textwidth}{6.50in} - \setlength{\leftmargini}{3.5em} - \setlength{\leftmarginii}{2.2em} - \setlength{\leftmarginiii}{2.2em} - \setlength{\leftmarginiv}{2.2em} - \setlength{\leftmarginv}{2.2em} - \setlength{\leftmarginvi}{2.2em} - \setlength{\leftmargin}{\leftmargini} - \setlength{\labelsep}{.5em} - \setlength{\labelwidth}{ 1.5em} - \pagenumbering{arabic} - \pagestyle{myheadings} - \markright{} - \onecolumn - \raggedbottom - \normalsize - \normalfont - \EmphReset % bold or underlined? - \doublespacing % footnotes and floats still singlespaced - \setcounter{tocdepth}{2} - \setcounter{secnumdepth}{\value{th@SecNum}} -% Redefine the bibliography command here, just in case someone -% uses a custom *.sty file that redefines bibliography command - \let\th@OldBib\thebibliography - \let\endth@OldBib\endthebibliography - \renewenvironment*{thebibliography}[1]{ - \begin{th@OldBib}{#1} - \ULforem% set \em to underline - \begin{singlespace} - \addcontentsline{toc}{part}{\bibnameToC} - }{ - \end{singlespace} - \EmphReset% set \em back to the user-specified default. - \end{th@OldBib} - } + \setlength{\topmargin}{-0.30in} + \setlength{\headheight}{0.20in} + \setlength{\headsep}{0.0in} + \setlength{\topskip}{0.40in} % first line, down from page number + \setlength{\textheight}{9.10in} % 9"-(topmargin+headsep+headheight) + \setlength{\footskip}{0pt} + \setlength{\oddsidemargin}{0.00in} + \setlength{\evensidemargin}{0.00in} + \setlength{\parindent}{0.40in} % somewhere between 0.3" and 0.5" + \setlength{\textwidth}{6.50in} + \setlength{\leftmargini}{3.5em} + \setlength{\leftmarginii}{2.2em} + \setlength{\leftmarginiii}{2.2em} + \setlength{\leftmarginiv}{2.2em} + \setlength{\leftmarginv}{2.2em} + \setlength{\leftmarginvi}{2.2em} + \setlength{\leftmargin}{\leftmargini} + \setlength{\labelsep}{.5em} + \setlength{\labelwidth}{ 1.5em} + \pagenumbering{arabic} + \pagestyle{myheadings} + \markright{} + \onecolumn + \raggedbottom + \normalsize + \normalfont + \EmphReset % bold or underlined? + \doublespacing % footnotes and floats still singlespaced + \setcounter{tocdepth}{2} + \setcounter{secnumdepth}{\value{th@SecNum}} + % Redefine the bibliography command here, just in case someone + % uses a custom *.sty file that redefines bibliography command + \let\th@OldBib\thebibliography + \let\endth@OldBib\endthebibliography + \renewenvironment*{thebibliography}[1]{ + \begin{th@OldBib}{#1} + \ULforem% set \em to underline + \begin{singlespace} + \addcontentsline{toc}{part}{\bibnameToC} + }{ + \end{singlespace} + \EmphReset% set \em back to the user-specified default. + \end{th@OldBib} + } } %%%%%%%%%%% ADDITIONAL STUFF: @@ -381,41 +381,41 @@ \newcommand*{\tablenameToC}{\normalsize\th@HdFnt\tablename\normalfont} \if@chapterCaps - \renewcommand*{\contentsname}{\th@ChapHead{CONTENTS}} - \renewcommand*{\listfigurename}{\th@ChapHead{FIGURES}} - \renewcommand*{\listtablename}{\th@ChapHead{TABLES}} - \renewcommand*{\appendixname}{\th@ChapHead{APPENDIX}} - \renewcommand*{\bibname}{\th@ChapHead{BIBLIOGRAPHY}} - \renewcommand*{\chaptername}{\th@ChapHead{CHAPTER}} - \newcommand*{\chapternameToC}{ - \normalsize\th@HdFnt CHAPTER\normalfont} - \newcommand*{\bibnameToC}{ - \normalsize\th@HdFnt BIBLIOGRAPHY\normalfont} - \newcommand*{\appendixnameToC}{ - \normalsize\th@HdFnt APPENDIX\normalfont} + \renewcommand*{\contentsname}{\th@ChapHead{CONTENTS}} + \renewcommand*{\listfigurename}{\th@ChapHead{FIGURES}} + \renewcommand*{\listtablename}{\th@ChapHead{TABLES}} + \renewcommand*{\appendixname}{\th@ChapHead{APPENDIX}} + \renewcommand*{\bibname}{\th@ChapHead{BIBLIOGRAPHY}} + \renewcommand*{\chaptername}{\th@ChapHead{CHAPTER}} + \newcommand*{\chapternameToC}{ + \normalsize\th@HdFnt CHAPTER\normalfont} + \newcommand*{\bibnameToC}{ + \normalsize\th@HdFnt BIBLIOGRAPHY\normalfont} + \newcommand*{\appendixnameToC}{ + \normalsize\th@HdFnt APPENDIX\normalfont} \else - \renewcommand*{\contentsname}{\th@ChapHead{Contents}} - \renewcommand*{\listfigurename}{\th@ChapHead{Figures}} - \renewcommand*{\listtablename}{\th@ChapHead{Tables}} - \renewcommand*{\appendixname}{\th@ChapHead{Appendix}} - \renewcommand*{\bibname}{\th@ChapHead{Bibliography}} - \renewcommand*{\chaptername}{\th@ChapHead{Chapter}} - \newcommand*{\chapternameToC}{ - \normalsize\th@HdFnt Chapter\normalfont} - \newcommand*{\bibnameToC}{ - \normalsize\th@HdFnt Bibliography\normalfont} - \newcommand*{\appendixnameToC}{ - \normalsize\th@HdFnt Appendix\normalfont} + \renewcommand*{\contentsname}{\th@ChapHead{Contents}} + \renewcommand*{\listfigurename}{\th@ChapHead{Figures}} + \renewcommand*{\listtablename}{\th@ChapHead{Tables}} + \renewcommand*{\appendixname}{\th@ChapHead{Appendix}} + \renewcommand*{\bibname}{\th@ChapHead{Bibliography}} + \renewcommand*{\chaptername}{\th@ChapHead{Chapter}} + \newcommand*{\chapternameToC}{ + \normalsize\th@HdFnt Chapter\normalfont} + \newcommand*{\bibnameToC}{ + \normalsize\th@HdFnt Bibliography\normalfont} + \newcommand*{\appendixnameToC}{ + \normalsize\th@HdFnt Appendix\normalfont} \fi % Adds the appropriate label to the ToC/LoF/LoT \addtocontents{lof}{\protect\contentsline {part} - {\protect\figurenameToC}{\protect\relax}{}} + {\protect\figurenameToC}{\protect\relax}{}} \addtocontents{lot}{\protect\contentsline {part} - {\protect\tablenameToC}{\protect\relax}{}} + {\protect\tablenameToC}{\protect\relax}{}} \addtocontents{toc}{\protect\contentsline {part} - {\protect\chapternameToC}{\protect\relax}{}} + {\protect\chapternameToC}{\protect\relax}{}} % NUMBERING STYLES, DEFAULT VALUES @@ -425,35 +425,35 @@ \newcounter{th@SecNum} \setcounter{th@SecNum}{3} \if@NumberStdHeadings - \@centerSectionfalse% Force this. - \newcommand*{\th@DefTheChapter}{\arabic{chapter}} - \newcommand*{\th@DefTheSection}{\th@DefTheChapter.\arabic{section}} - \newcommand*{\th@DefTheSubsection}{\th@DefTheSection.\arabic{subsection}} + \@centerSectionfalse% Force this. + \newcommand*{\th@DefTheChapter}{\arabic{chapter}} + \newcommand*{\th@DefTheSection}{\th@DefTheChapter.\arabic{section}} + \newcommand*{\th@DefTheSubsection}{\th@DefTheSection.\arabic{subsection}} \else - \@AllHeadingsfalse% Just to be safe... - \newcommand*{\th@DefTheChapter}{\Roman{chapter}} - \newcommand*{\th@DefTheSection}{\relax} - \newcommand*{\th@DefTheSubsection}{\relax} + \@AllHeadingsfalse% Just to be safe... + \newcommand*{\th@DefTheChapter}{\Roman{chapter}} + \newcommand*{\th@DefTheSection}{\relax} + \newcommand*{\th@DefTheSubsection}{\relax} \fi \if@AllHeadings - \@inlineSubSubSectionfalse% Force this... - \@numberSubSubSectiontrue% ...and this. - \newcommand*{\th@DefTheSubsubsection} - {\th@DefTheSubsection.\arabic{subsubsection}} - \newcommand*{\th@DefTheParagraph} - {\th@DefTheSubsubsection.\arabic{paragraph}} - \newcommand*{\th@DefTheSubparagraph} - {\th@DefTheParagraph.\arabic{subparagraph}} + \@inlineSubSubSectionfalse% Force this... + \@numberSubSubSectiontrue% ...and this. + \newcommand*{\th@DefTheSubsubsection} + {\th@DefTheSubsection.\arabic{subsubsection}} + \newcommand*{\th@DefTheParagraph} + {\th@DefTheSubsubsection.\arabic{paragraph}} + \newcommand*{\th@DefTheSubparagraph} + {\th@DefTheParagraph.\arabic{subparagraph}} \else - \newcommand*{\th@DefTheParagraph}{\relax} - \newcommand*{\th@DefTheSubparagraph}{\relax} - \if@numberSubSubSection - \newcommand*{\th@DefTheSubsubsection} - {\th@DefTheSubsection.\arabic{subsubsection}} - \else - \newcommand*{\th@DefTheSubsubsection}{\relax} - \fi + \newcommand*{\th@DefTheParagraph}{\relax} + \newcommand*{\th@DefTheSubparagraph}{\relax} + \if@numberSubSubSection + \newcommand*{\th@DefTheSubsubsection} + {\th@DefTheSubsection.\arabic{subsubsection}} + \else + \newcommand*{\th@DefTheSubsubsection}{\relax} + \fi \fi \renewcommand*{\thechapter}{\th@DefTheChapter} \renewcommand*{\thesection}{\th@DefTheSection} @@ -464,12 +464,12 @@ % Figure, Table, and Equation numbering. \if@PerChptrNumbering\else - \newcounter{th@SaveFigure} - \newcounter{th@SaveTable} - \newcounter{th@SaveEquation} - \renewcommand*{\thefigure}{\arabic{figure}} - \renewcommand*{\thetable}{\arabic{table}} - \renewcommand*{\theequation}{\arabic{equation}} + \newcounter{th@SaveFigure} + \newcounter{th@SaveTable} + \newcounter{th@SaveEquation} + \renewcommand*{\thefigure}{\arabic{figure}} + \renewcommand*{\thetable}{\arabic{table}} + \renewcommand*{\theequation}{\arabic{equation}} \fi % Enumerated List labels @@ -515,13 +515,13 @@ % are defined in setspace.sty. \renewenvironment*{verse}{\begin{th@OldVerse}\begin{singlespace}} - {\end{singlespace}\end{th@OldVerse}} + {\end{singlespace}\end{th@OldVerse}} \renewenvironment*{quotation}{\begin{th@OldQuotation} \begin{singlespace}} - {\end{singlespace}\end{th@OldQuotation}} + {\end{singlespace}\end{th@OldQuotation}} \renewenvironment*{quote}{\begin{th@OldQuote} \begin{singlespace}} - {\end{singlespace} \end{th@OldQuote}} + {\end{singlespace} \end{th@OldQuote}} % Theorems and Axioms: They must NOT be italicized. To do this % robustly, I've needed to use some in-depth TeXnology. Check out a @@ -533,46 +533,46 @@ } % Calling format: \newtheorem{}{}[]; checks for the optional arg at the end. \def\th@newtheoremTwo#1#2{ - \@ifnextchar[{\th@nuthrmO{#1}{#2}}{\th@nuthrm{#1}{#2}}%] + \@ifnextchar[{\th@nuthrmO{#1}{#2}}{\th@nuthrm{#1}{#2}}%] } % Standard call. No optional args. \def\th@nuthrm#1#2{ - \th@OldNewtheorem{th@#1}{#2} - \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} + \th@OldNewtheorem{th@#1}{#2} + \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} } % Optional arg at end. \def\th@nuthrmO#1#2[#3]{ - \th@OldNewtheorem{th@#1}{#2}[#3] - \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} - } + \th@OldNewtheorem{th@#1}{#2}[#3] + \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} +} % Optional arg in the middle. \def\th@nuthrmOM#1[#2]#3{ - \th@OldNewtheorem{th@#1}[th@#2]{#3} - \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} - } + \th@OldNewtheorem{th@#1}[th@#2]{#3} + \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} +} \def\th@execThrmOpt#1[#2]{ - \@nameuse{#1}[#2] \normalsize\normalfont + \@nameuse{#1}[#2] \normalsize\normalfont } \newcommand*{\th@correctTheorem}[4]{ - \@namedef{#1}{\@nameuse{#3}} - \@namedef{#2}{\@ifnextchar[{\th@execThrmOpt{#4}}{ %%} - \@nameuse{#4} \normalsize\normalfont} - } + \@namedef{#1}{\@nameuse{#3}} + \@namedef{#2}{\@ifnextchar[{\th@execThrmOpt{#4}}{ %%} + \@nameuse{#4} \normalsize\normalfont} + } } % APPENDIX command \newcounter{th@SectionSave} \let\th@OldAppCmd\appendix \renewcommand{\appendix}{ - \setcounter{th@SectionSave}{\value{section}} - \th@OldAppCmd - \if@NumberStdHeadings\else - \setcounter{section}{\value{th@SectionSave}} - \fi - \addtocontents{toc}{\protect\contentsline {part} - {\protect\appendixnameToC}{\protect\relax}{}} - \renewcommand*{\th@DefTheChapter}{\Alph{chapter}} - } + \setcounter{th@SectionSave}{\value{section}} + \th@OldAppCmd + \if@NumberStdHeadings\else + \setcounter{section}{\value{th@SectionSave}} + \fi + \addtocontents{toc}{\protect\contentsline {part} + {\protect\appendixnameToC}{\protect\relax}{}} + \renewcommand*{\th@DefTheChapter}{\Alph{chapter}} +} %%%%%%%%%%%%%%% BIBLIOGRAPHY: Used to be redefined here. % Moved to permit use of different bibliography .sty and .bst files. @@ -594,11 +594,11 @@ % The second arg is the style command. % The third arg is the heading proper. \newcommand*{\th@MakeHeading}[2]{ - \protect #1 - \if@CenterHeading\begin{center}\typeout{centered}\fi - #2 - \if@CenterHeading\end{center}\fi - } + \protect #1 + \if@CenterHeading\begin{center}\typeout{centered}\fi + #2 + \if@CenterHeading\end{center}\fi +} % Makes a heading. % The entire thing is something of a mess. We want all ToC entries to @@ -622,27 +622,27 @@ % of the command. \newcommand*{\th@Heading}[6]{ - \@thInHeadingtrue - % Alter the '\the...' command. - \@namedef{the#5}{\protect#2 #6} - \if@UseStarCmd - #1*{\th@MakeHeading{\protect#2}{#4}} - \else - \ifthenelse{\equal{\th@DefArg}{#3}}{ - #1[\normalsize\normalfont#4]{ - \th@MakeHeading{\protect#2}{#4}} - }{ - #1[\normalsize\normalfont#3]{ - \th@MakeHeading{\protect#2}{#4}} - } - \fi -% Reset the '\the...' command, but don't enforce -% '\normalsize\normalfont' anywhere, as this messes up -% cross-references in footnotes. - \@namedef{the#5}{#6} - \@thInHeadingfalse - \@CenterHeadingfalse - \normalsize\normalfont + \@thInHeadingtrue + % Alter the '\the...' command. + \@namedef{the#5}{\protect#2 #6} + \if@UseStarCmd + #1*{\th@MakeHeading{\protect#2}{#4}} + \else + \ifthenelse{\equal{\th@DefArg}{#3}}{ + #1[\normalsize\normalfont#4]{ + \th@MakeHeading{\protect#2}{#4}} + }{ + #1[\normalsize\normalfont#3]{ + \th@MakeHeading{\protect#2}{#4}} + } + \fi + % Reset the '\the...' command, but don't enforce + % '\normalsize\normalfont' anywhere, as this messes up + % cross-references in footnotes. + \@namedef{the#5}{#6} + \@thInHeadingfalse + \@CenterHeadingfalse + \normalsize\normalfont } %%%%%%%%%%% CHAPTER HEADING: @@ -662,67 +662,67 @@ % zeroing the figure, table, and equation counters only if necessary. \newcommand*{\th@PreChCmd}{ - \if@PerChptrNumbering - \relax - \else - \setcounter{th@SaveTable}{\value{table}} - \setcounter{th@SaveFigure}{\value{figure}} - \setcounter{th@SaveEquation}{\value{equation}} - \fi + \if@PerChptrNumbering + \relax + \else + \setcounter{th@SaveTable}{\value{table}} + \setcounter{th@SaveFigure}{\value{figure}} + \setcounter{th@SaveEquation}{\value{equation}} + \fi } \newcommand*{\th@PostChCmd}{ - \if@THshortChapter - \typeout{Short Chapter (page numbered)} - \@THshortChapterfalse - \thispagestyle{myheadings} - \else - \thispagestyle{empty} - \fi - \if@PerChptrNumbering - \relax - \else - \setcounter{table}{\value{th@SaveTable}} - \setcounter{figure}{\value{th@SaveFigure}} - \setcounter{equation}{\value{th@SaveEquation}} - \fi - \normalsize\normalfont - \@UseStarCmdfalse + \if@THshortChapter + \typeout{Short Chapter (page numbered)} + \@THshortChapterfalse + \thispagestyle{myheadings} + \else + \thispagestyle{empty} + \fi + \if@PerChptrNumbering + \relax + \else + \setcounter{table}{\value{th@SaveTable}} + \setcounter{figure}{\value{th@SaveFigure}} + \setcounter{equation}{\value{th@SaveEquation}} + \fi + \normalsize\normalfont + \@UseStarCmdfalse } \if@chapterCaps - \newcommand*{\th@Chapter}[2][\th@DefArg]{ - \th@PreChCmd - \@UseStarCmdfalse - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} - {\uppercase\expandafter{#2}}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } - \newcommand*{\th@ChapterS}[1]{ - \th@PreChCmd - \@UseStarCmdtrue - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} - {\uppercase\expandafter{#1}}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } + \newcommand*{\th@Chapter}[2][\th@DefArg]{ + \th@PreChCmd + \@UseStarCmdfalse + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} + {\uppercase\expandafter{#2}}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } + \newcommand*{\th@ChapterS}[1]{ + \th@PreChCmd + \@UseStarCmdtrue + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} + {\uppercase\expandafter{#1}}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } \else - \newcommand*{\th@Chapter}[2][\th@DefArg]{ - \th@PreChCmd - \@UseStarCmdfalse - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} - {#2}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } - \newcommand*{\th@ChapterS}[1]{ - \th@PreChCmd - \@UseStarCmdtrue - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} - {#1}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } + \newcommand*{\th@Chapter}[2][\th@DefArg]{ + \th@PreChCmd + \@UseStarCmdfalse + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} + {#2}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } + \newcommand*{\th@ChapterS}[1]{ + \th@PreChCmd + \@UseStarCmdtrue + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} + {#1}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } \fi %%%%%%%%% SECTION HEADING COMMANDS. We need to use the starred version @@ -734,41 +734,41 @@ \renewcommand*{\section}{\@ifstar{\th@SectionS}{\th@Section}} \newcommand*{\th@Section}[2][\th@DefArg]{ - \@UseStarCmdfalse - \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldSection}{\th@SectionStyle}{#1}{#2} - {section}{\th@DefTheSection} - \normalsize\normalfont + \@UseStarCmdfalse + \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldSection}{\th@SectionStyle}{#1}{#2} + {section}{\th@DefTheSection} + \normalsize\normalfont } \newcommand*{\th@SectionS}[1]{ - \@UseStarCmdtrue - \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldSection}{\th@SectionStyle}{\th@DefArg} - {#1}{section}{\th@DefTheSection} - \@UseStarCmdfalse - \normalsize\normalfont + \@UseStarCmdtrue + \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldSection}{\th@SectionStyle}{\th@DefArg} + {#1}{section}{\th@DefTheSection} + \@UseStarCmdfalse + \normalsize\normalfont } %%%%%%%%%% SUBSECTION HEADING COMMANDS. \let\th@OldSubSection\subsection \renewcommand*{\subsection}{ - \@ifstar{\th@SubSectionS}{\th@SubSection} + \@ifstar{\th@SubSectionS}{\th@SubSection} } \newcommand*{\th@SubSection}[2][\th@DefArg]{ - \@UseStarCmdfalse - \@CenterHeadingfalse - \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} - {#1}{#2}{subsection}{\th@DefTheSubsection} - \normalsize\normalfont + \@UseStarCmdfalse + \@CenterHeadingfalse + \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} + {#1}{#2}{subsection}{\th@DefTheSubsection} + \normalsize\normalfont } \newcommand*{\th@SubSectionS}[1]{ - \@UseStarCmdtrue - \@CenterHeadingfalse - \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} - {\th@DefArg}{#1}{subsection}{\th@DefTheSubsection} - \@UseStarCmdfalse - \normalsize\normalfont + \@UseStarCmdtrue + \@CenterHeadingfalse + \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} + {\th@DefArg}{#1}{subsection}{\th@DefTheSubsection} + \@UseStarCmdfalse + \normalsize\normalfont } %%%%%%%%%% SUBSUBSECTION HEADING COMMANDS. No starred version permitted. @@ -778,86 +778,86 @@ \let\th@OldSubSubSection\subsubsection \newlength{\th@SubSubSecSpc} \if@numberSubSubSection - \renewcommand*{\thesubsubsection}{\th@DefTheSubsubsection} - \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdfalse} - \setcounter{th@SecNum}{4} - \setlength{\th@SubSubSecSpc}{0.5em} + \renewcommand*{\thesubsubsection}{\th@DefTheSubsubsection} + \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdfalse} + \setcounter{th@SecNum}{4} + \setlength{\th@SubSubSecSpc}{0.5em} \else - \renewcommand*{\thesubsubsection}{\relax} - \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdtrue} - \setlength{\th@SubSubSecSpc}{0em} + \renewcommand*{\thesubsubsection}{\relax} + \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdtrue} + \setlength{\th@SubSubSecSpc}{0em} \fi \newif\if@shutoffSSSect \@shutoffSSSectfalse \if@inlineSubSubSection -\renewcommand*{\subsubsection}[2][\th@DefArg]{ - \refstepcounter{subsubsection} - \vspace{4\parsep} - \underline{% - \@thInHeadingtrue\th@OtherSecHeadStyles% - \thesubsubsection\hspace{\th@SubSubSecSpc}#2}\hspace{2mm} - \ignorespaces\normalsize\normalfont - } + \renewcommand*{\subsubsection}[2][\th@DefArg]{ + \refstepcounter{subsubsection} + \vspace{4\parsep} + \underline{% + \@thInHeadingtrue\th@OtherSecHeadStyles% + \thesubsubsection\hspace{\th@SubSubSecSpc}#2}\hspace{2mm} + \ignorespaces\normalsize\normalfont + } \else -\renewcommand*{\subsubsection}[2][\th@DefArg]{ - \th@PreSubsubsecCmd - \@CenterHeadingfalse - \th@Heading{\th@OldSubSubSection}{\th@OtherSecHeadStyles} - {\th@DefArg}{#2}{subsubsection}{\th@DefTheSubsubsection} - \@UseStarCmdfalse\normalsize\normalfont - } + \renewcommand*{\subsubsection}[2][\th@DefArg]{ + \th@PreSubsubsecCmd + \@CenterHeadingfalse + \th@Heading{\th@OldSubSubSection}{\th@OtherSecHeadStyles} + {\th@DefArg}{#2}{subsubsection}{\th@DefTheSubsubsection} + \@UseStarCmdfalse\normalsize\normalfont + } \fi % We don't need to do much for paragraph and subparagraph. We won't % even define a *-version or permit entries in the ToC. \if@AllHeadings - \let\th@OldParagraph\paragraph - \renewcommand*{\paragraph}[2][\th@DefArg]{ - \@UseStarCmdfalse - \@CenterHeadingfalse - \th@Heading{\th@OldParagraph} - {\@thInHeadingtrue\th@OtherSecHeadStyles} - {\th@DefArg}{\underline{#2}}{paragraph} - {\hspace*{\parindent}\th@DefTheParagraph} - \@UseStarCmdfalse - \@namedef{theparagraph}{\th@DefTheParagraph - \protect\normalsize\protect\normalfont} - \normalsize\normalfont - } - \let\th@OldSubParagraph\subparagraph - \renewcommand*{\subparagraph}[2][\th@DefArg]{ - \@UseStarCmdfalse - \@CenterHeadingfalse - \th@Heading{\th@OldSubParagraph} - {\@thInHeadingtrue\th@OtherSecHeadStyles} - {\th@DefArg}{\underline{#2}}{subparagraph} - {\th@DefTheSubparagraph} - \@UseStarCmdfalse - \@namedef{thesubparagraph}{\th@DefTheSubparagraph - \protect\normalsize\protect\normalfont} - \normalsize\normalfont - } - \setcounter{th@SecNum}{5} + \let\th@OldParagraph\paragraph + \renewcommand*{\paragraph}[2][\th@DefArg]{ + \@UseStarCmdfalse + \@CenterHeadingfalse + \th@Heading{\th@OldParagraph} + {\@thInHeadingtrue\th@OtherSecHeadStyles} + {\th@DefArg}{\underline{#2}}{paragraph} + {\hspace*{\parindent}\th@DefTheParagraph} + \@UseStarCmdfalse + \@namedef{theparagraph}{\th@DefTheParagraph + \protect\normalsize\protect\normalfont} + \normalsize\normalfont + } + \let\th@OldSubParagraph\subparagraph + \renewcommand*{\subparagraph}[2][\th@DefArg]{ + \@UseStarCmdfalse + \@CenterHeadingfalse + \th@Heading{\th@OldSubParagraph} + {\@thInHeadingtrue\th@OtherSecHeadStyles} + {\th@DefArg}{\underline{#2}}{subparagraph} + {\th@DefTheSubparagraph} + \@UseStarCmdfalse + \@namedef{thesubparagraph}{\th@DefTheSubparagraph + \protect\normalsize\protect\normalfont} + \normalsize\normalfont + } + \setcounter{th@SecNum}{5} \else - \renewcommand*{\paragraph}[2][\th@DefArg]{ - {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} - \renewcommand*{\subparagraph}[2][\th@DefArg]{ - {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} + \renewcommand*{\paragraph}[2][\th@DefArg]{ + {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} + \renewcommand*{\subparagraph}[2][\th@DefArg]{ + {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} \fi %%%%%%%%%% COMMANDS CHANGED FOR THIS CLASS %%%%%% Unavailable commands \renewcommand*{\theindex}{\ClassWarning{thesis} - {Indexing not available in this class.}} + {Indexing not available in this class.}} \renewcommand*{\twocolumn}{\ClassWarning{thesis} - {Twocolumn not available in this class.}} + {Twocolumn not available in this class.}} \renewcommand*{\thepart}{\ClassWarning{thesis} - {``thepart'' not available in this class.}} + {``thepart'' not available in this class.}} \renewcommand*{\part}{\ClassWarning{thesis} - {``thepart'' not available in this class.}} + {``thepart'' not available in this class.}} %%%%%% New commands % This forces a page number on the first page of a chapter, etc. \newcommand*{\forcepageno}{\thispagestyle{myheadings}} @@ -870,70 +870,70 @@ % Default values of storage variables. Emits an error message. % This part of the class is long... \newcommand*{\th@title}{ - \ClassError{thesis}{ - You must specify a title!} - {Use the \protect\title{} command in the preamble.} + \ClassError{thesis}{ + You must specify a title!} + {Use the \protect\title{} command in the preamble.} } \newcommand*{\th@fwdname}{ - \ClassError{thesis}{ - You must specify your name!} - {Use the \protect\author{}{} command in the \MessageBreak - preamble. The first arg is your first name and \MessageBreak - middle initial. The second arg is your last name.} + \ClassError{thesis}{ + You must specify your name!} + {Use the \protect\author{}{} command in the \MessageBreak + preamble. The first arg is your first name and \MessageBreak + middle initial. The second arg is your last name.} } \newcommand*{\th@revname}{ - \ClassError{thesis}{ - You must specify your name!} - {Use the \protect\author{}{} command in the \MessageBreak - preamble. The first arg is your first name and \MessageBreak - middle initial. The second arg is your last name.} + \ClassError{thesis}{ + You must specify your name!} + {Use the \protect\author{}{} command in the \MessageBreak + preamble. The first arg is your first name and \MessageBreak + middle initial. The second arg is your last name.} } \newcommand*{\th@deptname}{ - \ClassError{thesis}{ - You must specify the name of the department \MessageBreak - granting your degree and what type of \MessageBreak - organization it is within the University.} - {Use the \protect\dept{}{} command in the \MessageBreak - preamble. The second arg is the name of the \MessageBreak - department. The first arg is the department's \MessageBreak - official designation, e.g. 'College of', \MessageBreak - 'Department of', 'School of', etc.} + \ClassError{thesis}{ + You must specify the name of the department \MessageBreak + granting your degree and what type of \MessageBreak + organization it is within the University.} + {Use the \protect\dept{}{} command in the \MessageBreak + preamble. The second arg is the name of the \MessageBreak + department. The first arg is the department's \MessageBreak + official designation, e.g. 'College of', \MessageBreak + 'Department of', 'School of', etc.} } \newcommand*{\th@deptorg}{ - \ClassError{thesis}{ - You must specify the name of the department \MessageBreak - granting your degree and what type of \MessageBreak - organization it is within the University.} - {Use the \protect\dept{}{} command in the \MessageBreak - preamble. The second arg is the name of the \MessageBreak - department. The first arg is the department's \MessageBreak - official designation, e.g. 'College of', \MessageBreak - 'Department of', 'School of', etc.} + \ClassError{thesis}{ + You must specify the name of the department \MessageBreak + granting your degree and what type of \MessageBreak + organization it is within the University.} + {Use the \protect\dept{}{} command in the \MessageBreak + preamble. The second arg is the name of the \MessageBreak + department. The first arg is the department's \MessageBreak + official designation, e.g. 'College of', \MessageBreak + 'Department of', 'School of', etc.} } \newcommand*{\th@advisor}{ - \ClassError{thesis}{ - You must specify your research advisor's name \MessageBreak - and full title.} - {Use the \protect\advisor{}{} command in the \MessageBreak - preamble. The first arg is your advisor's \MessageBreak - full title. The second arg is your advisor's \MessageBreak - name.} + \ClassError{thesis}{ + You must specify your research advisor's name \MessageBreak + and full title.} + {Use the \protect\advisor{}{} command in the \MessageBreak + preamble. The first arg is your advisor's \MessageBreak + full title. The second arg is your advisor's \MessageBreak + name.} } \newcommand*{\th@advisortitle}{ - \ClassError{thesis}{ - You must specify your research advisor's name \MessageBreak - and full title.} - {Use the \protect\advisor{}{} command in the \MessageBreak - preamble. The first arg is your advisor's \MessageBreak - full title. The second arg is your advisor's \MessageBreak - name.} + \ClassError{thesis}{ + You must specify your research advisor's name \MessageBreak + and full title.} + {Use the \protect\advisor{}{} command in the \MessageBreak + preamble. The first arg is your advisor's \MessageBreak + full title. The second arg is your advisor's \MessageBreak + name.} } \newcommand*{\th@reader}{ - \ClassError{thesis}{ - You must specify the name of the other \MessageBreak - committee member who will be signing your \MessageBreak - thesis.} - {Use the \protect\reader{} command in the preamble.} + \ClassError{thesis}{ + You must specify the name of the other \MessageBreak + committee member who will be signing your \MessageBreak + thesis.} + {Use the \protect\reader{} command in the preamble.} } \newcommand*{\th@readerThree}{none} % optional \newcommand*{\th@readerFour}{none} % optional @@ -941,53 +941,53 @@ \newcommand*{\th@readerSix}{none} % optional \newcommand*{\th@IRBprotocol}{none} % optional \newcommand*{\th@fulldegree}{ - \ClassError{thesis}{ - You must specify the type of degree you are \MessageBreak - receiving.} - {Use the \protect\degree{}{} command in the \MessageBreak - preamble. The first arg is the unabbreviated \MessageBreak - name of the degree itself, e.g. \MessageBreak - 'Doctor of Philosophy'. The second arg is the \MessageBreak - degree abbreviation followed by the subject, e.g.\MessageBreak - 'Ph. D., Biology'.} + \ClassError{thesis}{ + You must specify the type of degree you are \MessageBreak + receiving.} + {Use the \protect\degree{}{} command in the \MessageBreak + preamble. The first arg is the unabbreviated \MessageBreak + name of the degree itself, e.g. \MessageBreak + 'Doctor of Philosophy'. The second arg is the \MessageBreak + degree abbreviation followed by the subject, e.g.\MessageBreak + 'Ph. D., Biology'.} } \newcommand*{\th@degree}{ - \ClassError{thesis}{ - You must specify the type of degree you are \MessageBreak - receiving.} - {Use the \protect\degree{}{} command in the \MessageBreak - preamble. The first arg is the unabbreviated \MessageBreak - name of the degree itself, e.g. \MessageBreak - 'Doctor of Philosophy'. The second arg is the \MessageBreak - degree abbreviation followed by the subject, \MessageBreak - e.g. 'Ph. D., Biology'.} + \ClassError{thesis}{ + You must specify the type of degree you are \MessageBreak + receiving.} + {Use the \protect\degree{}{} command in the \MessageBreak + preamble. The first arg is the unabbreviated \MessageBreak + name of the degree itself, e.g. \MessageBreak + 'Doctor of Philosophy'. The second arg is the \MessageBreak + degree abbreviation followed by the subject, \MessageBreak + e.g. 'Ph. D., Biology'.} } \newcommand{\th@otherdegrees}{ - \ClassError{thesis}{ - You must specify other degrees you hold!} - {Use the \protect\otherdegrees{} command in the \MessageBreak - preamble. Break each line using the \protect\\ \MessageBreak - command.} + \ClassError{thesis}{ + You must specify other degrees you hold!} + {Use the \protect\otherdegrees{} command in the \MessageBreak + preamble. Break each line using the \protect\\ \MessageBreak + command.} } \newcommand{\th@abstractStash}{ - \ClassError{thesis}{ - You must specify an abstract!} - {Use the \protect\abstractpage[]{} command in the \MessageBreak - preamble. If your abstract runs over a page, \MessageBreak - use the optional argument with the word 'long'.} + \ClassError{thesis}{ + You must specify an abstract!} + {Use the \protect\abstractpage[]{} command in the \MessageBreak + preamble. If your abstract runs over a page, \MessageBreak + use the optional argument with the word 'long'.} } \newcommand*{\th@degreeyear}{\number\the\year} \newcommand*{\th@signature}[1]{ \begin{center} - \normalsize - \vspace*{16mm} % works well? - \vrule width 80mm height 0.2mm\\ - #1 \end{center} + \normalsize + \vspace*{16mm} % works well? + \vrule width 80mm height 0.2mm\\ + #1 \end{center} } \newcommand*{\th@dateline}{ - \vspace*{9mm} - \begin{flushright} - Date~{\vrule width 35mm height 0.2mm} - \end{flushright} + \vspace*{9mm} + \begin{flushright} + Date~{\vrule width 35mm height 0.2mm} + \end{flushright} } \newcommand{\th@AbstractPageStyle}{\relax} \newcommand{\th@dedicationStash}{\relax} @@ -1019,163 +1019,163 @@ % The base commands that make all of the prologue pages. \newcommand*{\th@Titlepage}{ - \thispagestyle{empty} - \@thInHeadingtrue - \null\vfill - \begin{list}{}{\setlength{\leftmargin}{0.8in} - \setlength{\rightmargin}{0.8in}\sloppy} - \centering\item[] - {\th@ChapterStyle - \if@chapterCaps - \uppercase\expandafter{\th@title}\\ - \else - \th@title\\ - \fi} - by\\ - {\th@OtherSecHeadStyles - \if@chapterCaps - \uppercase\expandafter{\th@fwdname}\\ - \else - \th@fwdname\\ - \fi} - \th@otherdegrees\\ - \end{list} - \vfill - \begin{center} - A prospectus submitted to\\ - \th@advisortitle\ \th@advisor \\ - \th@reader\\ % REQUIRED - \ifthenelse{\equal{\th@readerThree}{none}}{\relax} - {\th@readerThree\\} % optional - \ifthenelse{\equal{\th@readerFour}{none}}{\relax} - {\th@readerFour\\} % optional - \ifthenelse{\equal{\th@readerFive}{none}}{\relax} - {\th@readerFive\\} % optional - in partial fulfillment of the requirements for the degree of\\ - \th@fulldegree\\ - \th@deptorg\ \th@deptname\\ - \ \th@degreeyear \\ - \end{center} - \@thInHeadingfalse - \vfill + \thispagestyle{empty} + \@thInHeadingtrue + \null\vfill + \begin{list}{}{\setlength{\leftmargin}{0.8in} + \setlength{\rightmargin}{0.8in}\sloppy} + \centering\item[] + {\th@ChapterStyle + \if@chapterCaps + \uppercase\expandafter{\th@title}\\ + \else + \th@title\\ + \fi} + by\\ + {\th@OtherSecHeadStyles + \if@chapterCaps + \uppercase\expandafter{\th@fwdname}\\ + \else + \th@fwdname\\ + \fi} + \th@otherdegrees\\ + \end{list} + \vfill + \begin{center} + A prospectus submitted to\\ + \th@advisortitle\ \th@advisor \\ + \th@reader\\ % REQUIRED + \ifthenelse{\equal{\th@readerThree}{none}}{\relax} + {\th@readerThree\\} % optional + \ifthenelse{\equal{\th@readerFour}{none}}{\relax} + {\th@readerFour\\} % optional + \ifthenelse{\equal{\th@readerFive}{none}}{\relax} + {\th@readerFive\\} % optional + in partial fulfillment of the requirements for the degree of\\ + \th@fulldegree\\ + \th@deptorg\ \th@deptname\\ + \ \th@degreeyear \\ + \end{center} + \@thInHeadingfalse + \vfill } \newcommand{\th@Abstractpage}{ - \clearpage - \th@AbstractPageStyle - \doublespacing % 1998 revision of Grad School Specs - \par - \vspace*{4\parsep} - \begin{center} - \textbf{\th@ChapHead{Abstract}} - \end{center} - \th@abstractStash % finally, the actual abstract + \clearpage + \th@AbstractPageStyle + \doublespacing % 1998 revision of Grad School Specs + \par + \vspace*{4\parsep} + \begin{center} + \textbf{\th@ChapHead{Abstract}} + \end{center} + \th@abstractStash % finally, the actual abstract } \newcommand{\th@Dedicationpage}{ - \if@makeDedication - \clearpage - \thispagestyle{empty} - \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} - }{\vfill}{\chapter*{\th@dedicationTitleStash}} - \th@dedicationStash - \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} - }{\vfill}{\relax} - \fi + \if@makeDedication + \clearpage + \thispagestyle{empty} + \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} + }{\vfill}{\chapter*{\th@dedicationTitleStash}} + \th@dedicationStash + \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} + }{\vfill}{\relax} + \fi } \newcommand{\th@Acknowledgementpage}{ - \if@makeAcknowledgements - \clearpage - \chapter*{Acknowledgements} - {\doublespacing - \th@acknowledgementsStash} - \fi + \if@makeAcknowledgements + \clearpage + \chapter*{Acknowledgements} + {\doublespacing + \th@acknowledgementsStash} + \fi } \newcommand{\th@ToCpage}{ - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \@THshortChapterfalse - \if@shortToC - \@THshortChaptertrue - \typeout{Making Short ToC...} - \fi - \@thInHeadingfalse - {\doublespacing - \tableofcontents} - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \@THshortChapterfalse + \if@shortToC + \@THshortChaptertrue + \typeout{Making Short ToC...} + \fi + \@thInHeadingfalse + {\doublespacing + \tableofcontents} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoTpage}{ - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \glsunsetall - \@THshortChapterfalse - \if@makenoLoT - \typeout{Skipping LoT...} - \else - \if@shortLoT - \@THshortChaptertrue - \typeout{Making Short LoT...} - \fi - {\doublespacing - \listoftables} - \fi - \glsresetall - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \glsunsetall + \@THshortChapterfalse + \if@makenoLoT + \typeout{Skipping LoT...} + \else + \if@shortLoT + \@THshortChaptertrue + \typeout{Making Short LoT...} + \fi + {\doublespacing + \listoftables} + \fi + \glsresetall + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoFpage}{ - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \glsunsetall - \@THshortChapterfalse - \if@makenoLoF - \typeout{Skipping LoF...} - \else - \if@shortLoF - \@THshortChaptertrue - \typeout{Making Short LoF...} - \fi - {\doublespacing - \listoffigures} - \fi - \glsresetall - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \glsunsetall + \@THshortChapterfalse + \if@makenoLoF + \typeout{Skipping LoF...} + \else + \if@shortLoF + \@THshortChaptertrue + \typeout{Making Short LoF...} + \fi + {\doublespacing + \listoffigures} + \fi + \glsresetall + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoLpage}{ - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \@THshortChapterfalse - \if@makenoLoL - \typeout{Skipping LoL...} - \else - \if@shortLoL - \@THshortChaptertrue - \typeout{Making Short LoL...} - \fi - {\doublespacing - \lstlistoflistings} - \fi - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \@THshortChapterfalse + \if@makenoLoL + \typeout{Skipping LoL...} + \else + \if@shortLoL + \@THshortChaptertrue + \typeout{Making Short LoL...} + \fi + {\doublespacing + \lstlistoflistings} + \fi + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoApage}{ - \@THshortChapterfalse - \if@makenoLoA - \typeout{Skipping LoA...} - \else - \if@shortLoA - \@THshortChaptertrue - \typeout{Making Short LoA...} - \fi - {\singlespacing - % list of acronyms + \@THshortChapterfalse + \if@makenoLoA + \typeout{Skipping LoA...} + \else + \if@shortLoA + \@THshortChaptertrue + \typeout{Making Short LoA...} + \fi + {\singlespacing + % list of acronyms \printglossary[type=\acronymtype,style=long,nonumberlist]} - \fi + \fi } @@ -1183,48 +1183,48 @@ % This performs the actual generation of the prologue \newcounter{th@storepage} \newcommand{\th@MakeThesisPrologue}{ - \if@makePrologue - \pagenumbering{roman} - \typeout{Making Title Page} - \th@Titlepage - % Note: Approval Page is no longer required. - % \typeout{Making Approval Page} - % \th@Approvalpage - \typeout{Making Abstract Page} - \th@Abstractpage - \typeout{Making Dedication Page} - \th@Dedicationpage - \typeout{Making Acknowledgement Page} - \th@Acknowledgementpage - \setcounter{th@storepage}{\value{page}} - \typeout{Making ToC Page} - \th@ToCpage - \typeout{Making LoT Page} - \th@LoTpage - \typeout{Making LoF Page} - \th@LoFpage - \typeout{Making LoL Page} - \th@LoLpage - \typeout{Making LoA Page} - \th@LoApage - \fi + \if@makePrologue + \pagenumbering{roman} + \typeout{Making Title Page} + \th@Titlepage + % Note: Approval Page is no longer required. + % \typeout{Making Approval Page} + % \th@Approvalpage + \typeout{Making Abstract Page} + \th@Abstractpage + \typeout{Making Dedication Page} + \th@Dedicationpage + \typeout{Making Acknowledgement Page} + \th@Acknowledgementpage + \setcounter{th@storepage}{\value{page}} + \typeout{Making ToC Page} + \th@ToCpage + \typeout{Making LoT Page} + \th@LoTpage + \typeout{Making LoF Page} + \th@LoFpage + \typeout{Making LoL Page} + \th@LoLpage + \typeout{Making LoA Page} + \th@LoApage + \fi } % Make the generator-command the very first command of the document. \let\th@OldBeginDocument\document \renewcommand*{\document}{ - \th@OldBeginDocument - \th@MakeThesisPrologue - \typeout{} - \typeout{} - \typeout{-------------------Beginning Body----------------------} - \typeout{} - \typeout{} - \doublespacing - \clearpage - \pagenumbering{arabic} - \@THshortChapterfalse + \th@OldBeginDocument + \th@MakeThesisPrologue + \typeout{} + \typeout{} + \typeout{-------------------Beginning Body----------------------} + \typeout{} + \typeout{} + \doublespacing + \clearpage + \pagenumbering{arabic} + \@THshortChapterfalse } %%%%%%%%% USER COMMANDS FOR CONTROLLING THE PROLOGUE: @@ -1238,75 +1238,75 @@ \newcommand*{\degreeyear}[1]{\th@StoreIn{\th@degreeyear}{#1}} \newcommand{\otherdegrees}[1]{\th@StoreIn{\th@otherdegrees}{#1}} \newcommand{\acknowledgements}[1]{ - \@makeAcknowledgementstrue - \th@StoreIn{\th@acknowledgementsStash}{#1} + \@makeAcknowledgementstrue + \th@StoreIn{\th@acknowledgementsStash}{#1} } \newcommand{\dedication}[2][\th@DefArg]{ - \@makeDedicationtrue - \th@StoreIn{\th@dedicationTitleStash}{#1} - \th@StoreIn{\th@dedicationStash}{#2} + \@makeDedicationtrue + \th@StoreIn{\th@dedicationTitleStash}{#1} + \th@StoreIn{\th@dedicationStash}{#2} } \renewcommand*{\author}[2]{ - \th@StoreIn{\th@fwdname}{#1 #2} - \th@StoreIn{\th@revname}{#2, #1} + \th@StoreIn{\th@fwdname}{#1 #2} + \th@StoreIn{\th@revname}{#2, #1} } \newcommand*{\degree}[2]{ - \th@StoreIn{\th@fulldegree}{#1} - \th@StoreIn{\th@degree}{#2} + \th@StoreIn{\th@fulldegree}{#1} + \th@StoreIn{\th@degree}{#2} } \newcommand*{\advisor}[2]{ - \th@StoreIn{\th@advisor}{#2} - \th@StoreIn{\th@advisortitle}{#1} + \th@StoreIn{\th@advisor}{#2} + \th@StoreIn{\th@advisortitle}{#1} } \newcommand*{\dept}[2]{ - \th@StoreIn{\th@deptorg}{#1} - \th@StoreIn{\th@deptname}{#2} + \th@StoreIn{\th@deptorg}{#1} + \th@StoreIn{\th@deptname}{#2} } \renewcommand{\abstract}[2][long]{ - \ifthenelse{\equal{#1}{short}}{\relax}{ - \th@StoreIn{\th@AbstractPageStyle}{\thispagestyle{empty}} - } - \th@StoreIn{\th@abstractStash}{#2} + \ifthenelse{\equal{#1}{short}}{\relax}{ + \th@StoreIn{\th@AbstractPageStyle}{\thispagestyle{empty}} + } + \th@StoreIn{\th@abstractStash}{#2} } \newcommand*{\SuspendPrologue}{ - \@makeProloguefalse - \typeout{No prologue pages printed.} + \@makeProloguefalse + \typeout{No prologue pages printed.} } \newcommand*{\emptyLoF}{ - \@makenoLoFtrue - \typeout{No LoF printed} + \@makenoLoFtrue + \typeout{No LoF printed} } \newcommand*{\emptyLoT}{ - \@makenoLoTtrue - \typeout{No LoT printed} + \@makenoLoTtrue + \typeout{No LoT printed} } \newcommand*{\emptyLoL}{ - \@makenoLoLtrue - \typeout{No LoL printed} + \@makenoLoLtrue + \typeout{No LoL printed} } \newcommand*{\emptyLoA}{ - \@makenoLoAtrue - \typeout{No LoA printed} + \@makenoLoAtrue + \typeout{No LoA printed} } \newcommand*{\ToCisShort}{ - \@shortToCtrue - \typeout{Putting page number on short ToC} + \@shortToCtrue + \typeout{Putting page number on short ToC} } \newcommand*{\LoFisShort}{ - \@shortLoFtrue - \typeout{Putting page number on short LoF} + \@shortLoFtrue + \typeout{Putting page number on short LoF} } \newcommand*{\LoTisShort}{ - \@shortLoTtrue - \typeout{Putting page number on short LoT} + \@shortLoTtrue + \typeout{Putting page number on short LoT} } \newcommand*{\LoLisShort}{ - \@shortLoLtrue - \typeout{Putting page number on short LoL} + \@shortLoLtrue + \typeout{Putting page number on short LoL} } \newcommand*{\LoAisShort}{ - \@shortLoAtrue - \typeout{Putting page number on short LoA} + \@shortLoAtrue + \typeout{Putting page number on short LoA} } \endinput diff --git a/thesis.cls b/thesis.cls index 8a1041a..35b1e2a 100644 --- a/thesis.cls +++ b/thesis.cls @@ -76,31 +76,31 @@ % Invalid options - normally used in report.cls and others, but not here: \DeclareOption{titlepage} - {\ClassWarning{thesis}{Title page always generated. Option ignored.}} +{\ClassWarning{thesis}{Title page always generated. Option ignored.}} \DeclareOption{notitlepage} - {\ClassWarning{thesis}{Option 'notitlepage' not available for thesis.}} +{\ClassWarning{thesis}{Option 'notitlepage' not available for thesis.}} \DeclareOption{twoside} - {\ClassWarning{thesis}{Option 'twoside' not available for thesis.}} +{\ClassWarning{thesis}{Option 'twoside' not available for thesis.}} \DeclareOption{twocolumn} - {\ClassWarning{thesis}{Option 'twocolumn' not available for thesis.}} +{\ClassWarning{thesis}{Option 'twocolumn' not available for thesis.}} \DeclareOption{landscape} - {\ClassWarning{thesis}{Option 'landscape' not available for thesis.}} +{\ClassWarning{thesis}{Option 'landscape' not available for thesis.}} \DeclareOption{legalpaper} - {\ClassWarning{thesis}{Option 'legalpaper' not available for thesis.}} +{\ClassWarning{thesis}{Option 'legalpaper' not available for thesis.}} \DeclareOption{a4paper} - {\ClassWarning{thesis}{Option 'a4paper' not available for this class.}} +{\ClassWarning{thesis}{Option 'a4paper' not available for this class.}} \DeclareOption{a5paper} - {\ClassWarning{thesis}{Option 'a5paper' not available for this class.}} +{\ClassWarning{thesis}{Option 'a5paper' not available for this class.}} \DeclareOption{executivepaper} - {\ClassWarning{thesis}{Option 'executivepaper' not available.}} +{\ClassWarning{thesis}{Option 'executivepaper' not available.}} \DeclareOption{b5paper} - {\ClassWarning{thesis}{Option 'b5paper' not available for this class.}} +{\ClassWarning{thesis}{Option 'b5paper' not available for this class.}} \DeclareOption{letterpaper} - {\ClassWarning{thesis}{Option 'letterpaper' superfluous. Ignored.}} +{\ClassWarning{thesis}{Option 'letterpaper' superfluous. Ignored.}} \DeclareOption{onecolumn} - {\ClassWarning{thesis}{Option 'onecolumn' superfluous. Ignored.}} +{\ClassWarning{thesis}{Option 'onecolumn' superfluous. Ignored.}} \DeclareOption{oneside} - {\ClassWarning{thesis}{Option 'oneside' superfluous. Ignored.}} +{\ClassWarning{thesis}{Option 'oneside' superfluous. Ignored.}} %%%%%%%%%%% CUSTOM OPTIONS: % Options for no decimal numbering, or decimal number nested over 3 deep: @@ -143,28 +143,28 @@ \DeclareOption{fixedheadsize}{ \@fixedHeadSztrue } \DeclareOption{varheadsize}{\@headSizeTwelvePtfalse}% Hidden option. Don't use. \DeclareOption{numberchapteronly}{ - \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse - \@centerChaptertrue\@centerSectiontrue - \@inlineSubSubSectiontrue\@numberSubSubSectionfalse } + \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse + \@centerChaptertrue\@centerSectiontrue + \@inlineSubSubSectiontrue\@numberSubSubSectionfalse } \DeclareOption{allheadings}{ - \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingstrue - \@centerChaptertrue\@centerSectionfalse - \@inlineSubSubSectionfalse\@numberSubSubSectiontrue} + \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingstrue + \@centerChaptertrue\@centerSectionfalse + \@inlineSubSubSectionfalse\@numberSubSubSectiontrue} \DeclareOption{typewriterstyle}{ \@emphisboldfalse - \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse - \@centerChaptertrue\@centerSectiontrue\@chapterCapstrue - \@inlineSubSubSectiontrue\@numberSubSubSectionfalse - \@boldheadfalse\@fixedHeadSztrue} + \@PerChptrNumberingfalse\@NumberStdHeadingsfalse\@AllHeadingsfalse + \@centerChaptertrue\@centerSectiontrue\@chapterCapstrue + \@inlineSubSubSectiontrue\@numberSubSubSectionfalse + \@boldheadfalse\@fixedHeadSztrue} \DeclareOption{modernstyle}{ \@emphisboldtrue - \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse - \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse - \@inlineSubSubSectiontrue\@numberSubSubSectionfalse - \@boldheadtrue\@fixedHeadSzfalse} + \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse + \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse + \@inlineSubSubSectiontrue\@numberSubSubSectionfalse + \@boldheadtrue\@fixedHeadSzfalse} \DeclareOption{defaultstyle}{ \@emphisboldtrue - \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse - \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse - \@inlineSubSubSectionfalse\@numberSubSubSectiontrue - \@boldheadtrue\@fixedHeadSzfalse} + \@PerChptrNumberingtrue\@NumberStdHeadingstrue\@AllHeadingsfalse + \@centerChaptertrue\@centerSectionfalse\@chapterCapsfalse + \@inlineSubSubSectionfalse\@numberSubSubSectiontrue + \@boldheadtrue\@fixedHeadSzfalse} % Now we load the report class with certain options by default. It % will process any other options specified. Then, we process the @@ -192,29 +192,31 @@ % commands. \newcommand{\th@ExecChkOptArg}[3]{ -\ifthenelse{\equal{\th@DefArg}{#2}}{ - #1{#3} - }{ - #1[#2]{#3}} + \ifthenelse{\equal{\th@DefArg}{#2}}{ + #1{#3} + }{ + #1[#2]{#3}} } % Controls the heading styles. You can change the size to suit your needs. \if@fixedHeadSz - \newcommand*{\th@ChSz}{\normalsize} - \newcommand*{\th@ScSz}{\normalsize} + \newcommand*{\th@ChSz}{\normalsize} + \newcommand*{\th@ScSz}{\normalsize} \else\if@headSizeTwelvePt - \newcommand*{\th@ChSz}{\normalsize\fontsize{12}{12}\selectfont} - \newcommand*{\th@ScSz}{\normalsize\fontsize{12}{12}\selectfont} -\else - \newcommand*{\th@ChSz}{\normalsize\Large} - \newcommand*{\th@ScSz}{\normalsize\large} -\fi\fi + \newcommand*{\th@ChSz}{\normalsize\fontsize{12}{12}\selectfont} + \newcommand*{\th@ScSz}{\normalsize\fontsize{12}{12}\selectfont} + \else + \newcommand*{\th@ChSz}{\normalsize\Large} + \newcommand*{\th@ScSz}{\normalsize\large} + + \fi\fi \if@boldhead - \newcommand*{\th@HdFnt}{\normalfont\bfseries} + \newcommand*{\th@HdFnt}{\normalfont\bfseries} \else - \newcommand*{\th@HdFnt}{\normalfont} + \newcommand*{\th@HdFnt}{\normalfont} + \fi % The style commands proper. Controlled by a flag. @@ -230,12 +232,12 @@ % depending on the startup flags. \newcommand*{\EmphReset}{ - \if@emphisbold - \let\em\bfseries - \let\emph\textbf - \else - \ULforem - \fi + \if@emphisbold + \let\em\bfseries + \let\emph\textbf + \else + \ULforem + \fi } % Makes the chapter heading label, putting it in the desired style. @@ -244,14 +246,14 @@ \newcommand*{\th@DoChapCenter}{\if@centerChapter\centering\fi} \newcommand*{\th@ChapHead}[1]{ - \protect\th@ChapterStyle - \protect\th@DoChapCenter #1} + \protect\th@ChapterStyle + \protect\th@DoChapCenter #1} %%%%%%% DEFINE DOUBLE-SPACING (THE DEFAULT) AND OTHER SPACING: \def\setspace@size{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi} \def\doublespacing{ \ifcase \@ptsize \relax - \def \baselinestretch {2.004}% 10pt + \def \baselinestretch {2.004}% 10pt \or \def \baselinestretch {1.771}% 11pt \or \def \baselinestretch {1.660}% 12pt \fi \setspace@size} @@ -262,12 +264,12 @@ \baselineskip \baselinestretch\baselineskip \parskip \baselinestretch\parskip \setbox\strutbox \hbox{ \vrule height.7\baselineskip depth.3\baselineskip - width\z@} \skip\footins \baselinestretch\skip\footins + width\z@} \skip\footins \baselinestretch\skip\footins \normalbaselineskip\baselineskip#3#4} %%%%%%%%% floats & footnotes singlespaced %%%%%%%%% \let\latexx@xfloat=\@xfloat \def\@xfloat #1[#2]{\latexx@xfloat #1[#2] -\def\baselinestretch{1}\@normalsize \normalsize} + \def\baselinestretch{1}\@normalsize \normalsize} \long\def\@footnotetext#1{ \insert\footins{ \def\baselinestretch {1} @@ -279,7 +281,7 @@ \protected@edef\@currentlabel{ \csname p@footnote\endcsname\@thefnmark} \color@begingroup \@makefntext{ - \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} \color@endgroup}} \long\def\@mpfootnotetext#1{ \global\setbox\@mpfootins\vbox{ @@ -290,8 +292,8 @@ \protected@edef\@currentlabel{ \csname p@mpfootnote\endcsname\@thefnmark} \color@begingroup \@makefntext{ - \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} - \color@endgroup}} + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox} + \color@endgroup}} %%%%%%%% single / double spacing %%%%%%%%% \def\singlespace{ \vskip \baselineskip \def\baselinestretch {1} \setspace@size \vskip -\baselineskip } @@ -300,7 +302,7 @@ \def\endspacing{ \par \vskip \parskip \vskip \baselineskip \endgroup \vskip -\parskip \vskip -\baselineskip } \def\doublespace{ \ifcase \@ptsize \relax - \spacing{2.004}% 10pt + \spacing{2.004}% 10pt \or \spacing{1.771}% 11pt \or \spacing{1.660}% 12pt \fi } @@ -312,50 +314,50 @@ % margins... Initialize several global document properties, but do so % *before* the beginning of the document to forces these changes. \AtBeginDocument{ - \setlength{\topmargin}{-0.30in} - \setlength{\headheight}{0.20in} - \setlength{\headsep}{0.0in} - \setlength{\topskip}{0.40in} % first line, down from page number - \setlength{\textheight}{9.10in} % 9"-(topmargin+headsep+headheight) - \setlength{\footskip}{0pt} - \setlength{\oddsidemargin}{0.00in} - \setlength{\evensidemargin}{0.00in} - \setlength{\parindent}{0.40in} % somewhere between 0.3" and 0.5" - \setlength{\textwidth}{6.50in} - \setlength{\leftmargini}{3.5em} - \setlength{\leftmarginii}{2.2em} - \setlength{\leftmarginiii}{2.2em} - \setlength{\leftmarginiv}{2.2em} - \setlength{\leftmarginv}{2.2em} - \setlength{\leftmarginvi}{2.2em} - \setlength{\leftmargin}{\leftmargini} - \setlength{\labelsep}{.5em} - \setlength{\labelwidth}{ 1.5em} - \pagenumbering{arabic} - \pagestyle{myheadings} - \markright{} - \onecolumn - \raggedbottom - \normalsize - \normalfont - \EmphReset % bold or underlined? - \doublespacing % footnotes and floats still singlespaced - \setcounter{tocdepth}{2} - \setcounter{secnumdepth}{\value{th@SecNum}} -% Redefine the bibliography command here, just in case someone -% uses a custom *.sty file that redefines bibliography command - \let\th@OldBib\thebibliography - \let\endth@OldBib\endthebibliography - \renewenvironment*{thebibliography}[1]{ - \begin{th@OldBib}{#1} - \ULforem% set \em to underline - \begin{singlespace} - \addcontentsline{toc}{part}{\bibnameToC} - }{ - \end{singlespace} - \EmphReset% set \em back to the user-specified default. - \end{th@OldBib} - } + \setlength{\topmargin}{-0.30in} + \setlength{\headheight}{0.20in} + \setlength{\headsep}{0.0in} + \setlength{\topskip}{0.40in} % first line, down from page number + \setlength{\textheight}{9.10in} % 9"-(topmargin+headsep+headheight) + \setlength{\footskip}{0pt} + \setlength{\oddsidemargin}{0.00in} + \setlength{\evensidemargin}{0.00in} + \setlength{\parindent}{0.40in} % somewhere between 0.3" and 0.5" + \setlength{\textwidth}{6.50in} + \setlength{\leftmargini}{3.5em} + \setlength{\leftmarginii}{2.2em} + \setlength{\leftmarginiii}{2.2em} + \setlength{\leftmarginiv}{2.2em} + \setlength{\leftmarginv}{2.2em} + \setlength{\leftmarginvi}{2.2em} + \setlength{\leftmargin}{\leftmargini} + \setlength{\labelsep}{.5em} + \setlength{\labelwidth}{ 1.5em} + \pagenumbering{arabic} + \pagestyle{myheadings} + \markright{} + \onecolumn + \raggedbottom + \normalsize + \normalfont + \EmphReset % bold or underlined? + \doublespacing % footnotes and floats still singlespaced + \setcounter{tocdepth}{2} + \setcounter{secnumdepth}{\value{th@SecNum}} + % Redefine the bibliography command here, just in case someone + % uses a custom *.sty file that redefines bibliography command + \let\th@OldBib\thebibliography + \let\endth@OldBib\endthebibliography + \renewenvironment*{thebibliography}[1]{ + \begin{th@OldBib}{#1} + \ULforem% set \em to underline + \begin{singlespace} + \addcontentsline{toc}{part}{\bibnameToC} + }{ + \end{singlespace} + \EmphReset% set \em back to the user-specified default. + \end{th@OldBib} + } } %%%%%%%%%%% ADDITIONAL STUFF: @@ -385,41 +387,42 @@ \newcommand*{\tablenameToC}{\normalsize\th@HdFnt\tablename\normalfont} \if@chapterCaps - \renewcommand*{\contentsname}{\th@ChapHead{CONTENTS}} - \renewcommand*{\listfigurename}{\th@ChapHead{FIGURES}} - \renewcommand*{\listtablename}{\th@ChapHead{TABLES}} - \renewcommand*{\appendixname}{\th@ChapHead{APPENDIX}} - \renewcommand*{\bibname}{\th@ChapHead{BIBLIOGRAPHY}} - \renewcommand*{\chaptername}{\th@ChapHead{CHAPTER}} - \newcommand*{\chapternameToC}{ - \normalsize\th@HdFnt CHAPTER\normalfont} - \newcommand*{\bibnameToC}{ - \normalsize\th@HdFnt BIBLIOGRAPHY\normalfont} - \newcommand*{\appendixnameToC}{ - \normalsize\th@HdFnt APPENDIX\normalfont} + \renewcommand*{\contentsname}{\th@ChapHead{CONTENTS}} + \renewcommand*{\listfigurename}{\th@ChapHead{FIGURES}} + \renewcommand*{\listtablename}{\th@ChapHead{TABLES}} + \renewcommand*{\appendixname}{\th@ChapHead{APPENDIX}} + \renewcommand*{\bibname}{\th@ChapHead{BIBLIOGRAPHY}} + \renewcommand*{\chaptername}{\th@ChapHead{CHAPTER}} + \newcommand*{\chapternameToC}{ + \normalsize\th@HdFnt CHAPTER\normalfont} + \newcommand*{\bibnameToC}{ + \normalsize\th@HdFnt BIBLIOGRAPHY\normalfont} + \newcommand*{\appendixnameToC}{ + \normalsize\th@HdFnt APPENDIX\normalfont} \else - \renewcommand*{\contentsname}{\th@ChapHead{Contents}} - \renewcommand*{\listfigurename}{\th@ChapHead{Figures}} - \renewcommand*{\listtablename}{\th@ChapHead{Tables}} - \renewcommand*{\appendixname}{\th@ChapHead{Appendix}} - \renewcommand*{\bibname}{\th@ChapHead{Bibliography}} - \renewcommand*{\chaptername}{\th@ChapHead{Chapter}} - \newcommand*{\chapternameToC}{ - \normalsize\th@HdFnt Chapter\normalfont} - \newcommand*{\bibnameToC}{ - \normalsize\th@HdFnt Bibliography\normalfont} - \newcommand*{\appendixnameToC}{ - \normalsize\th@HdFnt Appendix\normalfont} + \renewcommand*{\contentsname}{\th@ChapHead{Contents}} + \renewcommand*{\listfigurename}{\th@ChapHead{Figures}} + \renewcommand*{\listtablename}{\th@ChapHead{Tables}} + \renewcommand*{\appendixname}{\th@ChapHead{Appendix}} + \renewcommand*{\bibname}{\th@ChapHead{Bibliography}} + \renewcommand*{\chaptername}{\th@ChapHead{Chapter}} + \newcommand*{\chapternameToC}{ + \normalsize\th@HdFnt Chapter\normalfont} + \newcommand*{\bibnameToC}{ + \normalsize\th@HdFnt Bibliography\normalfont} + \newcommand*{\appendixnameToC}{ + \normalsize\th@HdFnt Appendix\normalfont} + \fi % Adds the appropriate label to the ToC/LoF/LoT \addtocontents{lof}{\protect\contentsline {part} - {\protect\figurenameToC}{\protect\relax}{}} + {\protect\figurenameToC}{\protect\relax}{}} \addtocontents{lot}{\protect\contentsline {part} - {\protect\tablenameToC}{\protect\relax}{}} + {\protect\tablenameToC}{\protect\relax}{}} \addtocontents{toc}{\protect\contentsline {part} - {\protect\chapternameToC}{\protect\relax}{}} + {\protect\chapternameToC}{\protect\relax}{}} % NUMBERING STYLES, DEFAULT VALUES @@ -429,35 +432,37 @@ \newcounter{th@SecNum} \setcounter{th@SecNum}{3} \if@NumberStdHeadings - \@centerSectionfalse% Force this. - \newcommand*{\th@DefTheChapter}{\arabic{chapter}} - \newcommand*{\th@DefTheSection}{\th@DefTheChapter.\arabic{section}} - \newcommand*{\th@DefTheSubsection}{\th@DefTheSection.\arabic{subsection}} + \@centerSectionfalse% Force this. + \newcommand*{\th@DefTheChapter}{\arabic{chapter}} + \newcommand*{\th@DefTheSection}{\th@DefTheChapter.\arabic{section}} + \newcommand*{\th@DefTheSubsection}{\th@DefTheSection.\arabic{subsection}} \else - \@AllHeadingsfalse% Just to be safe... - \newcommand*{\th@DefTheChapter}{\Roman{chapter}} - \newcommand*{\th@DefTheSection}{\relax} - \newcommand*{\th@DefTheSubsection}{\relax} + \@AllHeadingsfalse% Just to be safe... + \newcommand*{\th@DefTheChapter}{\Roman{chapter}} + \newcommand*{\th@DefTheSection}{\relax} + \newcommand*{\th@DefTheSubsection}{\relax} + \fi \if@AllHeadings - \@inlineSubSubSectionfalse% Force this... - \@numberSubSubSectiontrue% ...and this. - \newcommand*{\th@DefTheSubsubsection} - {\th@DefTheSubsection.\arabic{subsubsection}} - \newcommand*{\th@DefTheParagraph} - {\th@DefTheSubsubsection.\arabic{paragraph}} - \newcommand*{\th@DefTheSubparagraph} - {\th@DefTheParagraph.\arabic{subparagraph}} + \@inlineSubSubSectionfalse% Force this... + \@numberSubSubSectiontrue% ...and this. + \newcommand*{\th@DefTheSubsubsection} + {\th@DefTheSubsection.\arabic{subsubsection}} + \newcommand*{\th@DefTheParagraph} + {\th@DefTheSubsubsection.\arabic{paragraph}} + \newcommand*{\th@DefTheSubparagraph} + {\th@DefTheParagraph.\arabic{subparagraph}} \else - \newcommand*{\th@DefTheParagraph}{\relax} - \newcommand*{\th@DefTheSubparagraph}{\relax} - \if@numberSubSubSection - \newcommand*{\th@DefTheSubsubsection} - {\th@DefTheSubsection.\arabic{subsubsection}} - \else - \newcommand*{\th@DefTheSubsubsection}{\relax} - \fi + \newcommand*{\th@DefTheParagraph}{\relax} + \newcommand*{\th@DefTheSubparagraph}{\relax} + \if@numberSubSubSection + \newcommand*{\th@DefTheSubsubsection} + {\th@DefTheSubsection.\arabic{subsubsection}} + \else + \newcommand*{\th@DefTheSubsubsection}{\relax} + + \fi \fi \renewcommand*{\thechapter}{\th@DefTheChapter} \renewcommand*{\thesection}{\th@DefTheSection} @@ -468,12 +473,13 @@ % Figure, Table, and Equation numbering. \if@PerChptrNumbering\else - \newcounter{th@SaveFigure} - \newcounter{th@SaveTable} - \newcounter{th@SaveEquation} - \renewcommand*{\thefigure}{\arabic{figure}} - \renewcommand*{\thetable}{\arabic{table}} - \renewcommand*{\theequation}{\arabic{equation}} + \newcounter{th@SaveFigure} + \newcounter{th@SaveTable} + \newcounter{th@SaveEquation} + \renewcommand*{\thefigure}{\arabic{figure}} + \renewcommand*{\thetable}{\arabic{table}} + \renewcommand*{\theequation}{\arabic{equation}} + \fi % Enumerated List labels @@ -519,13 +525,13 @@ % are defined in setspace.sty. \renewenvironment*{verse}{\begin{th@OldVerse}\begin{singlespace}} - {\end{singlespace}\end{th@OldVerse}} + {\end{singlespace}\end{th@OldVerse}} \renewenvironment*{quotation}{\begin{th@OldQuotation} \begin{singlespace}} - {\end{singlespace}\end{th@OldQuotation}} + {\end{singlespace}\end{th@OldQuotation}} \renewenvironment*{quote}{\begin{th@OldQuote} \begin{singlespace}} - {\end{singlespace} \end{th@OldQuote}} + {\end{singlespace} \end{th@OldQuote}} % Theorems and Axioms: They must NOT be italicized. To do this % robustly, I've needed to use some in-depth TeXnology. Check out a @@ -537,46 +543,47 @@ } % Calling format: \newtheorem{}{}[]; checks for the optional arg at the end. \def\th@newtheoremTwo#1#2{ - \@ifnextchar[{\th@nuthrmO{#1}{#2}}{\th@nuthrm{#1}{#2}}%] + \@ifnextchar[{\th@nuthrmO{#1}{#2}}{\th@nuthrm{#1}{#2}}%] } % Standard call. No optional args. \def\th@nuthrm#1#2{ - \th@OldNewtheorem{th@#1}{#2} - \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} + \th@OldNewtheorem{th@#1}{#2} + \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} } % Optional arg at end. \def\th@nuthrmO#1#2[#3]{ - \th@OldNewtheorem{th@#1}{#2}[#3] - \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} - } + \th@OldNewtheorem{th@#1}{#2}[#3] + \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} +} % Optional arg in the middle. \def\th@nuthrmOM#1[#2]#3{ - \th@OldNewtheorem{th@#1}[th@#2]{#3} - \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} - } + \th@OldNewtheorem{th@#1}[th@#2]{#3} + \th@correctTheorem{end#1}{#1}{endth@#1}{th@#1} +} \def\th@execThrmOpt#1[#2]{ - \@nameuse{#1}[#2] \normalsize\normalfont + \@nameuse{#1}[#2] \normalsize\normalfont } \newcommand*{\th@correctTheorem}[4]{ - \@namedef{#1}{\@nameuse{#3}} - \@namedef{#2}{\@ifnextchar[{\th@execThrmOpt{#4}}{ %%} - \@nameuse{#4} \normalsize\normalfont} - } + \@namedef{#1}{\@nameuse{#3}} + \@namedef{#2}{\@ifnextchar[{\th@execThrmOpt{#4}}{ %%} + \@nameuse{#4} \normalsize\normalfont} + } } % APPENDIX command \newcounter{th@SectionSave} \let\th@OldAppCmd\appendix \renewcommand{\appendix}{ - \setcounter{th@SectionSave}{\value{section}} - \th@OldAppCmd - \if@NumberStdHeadings\else - \setcounter{section}{\value{th@SectionSave}} - \fi - \addtocontents{toc}{\protect\contentsline {part} - {\protect\appendixnameToC}{\protect\relax}{}} - \renewcommand*{\th@DefTheChapter}{\Alph{chapter}} - } + \setcounter{th@SectionSave}{\value{section}} + \th@OldAppCmd + \if@NumberStdHeadings\else + \setcounter{section}{\value{th@SectionSave}} + + \fi + \addtocontents{toc}{\protect\contentsline {part} + {\protect\appendixnameToC}{\protect\relax}{}} + \renewcommand*{\th@DefTheChapter}{\Alph{chapter}} +} %%%%%%%%%%%%%%% BIBLIOGRAPHY: Used to be redefined here. % Moved to permit use of different bibliography .sty and .bst files. @@ -598,11 +605,11 @@ % The second arg is the style command. % The third arg is the heading proper. \newcommand*{\th@MakeHeading}[2]{ - \protect #1 - \if@CenterHeading\begin{center}\typeout{centered}\fi - #2 - \if@CenterHeading\end{center}\fi - } + \protect #1 + \if@CenterHeading\begin{center}\typeout{centered}\fi + #2 + \if@CenterHeading\end{center}\fi +} % Makes a heading. % The entire thing is something of a mess. We want all ToC entries to @@ -626,27 +633,28 @@ % of the command. \newcommand*{\th@Heading}[6]{ - \@thInHeadingtrue - % Alter the '\the...' command. - \@namedef{the#5}{\protect#2 #6} - \if@UseStarCmd - #1*{\th@MakeHeading{\protect#2}{#4}} - \else - \ifthenelse{\equal{\th@DefArg}{#3}}{ - #1[\normalsize\normalfont#4]{ - \th@MakeHeading{\protect#2}{#4}} - }{ - #1[\normalsize\normalfont#3]{ - \th@MakeHeading{\protect#2}{#4}} - } - \fi -% Reset the '\the...' command, but don't enforce -% '\normalsize\normalfont' anywhere, as this messes up -% cross-references in footnotes. - \@namedef{the#5}{#6} - \@thInHeadingfalse - \@CenterHeadingfalse - \normalsize\normalfont + \@thInHeadingtrue + % Alter the '\the...' command. + \@namedef{the#5}{\protect#2 #6} + \if@UseStarCmd + #1*{\th@MakeHeading{\protect#2}{#4}} + \else + \ifthenelse{\equal{\th@DefArg}{#3}}{ + #1[\normalsize\normalfont#4]{ + \th@MakeHeading{\protect#2}{#4}} + }{ + #1[\normalsize\normalfont#3]{ + \th@MakeHeading{\protect#2}{#4}} + } + + \fi + % Reset the '\the...' command, but don't enforce + % '\normalsize\normalfont' anywhere, as this messes up + % cross-references in footnotes. + \@namedef{the#5}{#6} + \@thInHeadingfalse + \@CenterHeadingfalse + \normalsize\normalfont } %%%%%%%%%%% CHAPTER HEADING: @@ -666,67 +674,71 @@ % zeroing the figure, table, and equation counters only if necessary. \newcommand*{\th@PreChCmd}{ - \if@PerChptrNumbering - \relax - \else - \setcounter{th@SaveTable}{\value{table}} - \setcounter{th@SaveFigure}{\value{figure}} - \setcounter{th@SaveEquation}{\value{equation}} - \fi + \if@PerChptrNumbering + \relax + \else + \setcounter{th@SaveTable}{\value{table}} + \setcounter{th@SaveFigure}{\value{figure}} + \setcounter{th@SaveEquation}{\value{equation}} + + \fi } \newcommand*{\th@PostChCmd}{ - \if@THshortChapter - \typeout{Short Chapter (page numbered)} - \@THshortChapterfalse - \thispagestyle{myheadings} - \else - \thispagestyle{empty} - \fi - \if@PerChptrNumbering - \relax - \else - \setcounter{table}{\value{th@SaveTable}} - \setcounter{figure}{\value{th@SaveFigure}} - \setcounter{equation}{\value{th@SaveEquation}} - \fi - \normalsize\normalfont - \@UseStarCmdfalse + \if@THshortChapter + \typeout{Short Chapter (page numbered)} + \@THshortChapterfalse + \thispagestyle{myheadings} + \else + \thispagestyle{empty} + + \fi + \if@PerChptrNumbering + \relax + \else + \setcounter{table}{\value{th@SaveTable}} + \setcounter{figure}{\value{th@SaveFigure}} + \setcounter{equation}{\value{th@SaveEquation}} + + \fi + \normalsize\normalfont + \@UseStarCmdfalse } \if@chapterCaps - \newcommand*{\th@Chapter}[2][\th@DefArg]{ - \th@PreChCmd - \@UseStarCmdfalse - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} - {\uppercase\expandafter{#2}}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } - \newcommand*{\th@ChapterS}[1]{ - \th@PreChCmd - \@UseStarCmdtrue - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} - {\uppercase\expandafter{#1}}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } + \newcommand*{\th@Chapter}[2][\th@DefArg]{ + \th@PreChCmd + \@UseStarCmdfalse + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} + {\uppercase\expandafter{#2}}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } + \newcommand*{\th@ChapterS}[1]{ + \th@PreChCmd + \@UseStarCmdtrue + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} + {\uppercase\expandafter{#1}}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } \else - \newcommand*{\th@Chapter}[2][\th@DefArg]{ - \th@PreChCmd - \@UseStarCmdfalse - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} - {#2}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } - \newcommand*{\th@ChapterS}[1]{ - \th@PreChCmd - \@UseStarCmdtrue - \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} - {#1}{chapter}{\th@DefTheChapter} - \th@PostChCmd - } + \newcommand*{\th@Chapter}[2][\th@DefArg]{ + \th@PreChCmd + \@UseStarCmdfalse + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{#1} + {#2}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } + \newcommand*{\th@ChapterS}[1]{ + \th@PreChCmd + \@UseStarCmdtrue + \if@centerChapter\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldChapter}{\th@ChapterStyle}{\th@DefArg} + {#1}{chapter}{\th@DefTheChapter} + \th@PostChCmd + } + \fi %%%%%%%%% SECTION HEADING COMMANDS. We need to use the starred version @@ -738,41 +750,41 @@ \renewcommand*{\section}{\@ifstar{\th@SectionS}{\th@Section}} \newcommand*{\th@Section}[2][\th@DefArg]{ - \@UseStarCmdfalse - \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldSection}{\th@SectionStyle}{#1}{#2} - {section}{\th@DefTheSection} - \normalsize\normalfont + \@UseStarCmdfalse + \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldSection}{\th@SectionStyle}{#1}{#2} + {section}{\th@DefTheSection} + \normalsize\normalfont } \newcommand*{\th@SectionS}[1]{ - \@UseStarCmdtrue - \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi - \th@Heading{\th@OldSection}{\th@SectionStyle}{\th@DefArg} - {#1}{section}{\th@DefTheSection} - \@UseStarCmdfalse - \normalsize\normalfont + \@UseStarCmdtrue + \if@centerSection\@CenterHeadingtrue\else\@CenterHeadingfalse\fi + \th@Heading{\th@OldSection}{\th@SectionStyle}{\th@DefArg} + {#1}{section}{\th@DefTheSection} + \@UseStarCmdfalse + \normalsize\normalfont } %%%%%%%%%% SUBSECTION HEADING COMMANDS. \let\th@OldSubSection\subsection \renewcommand*{\subsection}{ - \@ifstar{\th@SubSectionS}{\th@SubSection} + \@ifstar{\th@SubSectionS}{\th@SubSection} } \newcommand*{\th@SubSection}[2][\th@DefArg]{ - \@UseStarCmdfalse - \@CenterHeadingfalse - \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} - {#1}{#2}{subsection}{\th@DefTheSubsection} - \normalsize\normalfont + \@UseStarCmdfalse + \@CenterHeadingfalse + \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} + {#1}{#2}{subsection}{\th@DefTheSubsection} + \normalsize\normalfont } \newcommand*{\th@SubSectionS}[1]{ - \@UseStarCmdtrue - \@CenterHeadingfalse - \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} - {\th@DefArg}{#1}{subsection}{\th@DefTheSubsection} - \@UseStarCmdfalse - \normalsize\normalfont + \@UseStarCmdtrue + \@CenterHeadingfalse + \th@Heading{\th@OldSubSection}{\th@SubSectionStyle} + {\th@DefArg}{#1}{subsection}{\th@DefTheSubsection} + \@UseStarCmdfalse + \normalsize\normalfont } %%%%%%%%%% SUBSUBSECTION HEADING COMMANDS. No starred version permitted. @@ -782,86 +794,89 @@ \let\th@OldSubSubSection\subsubsection \newlength{\th@SubSubSecSpc} \if@numberSubSubSection - \renewcommand*{\thesubsubsection}{\th@DefTheSubsubsection} - \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdfalse} - \setcounter{th@SecNum}{4} - \setlength{\th@SubSubSecSpc}{0.5em} + \renewcommand*{\thesubsubsection}{\th@DefTheSubsubsection} + \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdfalse} + \setcounter{th@SecNum}{4} + \setlength{\th@SubSubSecSpc}{0.5em} \else - \renewcommand*{\thesubsubsection}{\relax} - \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdtrue} - \setlength{\th@SubSubSecSpc}{0em} + \renewcommand*{\thesubsubsection}{\relax} + \newcommand*{\th@PreSubsubsecCmd}{\@UseStarCmdtrue} + \setlength{\th@SubSubSecSpc}{0em} + \fi \newif\if@shutoffSSSect \@shutoffSSSectfalse \if@inlineSubSubSection -\renewcommand*{\subsubsection}[2][\th@DefArg]{ - \refstepcounter{subsubsection} - \vspace{4\parsep} - \underline{% - \@thInHeadingtrue\th@OtherSecHeadStyles% - \thesubsubsection\hspace{\th@SubSubSecSpc}#2}\hspace{2mm} - \ignorespaces\normalsize\normalfont - } + \renewcommand*{\subsubsection}[2][\th@DefArg]{ + \refstepcounter{subsubsection} + \vspace{4\parsep} + \underline{% + \@thInHeadingtrue\th@OtherSecHeadStyles% + \thesubsubsection\hspace{\th@SubSubSecSpc}#2}\hspace{2mm} + \ignorespaces\normalsize\normalfont + } \else -\renewcommand*{\subsubsection}[2][\th@DefArg]{ - \th@PreSubsubsecCmd - \@CenterHeadingfalse - \th@Heading{\th@OldSubSubSection}{\th@OtherSecHeadStyles} - {\th@DefArg}{#2}{subsubsection}{\th@DefTheSubsubsection} - \@UseStarCmdfalse\normalsize\normalfont - } + \renewcommand*{\subsubsection}[2][\th@DefArg]{ + \th@PreSubsubsecCmd + \@CenterHeadingfalse + \th@Heading{\th@OldSubSubSection}{\th@OtherSecHeadStyles} + {\th@DefArg}{#2}{subsubsection}{\th@DefTheSubsubsection} + \@UseStarCmdfalse\normalsize\normalfont + } + \fi % We don't need to do much for paragraph and subparagraph. We won't % even define a *-version or permit entries in the ToC. \if@AllHeadings - \let\th@OldParagraph\paragraph - \renewcommand*{\paragraph}[2][\th@DefArg]{ - \@UseStarCmdfalse - \@CenterHeadingfalse - \th@Heading{\th@OldParagraph} - {\@thInHeadingtrue\th@OtherSecHeadStyles} - {\th@DefArg}{\underline{#2}}{paragraph} - {\hspace*{\parindent}\th@DefTheParagraph} - \@UseStarCmdfalse - \@namedef{theparagraph}{\th@DefTheParagraph - \protect\normalsize\protect\normalfont} - \normalsize\normalfont - } - \let\th@OldSubParagraph\subparagraph - \renewcommand*{\subparagraph}[2][\th@DefArg]{ - \@UseStarCmdfalse - \@CenterHeadingfalse - \th@Heading{\th@OldSubParagraph} - {\@thInHeadingtrue\th@OtherSecHeadStyles} - {\th@DefArg}{\underline{#2}}{subparagraph} - {\th@DefTheSubparagraph} - \@UseStarCmdfalse - \@namedef{thesubparagraph}{\th@DefTheSubparagraph - \protect\normalsize\protect\normalfont} - \normalsize\normalfont - } - \setcounter{th@SecNum}{5} + \let\th@OldParagraph\paragraph + \renewcommand*{\paragraph}[2][\th@DefArg]{ + \@UseStarCmdfalse + \@CenterHeadingfalse + \th@Heading{\th@OldParagraph} + {\@thInHeadingtrue\th@OtherSecHeadStyles} + {\th@DefArg}{\underline{#2}}{paragraph} + {\hspace*{\parindent}\th@DefTheParagraph} + \@UseStarCmdfalse + \@namedef{theparagraph}{\th@DefTheParagraph + \protect\normalsize\protect\normalfont} + \normalsize\normalfont + } + \let\th@OldSubParagraph\subparagraph + \renewcommand*{\subparagraph}[2][\th@DefArg]{ + \@UseStarCmdfalse + \@CenterHeadingfalse + \th@Heading{\th@OldSubParagraph} + {\@thInHeadingtrue\th@OtherSecHeadStyles} + {\th@DefArg}{\underline{#2}}{subparagraph} + {\th@DefTheSubparagraph} + \@UseStarCmdfalse + \@namedef{thesubparagraph}{\th@DefTheSubparagraph + \protect\normalsize\protect\normalfont} + \normalsize\normalfont + } + \setcounter{th@SecNum}{5} \else - \renewcommand*{\paragraph}[2][\th@DefArg]{ - {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} - \renewcommand*{\subparagraph}[2][\th@DefArg]{ - {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} + \renewcommand*{\paragraph}[2][\th@DefArg]{ + {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} + \renewcommand*{\subparagraph}[2][\th@DefArg]{ + {\normalfont\normalsize\bfseries #2}\hspace*{0.89em}} + \fi %%%%%%%%%% COMMANDS CHANGED FOR THIS CLASS %%%%%% Unavailable commands \renewcommand*{\theindex}{\ClassWarning{thesis} - {Indexing not available in this class.}} + {Indexing not available in this class.}} \renewcommand*{\twocolumn}{\ClassWarning{thesis} - {Twocolumn not available in this class.}} + {Twocolumn not available in this class.}} \renewcommand*{\thepart}{\ClassWarning{thesis} - {``thepart'' not available in this class.}} + {``thepart'' not available in this class.}} \renewcommand*{\part}{\ClassWarning{thesis} - {``thepart'' not available in this class.}} + {``thepart'' not available in this class.}} %%%%%% New commands % This forces a page number on the first page of a chapter, etc. \newcommand*{\forcepageno}{\thispagestyle{myheadings}} @@ -874,70 +889,70 @@ % Default values of storage variables. Emits an error message. % This part of the class is long... \newcommand*{\th@title}{ - \ClassError{thesis}{ - You must specify a title!} - {Use the \protect\title{} command in the preamble.} + \ClassError{thesis}{ + You must specify a title!} + {Use the \protect\title{} command in the preamble.} } \newcommand*{\th@fwdname}{ - \ClassError{thesis}{ - You must specify your name!} - {Use the \protect\author{}{} command in the \MessageBreak - preamble. The first arg is your first name and \MessageBreak - middle initial. The second arg is your last name.} + \ClassError{thesis}{ + You must specify your name!} + {Use the \protect\author{}{} command in the \MessageBreak + preamble. The first arg is your first name and \MessageBreak + middle initial. The second arg is your last name.} } \newcommand*{\th@revname}{ - \ClassError{thesis}{ - You must specify your name!} - {Use the \protect\author{}{} command in the \MessageBreak - preamble. The first arg is your first name and \MessageBreak - middle initial. The second arg is your last name.} + \ClassError{thesis}{ + You must specify your name!} + {Use the \protect\author{}{} command in the \MessageBreak + preamble. The first arg is your first name and \MessageBreak + middle initial. The second arg is your last name.} } \newcommand*{\th@deptname}{ - \ClassError{thesis}{ - You must specify the name of the department \MessageBreak - granting your degree and what type of \MessageBreak - organization it is within the University.} - {Use the \protect\dept{}{} command in the \MessageBreak - preamble. The second arg is the name of the \MessageBreak - department. The first arg is the department's \MessageBreak - official designation, e.g. 'College of', \MessageBreak - 'Department of', 'School of', etc.} + \ClassError{thesis}{ + You must specify the name of the department \MessageBreak + granting your degree and what type of \MessageBreak + organization it is within the University.} + {Use the \protect\dept{}{} command in the \MessageBreak + preamble. The second arg is the name of the \MessageBreak + department. The first arg is the department's \MessageBreak + official designation, e.g. 'College of', \MessageBreak + 'Department of', 'School of', etc.} } \newcommand*{\th@deptorg}{ - \ClassError{thesis}{ - You must specify the name of the department \MessageBreak - granting your degree and what type of \MessageBreak - organization it is within the University.} - {Use the \protect\dept{}{} command in the \MessageBreak - preamble. The second arg is the name of the \MessageBreak - department. The first arg is the department's \MessageBreak - official designation, e.g. 'College of', \MessageBreak - 'Department of', 'School of', etc.} + \ClassError{thesis}{ + You must specify the name of the department \MessageBreak + granting your degree and what type of \MessageBreak + organization it is within the University.} + {Use the \protect\dept{}{} command in the \MessageBreak + preamble. The second arg is the name of the \MessageBreak + department. The first arg is the department's \MessageBreak + official designation, e.g. 'College of', \MessageBreak + 'Department of', 'School of', etc.} } \newcommand*{\th@advisor}{ - \ClassError{thesis}{ - You must specify your research advisor's name \MessageBreak - and full title.} - {Use the \protect\advisor{}{} command in the \MessageBreak - preamble. The first arg is your advisor's \MessageBreak - full title. The second arg is your advisor's \MessageBreak - name.} + \ClassError{thesis}{ + You must specify your research advisor's name \MessageBreak + and full title.} + {Use the \protect\advisor{}{} command in the \MessageBreak + preamble. The first arg is your advisor's \MessageBreak + full title. The second arg is your advisor's \MessageBreak + name.} } \newcommand*{\th@advisortitle}{ - \ClassError{thesis}{ - You must specify your research advisor's name \MessageBreak - and full title.} - {Use the \protect\advisor{}{} command in the \MessageBreak - preamble. The first arg is your advisor's \MessageBreak - full title. The second arg is your advisor's \MessageBreak - name.} + \ClassError{thesis}{ + You must specify your research advisor's name \MessageBreak + and full title.} + {Use the \protect\advisor{}{} command in the \MessageBreak + preamble. The first arg is your advisor's \MessageBreak + full title. The second arg is your advisor's \MessageBreak + name.} } \newcommand*{\th@reader}{ - \ClassError{thesis}{ - You must specify the name of the other \MessageBreak - committee member who will be signing your \MessageBreak - thesis.} - {Use the \protect\reader{} command in the preamble.} + \ClassError{thesis}{ + You must specify the name of the other \MessageBreak + committee member who will be signing your \MessageBreak + thesis.} + {Use the \protect\reader{} command in the preamble.} } \newcommand*{\th@readerThree}{none} % optional \newcommand*{\th@readerFour}{none} % optional @@ -945,53 +960,53 @@ \newcommand*{\th@readerSix}{none} % optional \newcommand*{\th@IRBprotocol}{none} % optional \newcommand*{\th@fulldegree}{ - \ClassError{thesis}{ - You must specify the type of degree you are \MessageBreak - receiving.} - {Use the \protect\degree{}{} command in the \MessageBreak - preamble. The first arg is the unabbreviated \MessageBreak - name of the degree itself, e.g. \MessageBreak - 'Doctor of Philosophy'. The second arg is the \MessageBreak - degree abbreviation followed by the subject, e.g.\MessageBreak - 'Ph. D., Biology'.} + \ClassError{thesis}{ + You must specify the type of degree you are \MessageBreak + receiving.} + {Use the \protect\degree{}{} command in the \MessageBreak + preamble. The first arg is the unabbreviated \MessageBreak + name of the degree itself, e.g. \MessageBreak + 'Doctor of Philosophy'. The second arg is the \MessageBreak + degree abbreviation followed by the subject, e.g.\MessageBreak + 'Ph. D., Biology'.} } \newcommand*{\th@degree}{ - \ClassError{thesis}{ - You must specify the type of degree you are \MessageBreak - receiving.} - {Use the \protect\degree{}{} command in the \MessageBreak - preamble. The first arg is the unabbreviated \MessageBreak - name of the degree itself, e.g. \MessageBreak - 'Doctor of Philosophy'. The second arg is the \MessageBreak - degree abbreviation followed by the subject, \MessageBreak - e.g. 'Ph. D., Biology'.} + \ClassError{thesis}{ + You must specify the type of degree you are \MessageBreak + receiving.} + {Use the \protect\degree{}{} command in the \MessageBreak + preamble. The first arg is the unabbreviated \MessageBreak + name of the degree itself, e.g. \MessageBreak + 'Doctor of Philosophy'. The second arg is the \MessageBreak + degree abbreviation followed by the subject, \MessageBreak + e.g. 'Ph. D., Biology'.} } \newcommand{\th@otherdegrees}{ - \ClassError{thesis}{ - You must specify other degrees you hold!} - {Use the \protect\otherdegrees{} command in the \MessageBreak - preamble. Break each line using the \protect\\ \MessageBreak - command.} + \ClassError{thesis}{ + You must specify other degrees you hold!} + {Use the \protect\otherdegrees{} command in the \MessageBreak + preamble. Break each line using the \protect\\ \MessageBreak + command.} } \newcommand{\th@abstractStash}{ - \ClassError{thesis}{ - You must specify an abstract!} - {Use the \protect\abstractpage[]{} command in the \MessageBreak - preamble. If your abstract runs over a page, \MessageBreak - use the optional argument with the word 'long'.} + \ClassError{thesis}{ + You must specify an abstract!} + {Use the \protect\abstractpage[]{} command in the \MessageBreak + preamble. If your abstract runs over a page, \MessageBreak + use the optional argument with the word 'long'.} } \newcommand*{\th@degreeyear}{\number\the\year} \newcommand*{\th@signature}[1]{ \begin{center} - \normalsize - \vspace*{16mm} % works well? - \vrule width 80mm height 0.2mm\\ - #1 \end{center} + \normalsize + \vspace*{16mm} % works well? + \vrule width 80mm height 0.2mm\\ + #1 \end{center} } \newcommand*{\th@dateline}{ - \vspace*{9mm} - \begin{flushright} - Date~{\vrule width 35mm height 0.2mm} - \end{flushright} + \vspace*{9mm} + \begin{flushright} + Date~{\vrule width 35mm height 0.2mm} + \end{flushright} } \newcommand{\th@AbstractPageStyle}{\relax} \newcommand{\th@dedicationStash}{\relax} @@ -1023,217 +1038,217 @@ % The base commands that make all of the prologue pages. \newcommand*{\th@Titlepage}{ - \thispagestyle{empty} - \@thInHeadingtrue - \null\vfill - \begin{list}{}{\setlength{\leftmargin}{0.8in} - \setlength{\rightmargin}{0.8in}\sloppy} - \centering\item[] - {\th@ChapterStyle - \if@chapterCaps - \uppercase\expandafter{\th@title}\\ - \else - \th@title\\ - \fi} - by\\ - {\th@OtherSecHeadStyles - \if@chapterCaps - \uppercase\expandafter{\th@fwdname}\\ - \else - \th@fwdname\\ - \fi} - \th@otherdegrees\\ - \end{list} - \vfill - \begin{center} - A thesis submitted to the\\ - Faculty of the Graduate School of the\\ - University of Colorado in partial fulfillment\\ - of the requirements for the degree of\\ - \th@fulldegree\\ - \th@deptorg\ \th@deptname\\ - \ \th@degreeyear \\ - \end{center} - \begin{flushright} - \vfill - % List committee members on title page - Committee Members:\\ - \th@advisor, Chair\\ % REQUIRED - \th@reader\\ % REQUIRED - \ifthenelse{\equal{\th@readerThree}{none}}{\relax} - {\th@readerThree\\} % optional - \ifthenelse{\equal{\th@readerFour}{none}}{\relax} - {\th@readerFour\\} % optional - \ifthenelse{\equal{\th@readerFive}{none}}{\relax} - {\th@readerFive\\} % optional - \ifthenelse{\equal{\th@readerSix}{none}}{\relax} - {\th@readerSix\\} % optional - \end{flushright} - \@thInHeadingfalse - \vfill + \thispagestyle{empty} + \@thInHeadingtrue + \null\vfill + \begin{list}{}{\setlength{\leftmargin}{0.8in} + \setlength{\rightmargin}{0.8in}\sloppy} + \centering\item[] + {\th@ChapterStyle + \if@chapterCaps + \uppercase\expandafter{\th@title}\\ + \else + \th@title\\ + \fi} + by\\ + {\th@OtherSecHeadStyles + \if@chapterCaps + \uppercase\expandafter{\th@fwdname}\\ + \else + \th@fwdname\\ + \fi} + \th@otherdegrees\\ + \end{list} + \vfill + \begin{center} + A thesis submitted to the\\ + Faculty of the Graduate School of the\\ + University of Colorado in partial fulfillment\\ + of the requirements for the degree of\\ + \th@fulldegree\\ + \th@deptorg\ \th@deptname\\ + \ \th@degreeyear \\ + \end{center} + \begin{flushright} + \vfill + % List committee members on title page + Committee Members:\\ + \th@advisor, Chair\\ % REQUIRED + \th@reader\\ % REQUIRED + \ifthenelse{\equal{\th@readerThree}{none}}{\relax} + {\th@readerThree\\} % optional + \ifthenelse{\equal{\th@readerFour}{none}}{\relax} + {\th@readerFour\\} % optional + \ifthenelse{\equal{\th@readerFive}{none}}{\relax} + {\th@readerFive\\} % optional + \ifthenelse{\equal{\th@readerSix}{none}}{\relax} + {\th@readerSix\\} % optional + \end{flushright} + \@thInHeadingfalse + \vfill } \newcommand*{\th@Approvalpage}{ - \singlespacing - \clearpage - \thispagestyle{empty} - \vspace*{\fill} - \begin{center} - This thesis entitled:\\ - \th@title\\ - written by\ - \th@fwdname\\ - has been approved for the\ - \th@deptorg\ - \th@deptname - \end{center} - \vspace*{1mm} - \th@signature{\th@advisortitle\ \th@advisor} - \th@signature{\th@reader} % REQUIRED. - \ifthenelse{\equal{\th@readerThree}{none}}{\relax} - {\th@signature{\th@readerThree}} % optional - \ifthenelse{\equal{\th@readerFour}{none}}{\relax} - {\th@signature{\th@readerFour}} % optional - \ifthenelse{\equal{\th@readerFive}{none}}{\relax} - {\th@signature{\th@readerFive}} % optional - \ifthenelse{\equal{\th@readerSix}{none}}{\relax} - {\th@signature{\th@readerSix}} % optional - \th@dateline - \vspace*{\fill} - \begin{center} - The final copy of this thesis has been examined by - the signatories, and we find that both the content - and the form meet acceptable presentation standards - of scholarly work in the above mentioned discipline. - \ifthenelse{\equal{\th@IRBprotocol}{none}}{\relax} - {\par\vspace*{7mm}IRB protocol \#{\th@IRBprotocol}} - \end{center} - \vspace*{\fill} + \singlespacing + \clearpage + \thispagestyle{empty} + \vspace*{\fill} + \begin{center} + This thesis entitled:\\ + \th@title\\ + written by\ + \th@fwdname\\ + has been approved for the\ + \th@deptorg\ + \th@deptname + \end{center} + \vspace*{1mm} + \th@signature{\th@advisortitle\ \th@advisor} + \th@signature{\th@reader} % REQUIRED. + \ifthenelse{\equal{\th@readerThree}{none}}{\relax} + {\th@signature{\th@readerThree}} % optional + \ifthenelse{\equal{\th@readerFour}{none}}{\relax} + {\th@signature{\th@readerFour}} % optional + \ifthenelse{\equal{\th@readerFive}{none}}{\relax} + {\th@signature{\th@readerFive}} % optional + \ifthenelse{\equal{\th@readerSix}{none}}{\relax} + {\th@signature{\th@readerSix}} % optional + \th@dateline + \vspace*{\fill} + \begin{center} + The final copy of this thesis has been examined by + the signatories, and we find that both the content + and the form meet acceptable presentation standards + of scholarly work in the above mentioned discipline. + \ifthenelse{\equal{\th@IRBprotocol}{none}}{\relax} + {\par\vspace*{7mm}IRB protocol \#{\th@IRBprotocol}} + \end{center} + \vspace*{\fill} } \newcommand{\th@Abstractpage}{ - \clearpage - \th@AbstractPageStyle - \doublespacing % 1998 revision of Grad School Specs - \begin{list}{}{\setlength{\leftmargin}{2em} - \setlength{\itemindent}{-2em} - \setlength{\topsep}{0pt} - \setlength{\itemsep}{0pt}} - \item \th@revname\ (\th@degree) - \item \th@title - \item Thesis directed by \th@advisortitle\ \th@advisor - \end{list} - \par - \vspace*{4\parsep} -\begin{center} - \textbf{\th@ChapHead{Abstract}} - \end{center} - \th@abstractStash % finally, the actual abstract + \clearpage + \th@AbstractPageStyle + \doublespacing % 1998 revision of Grad School Specs + \begin{list}{}{\setlength{\leftmargin}{2em} + \setlength{\itemindent}{-2em} + \setlength{\topsep}{0pt} + \setlength{\itemsep}{0pt}} + \item \th@revname\ (\th@degree) + \item \th@title + \item Thesis directed by \th@advisortitle\ \th@advisor + \end{list} + \par + \vspace*{4\parsep} + \begin{center} + \textbf{\th@ChapHead{Abstract}} + \end{center} + \th@abstractStash % finally, the actual abstract } \newcommand{\th@Dedicationpage}{ - \if@makeDedication - \clearpage - \thispagestyle{empty} - \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} - }{\vfill}{\chapter*{\th@dedicationTitleStash}} - \th@dedicationStash - \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} - }{\vfill}{\relax} - \fi + \if@makeDedication + \clearpage + \thispagestyle{empty} + \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} + }{\vfill}{\chapter*{\th@dedicationTitleStash}} + \th@dedicationStash + \ifthenelse{\equal{\th@DefArg}{\th@dedicationTitleStash} + }{\vfill}{\relax} + \fi } \newcommand{\th@Acknowledgementpage}{ - \if@makeAcknowledgements - \clearpage - \chapter*{Acknowledgements} - {\doublespacing - \th@acknowledgementsStash} - \fi + \if@makeAcknowledgements + \clearpage + \chapter*{Acknowledgements} + {\doublespacing + \th@acknowledgementsStash} + \fi } \newcommand{\th@ToCpage}{ -% Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \@THshortChapterfalse - \if@shortToC - \@THshortChaptertrue - \typeout{Making Short ToC...} - \fi - \@thInHeadingfalse - {\doublespacing - \tableofcontents} -% Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \@THshortChapterfalse + \if@shortToC + \@THshortChaptertrue + \typeout{Making Short ToC...} + \fi + \@thInHeadingfalse + {\doublespacing + \tableofcontents} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoTpage}{ -% Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \glsunsetall - \@THshortChapterfalse - \if@makenoLoT - \typeout{Skipping LoT...} - \else - \if@shortLoT - \@THshortChaptertrue - \typeout{Making Short LoT...} - \fi - {\doublespacing - \listoftables} - \fi -\glsresetall - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \glsunsetall + \@THshortChapterfalse + \if@makenoLoT + \typeout{Skipping LoT...} + \else + \if@shortLoT + \@THshortChaptertrue + \typeout{Making Short LoT...} + \fi + {\doublespacing + \listoftables} + \fi + \glsresetall + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoFpage}{ -% Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \glsunsetall - \@THshortChapterfalse - \if@makenoLoF - \typeout{Skipping LoF...} - \else - \if@shortLoF - \@THshortChaptertrue - \typeout{Making Short LoF...} - \fi - {\doublespacing - \listoffigures} - \fi -\glsresetall - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \glsunsetall + \@THshortChapterfalse + \if@makenoLoF + \typeout{Skipping LoF...} + \else + \if@shortLoF + \@THshortChaptertrue + \typeout{Making Short LoF...} + \fi + {\doublespacing + \listoffigures} + \fi + \glsresetall + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoLpage}{ - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} - \@THshortChapterfalse - \if@makenoLoL - \typeout{Skipping LoL...} - \else - \if@shortLoL - \@THshortChaptertrue - \typeout{Making Short LoL...} - \fi - {\doublespacing - \lstlistoflistings} - \fi - % Hyperlink color of glossary links - \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{blue}{##1}} + \@THshortChapterfalse + \if@makenoLoL + \typeout{Skipping LoL...} + \else + \if@shortLoL + \@THshortChaptertrue + \typeout{Making Short LoL...} + \fi + {\doublespacing + \lstlistoflistings} + \fi + % Hyperlink color of glossary links + \renewcommand*{\glstextformat}[1]{\textcolor{darkgray}{##1}} } \newcommand{\th@LoApage}{ - \@THshortChapterfalse - \if@makenoLoA - \typeout{Skipping LoA...} - \else - \if@shortLoA - \@THshortChaptertrue - \typeout{Making Short LoA...} - \fi - {\singlespacing - % list of acronyms + \@THshortChapterfalse + \if@makenoLoA + \typeout{Skipping LoA...} + \else + \if@shortLoA + \@THshortChaptertrue + \typeout{Making Short LoA...} + \fi + {\singlespacing + % list of acronyms \printglossary[type=\acronymtype,style=long,nonumberlist]} - \fi + \fi } @@ -1241,49 +1256,49 @@ % This performs the actual generation of the prologue \newcounter{th@storepage} \newcommand{\th@MakeThesisPrologue}{ - \if@makePrologue - \pagenumbering{roman} - \typeout{Making Title Page} - \th@Titlepage - % Note: Approval Page is no longer required, but - % enabled for completeness for now. - \typeout{Making Approval Page} - \th@Approvalpage - \typeout{Making Abstract Page} - \th@Abstractpage - \typeout{Making Dedication Page} - \th@Dedicationpage - \typeout{Making Acknowledgement Page} - \th@Acknowledgementpage - \setcounter{th@storepage}{\value{page}} - \typeout{Making ToC Page} - \th@ToCpage - \typeout{Making LoT Page} - \th@LoTpage - \typeout{Making LoF Page} - \th@LoFpage - \typeout{Making LoL Page} - \th@LoLpage - \typeout{Making LoA Page} - \th@LoApage - \fi + \if@makePrologue + \pagenumbering{roman} + \typeout{Making Title Page} + \th@Titlepage + % Note: Approval Page is no longer required, but + % enabled for completeness for now. + % \typeout{Making Approval Page} + % \th@Approvalpage + \typeout{Making Abstract Page} + \th@Abstractpage + \typeout{Making Dedication Page} + \th@Dedicationpage + \typeout{Making Acknowledgement Page} + \th@Acknowledgementpage + \setcounter{th@storepage}{\value{page}} + \typeout{Making ToC Page} + \th@ToCpage + \typeout{Making LoT Page} + \th@LoTpage + \typeout{Making LoF Page} + \th@LoFpage + \typeout{Making LoL Page} + \th@LoLpage + \typeout{Making LoA Page} + \th@LoApage + \fi } % Make the generator-command the very first command of the document. \let\th@OldBeginDocument\document \renewcommand*{\document}{ - \th@OldBeginDocument - \th@MakeThesisPrologue - \typeout{} - \typeout{} - \typeout{-------------------Beginning Body----------------------} - \typeout{} - \typeout{} - \doublespacing - \clearpage - \pagenumbering{arabic} - \@THshortChapterfalse + \th@OldBeginDocument + \th@MakeThesisPrologue + \typeout{} + \typeout{} + \typeout{-------------------Beginning Body----------------------} + \typeout{} + \typeout{} + \doublespacing + \clearpage + \pagenumbering{arabic} + \@THshortChapterfalse } %%%%%%%%% USER COMMANDS FOR CONTROLLING THE PROLOGUE: @@ -1297,75 +1312,75 @@ \newcommand*{\degreeyear}[1]{\th@StoreIn{\th@degreeyear}{#1}} \newcommand{\otherdegrees}[1]{\th@StoreIn{\th@otherdegrees}{#1}} \newcommand{\acknowledgements}[1]{ - \@makeAcknowledgementstrue - \th@StoreIn{\th@acknowledgementsStash}{#1} + \@makeAcknowledgementstrue + \th@StoreIn{\th@acknowledgementsStash}{#1} } \newcommand{\dedication}[2][\th@DefArg]{ - \@makeDedicationtrue - \th@StoreIn{\th@dedicationTitleStash}{#1} - \th@StoreIn{\th@dedicationStash}{#2} + \@makeDedicationtrue + \th@StoreIn{\th@dedicationTitleStash}{#1} + \th@StoreIn{\th@dedicationStash}{#2} } \renewcommand*{\author}[2]{ - \th@StoreIn{\th@fwdname}{#1 #2} - \th@StoreIn{\th@revname}{#2, #1} + \th@StoreIn{\th@fwdname}{#1 #2} + \th@StoreIn{\th@revname}{#2, #1} } \newcommand*{\degree}[2]{ - \th@StoreIn{\th@fulldegree}{#1} - \th@StoreIn{\th@degree}{#2} + \th@StoreIn{\th@fulldegree}{#1} + \th@StoreIn{\th@degree}{#2} } \newcommand*{\advisor}[2]{ - \th@StoreIn{\th@advisor}{#2} - \th@StoreIn{\th@advisortitle}{#1} + \th@StoreIn{\th@advisor}{#2} + \th@StoreIn{\th@advisortitle}{#1} } \newcommand*{\dept}[2]{ - \th@StoreIn{\th@deptorg}{#1} - \th@StoreIn{\th@deptname}{#2} + \th@StoreIn{\th@deptorg}{#1} + \th@StoreIn{\th@deptname}{#2} } \renewcommand{\abstract}[2][long]{ - \ifthenelse{\equal{#1}{short}}{\relax}{ - \th@StoreIn{\th@AbstractPageStyle}{\thispagestyle{empty}} - } - \th@StoreIn{\th@abstractStash}{#2} + \ifthenelse{\equal{#1}{short}}{\relax}{ + \th@StoreIn{\th@AbstractPageStyle}{\thispagestyle{empty}} + } + \th@StoreIn{\th@abstractStash}{#2} } \newcommand*{\SuspendPrologue}{ - \@makeProloguefalse - \typeout{No prologue pages printed.} + \@makeProloguefalse + \typeout{No prologue pages printed.} } \newcommand*{\emptyLoF}{ - \@makenoLoFtrue - \typeout{No LoF printed} + \@makenoLoFtrue + \typeout{No LoF printed} } \newcommand*{\emptyLoT}{ - \@makenoLoTtrue - \typeout{No LoT printed} + \@makenoLoTtrue + \typeout{No LoT printed} } \newcommand*{\emptyLoL}{ - \@makenoLoLtrue - \typeout{No LoL printed} + \@makenoLoLtrue + \typeout{No LoL printed} } \newcommand*{\emptyLoA}{ - \@makenoLoAtrue - \typeout{No LoA printed} + \@makenoLoAtrue + \typeout{No LoA printed} } \newcommand*{\ToCisShort}{ - \@shortToCtrue - \typeout{Putting page number on short ToC} + \@shortToCtrue + \typeout{Putting page number on short ToC} } \newcommand*{\LoFisShort}{ - \@shortLoFtrue - \typeout{Putting page number on short LoF} + \@shortLoFtrue + \typeout{Putting page number on short LoF} } \newcommand*{\LoTisShort}{ - \@shortLoTtrue - \typeout{Putting page number on short LoT} + \@shortLoTtrue + \typeout{Putting page number on short LoT} } \newcommand*{\LoLisShort}{ - \@shortLoLtrue - \typeout{Putting page number on short LoL} + \@shortLoLtrue + \typeout{Putting page number on short LoL} } \newcommand*{\LoAisShort}{ - \@shortLoAtrue - \typeout{Putting page number on short LoA} + \@shortLoAtrue + \typeout{Putting page number on short LoA} } \endinput