From 326afd428d5323af5cfcf8b7ba131ed688002850 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Aug 2021 21:26:10 +0000 Subject: ut-thesis (26aug21) git-svn-id: svn://tug.org/texlive/trunk@60331 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/ut-thesis/ut-thesis.cls | 74 ++++++++++------------ 1 file changed, 32 insertions(+), 42 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ut-thesis') diff --git a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls index e96534d14d4..dd6adfafd26 100644 --- a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls +++ b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls @@ -51,43 +51,35 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ut-thesis} -[2021/07/20 v3.0.5 University of Toronto thesis class] -\newcommand{\draftmarkstyle}{\scriptsize\sffamily} -\DeclareOption{draft}{% - \PassOptionsToClass{\CurrentOption}{book} - \AtEndOfClass{ - \AtBeginShipout{\AtBeginShipoutUpperLeft{% - \draftmarkstyle - \put(+0.125in, -0.125in-\f@size pt ){\rlap{DRAFT}} - \put(-0.125in+\paperwidth,-0.125in-\f@size pt ){\llap{DRAFT}} - \put(+0.125in, +0.125in-\paperheight){\rlap{DRAFT}} - \put(-0.125in+\paperwidth,+0.125in-\paperheight){\llap{DRAFT}} - \put(+0.5\paperwidth,+0.125in-\paperheight)% - {\makebox[0in][c]{\today}} -}}}} -\newlength{\margin@v} -\newlength{\margin@xhi}\setlength{\margin@xhi}{0.5in} -\newlength{\margin@xho}\setlength{\margin@xho}{0.0in} -\DeclareOption{narrowmargins} {\setlength{\margin@v}{0.75in}} -\DeclareOption{normalmargins} {\setlength{\margin@v}{1.00in}} -\DeclareOption{widemargins} {\setlength{\margin@v}{1.25in}} -\DeclareOption{extrawidemargins}{\setlength{\margin@v}{1.50in}} -\DeclareOption{equalmargins}% - {\setlength{\margin@xho}{0.5\margin@xhi} - \setlength{\margin@xhi}{0.5\margin@xhi}} +[2021/08/26 v3.1.5 University of Toronto thesis class] +\newif\ifmargins@equal +\newlength{\margin@base} +\newlength{\margin@offset} +\setlength{\margin@offset}{0.5in} \AtEndOfClass{ - \setlength{\leftmargin}{\dimexpr\margin@v+\margin@xhi} - \setlength{\rightmargin}{\dimexpr\margin@v+\margin@xho} + \ifmargins@equal + \setlength{\leftmargin}{\dimexpr\margin@base+.5\margin@offset} + \setlength{\rightmargin}{\dimexpr\margin@base+.5\margin@offset} + \else + \setlength{\leftmargin}{\dimexpr\margin@base+\margin@offset} + \setlength{\rightmargin}{\dimexpr\margin@base} + \fi \geometry{ - top = \margin@v, - bottom = \margin@v, + top = \margin@base, + bottom = \margin@base, inner = \leftmargin, outer = \rightmargin, - headsep = \dimexpr 0.5\margin@v - \headheight, - footskip = \dimexpr 0.5\margin@v, - marginparwidth = \dimexpr \rightmargin - 0.25in, + headsep = \dimexpr0.5\margin@base-\headheight, + footskip = \dimexpr0.5\margin@base, + marginparwidth = \dimexpr\rightmargin-0.25in, marginparsep = 0.125in, }} +\DeclareOption{narrowmargins} {\setlength{\margin@base}{0.75in}} +\DeclareOption{normalmargins} {\setlength{\margin@base}{1.00in}} +\DeclareOption{widemargins} {\setlength{\margin@base}{1.25in}} +\DeclareOption{extrawidemargins}{\setlength{\margin@base}{1.50in}} +\DeclareOption{equalmargins}{\margins@equaltrue} +\DeclareOption{unequalmargins}{\margins@equalfalse} \DeclareOption{doublespacing}{% \AtEndOfClass{\doublespacing} } @@ -97,27 +89,25 @@ \DeclareOption{singlespacing}{% \AtEndOfClass{\singlespacing} } +\DeclareOption{oneside}{\PassOptionsToClass{oneside}{book}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} -\ExecuteOptions{letterpaper} % book -\ExecuteOptions{normalmargins,onehalfspacing,chapterhead} % ut-thesis -\ProcessOptions +\ExecuteOptions{onehalfspacing,normalmargins,equalmargins,oneside} +\ProcessOptions\relax \LoadClass{book} -\RequirePackage{picture} % for draft mode -\RequirePackage{atbegshi} % for draft mode \RequirePackage{geometry} % for margins etc. \RequirePackage{setspace} % for line spacing \renewcommand*{\author} [1]{\gdef\@author{#1}} \renewcommand*{\title} [1]{\gdef\@title{#1}} \newcommand*{\degree} [1]{\gdef\@degree{#1}} -\newcommand*{\department}[1]{\gdef\@department{#1}} \newcommand*{\gradyear} [1]{\gdef\@gradyear{#1}} +\newcommand*{\department}[2][Department of]% + {\gdef\@deptpre{#1}\gdef\@deptname{#2}} \author {(author)} \title {(title)} \degree {(degree)} -\department{(department)} \gradyear {(gradyear)} -\newcommand{\@romanskip}[1]{\@roman{\if@twoside\numexpr#1-1\else#1\fi}} -\g@addto@macro\frontmatter{\pagenumbering{romanskip}\pagestyle{plain}} +\department{(department)} +\g@addto@macro\frontmatter{\pagenumbering{roman}\pagestyle{plain}} \g@addto@macro\mainmatter {\pagenumbering{arabic}\pagestyle{headings}} \renewcommand*{\maketitle}% {\thispagestyle{empty} @@ -135,7 +125,7 @@ \vfill A thesis submitted in conformity with the requirements\\ for the degree of {\@degree}\\[1ex] - Graduate Department of {\@department}\\ + {\@deptpre} {\@deptname}\\ University of Toronto\\ \vfill {\copyright} Copyright {\@gradyear} by {\@author} @@ -149,7 +139,7 @@ {\@title}\\[2ex] {\@author}\\ {\@degree}\\[1ex] - Graduate Department of {\@department}\\ + {\@deptpre} {\@deptname}\\ University of Toronto\\ {\@gradyear}\\ \section*{Abstract} -- cgit v1.2.3