From 2942fe8e7918e7f0038e2dead9a7d17ce4b33a9f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Jun 2017 21:37:50 +0000 Subject: msu-thesis (23jun17) git-svn-id: svn://tug.org/texlive/trunk@44676 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/msu-thesis/gb4e-compat.tex | 45 ------ .../texmf-dist/tex/latex/msu-thesis/msu-thesis.cls | 154 ++++++++++++++------- 2 files changed, 103 insertions(+), 96 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/msu-thesis/gb4e-compat.tex (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/msu-thesis/gb4e-compat.tex b/Master/texmf-dist/tex/latex/msu-thesis/gb4e-compat.tex deleted file mode 100644 index 9aca4598da2..00000000000 --- a/Master/texmf-dist/tex/latex/msu-thesis/gb4e-compat.tex +++ /dev/null @@ -1,45 +0,0 @@ -% Compatibility code for footnote text when using gb4e -% This is fixed in the latest version of gb4e but since -% it is not in wide distribution this is included for wider -% compatibility. It will be removed at some point. -% - -\def\exe{\SingleSpacing\@ifnextchar [{\@exe}{\@exe[\@exwidth]}}% -% This code repeats the memoir code because gb4e -% redefines footnote text badly. The newest version of gb4e -% fixes this. - -\renewcommand{\@footnotetext}[1]{\insert\footins{% - \def\baselinestretch{\m@m@singlespace}% <- v1.61803 addition - \reset@font% <- v1.6180 addition - \foottextfont - \@preamfntext - \hsize\columnwidth - \protected@edef\@currentlabel{% - \csname p@footnote\endcsname\@thefnmark}% - \color@begingroup - \@makefntext{% - \rule\z@\footnotesep\ignorespaces{\foottextfont #1}% - \@finalstrut\strutbox}% - \color@endgroup}\m@mmf@prepare} -\let\m@mold@footnotetext\@footnotetext -\renewcommand*{\@footnotemark}{% - \leavevmode - \ifhmode - \edef\@x@sf{\the\spacefactor}% - \m@mmf@check - \nobreak - \fi - \@makefnmark - \m@mmf@prepare - \ifhmode\spacefactor\@x@sf\fi - \relax} - -% This is the new gb4e footnote text code - -\let\@gbsaved@footnotetext=\@footnotetext -\long\def\@footnotetext#1{% - \@noftnotefalse\setcounter{fnx}{0}% - \@gbsaved@footnotetext{#1}% - \@noftnotetrue} -\endinput diff --git a/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls b/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls index ca5259cccf8..30e2c0ef2d1 100644 --- a/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls +++ b/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls @@ -1,6 +1,6 @@ % MSU Thesis Class % -% Copyright 2009,2010,2011,2012,2013, 2014, 2015, 2016 by Alan Munn +% Copyright 2009,2010,2011,2012,2013, 2014, 2015, 2016, 2017 by Alan Munn % % This is a class file for producing dissertations and theses according to the % Michigan State University Graduate School Guidelines @@ -18,8 +18,8 @@ % % The Current Maintainer of this package is Alan Munn. % -% This package consists of the following source files: -% msu-thesis.cls, gb4e-compat.tex; +% This package consists of the following source file: +% msu-thesis.cls % Documentation files: % msu-thesis.tex and msu-thesis.pdf; % A template file: @@ -112,7 +112,8 @@ % the Grad School who measure to the tops of letters instead of to baselines. % Version 2.5c 2015/07/11 Made loading etex conditional due to changes in LaTeX kernel for 2015. % Removed gb4e compatibility code (code remains in the distributed files) -% Version 2.6 2016/05/09 Completely revised the stupid appendix/appendices and bibliography cover page % code using memoir internals instead of hacks. +% Version 2.6 2016/05/09 Completely revised the stupid appendix/appendices and bibliography cover page +% code using memoir internals instead of hacks. % This should fix numbering issues in the TOC w.r.t the cover pages and % also fix bookmarks in the PDF when hyperref is loaded. % Made default caption delimiter a space so that captions in LOT/LOF look better @@ -120,32 +121,47 @@ % Version 2.6b 2016/06/08 Reworked some vertical spacing after complaints from the thesis office % despite the fact that people successfully submitted theses in May with % the previous spacing. This is getting ridiculous. -% Also updated documentation to show how to add list of abbreviations +% Also updated documentation to show how to add list of abbreviations +% Version 2.7 2017/06/22 Updated list of degree options; renamed msu@diss to \msu@thesistype and made +% definition a conditional via \ifmsu@dissertation. Fixed problem with placement +% of 'to' on title page. Adjusted landscape page number position and added internal +% \msu@lsyshift for possible adjustment of landscape page numbering. Added boolean +% to change pagestyle for \chapter within a landscape environment. +% Fixed spacing issue after contents lists and bibliography and unnumbered chapters +% Any list of abbreviations \chapter* will need an extra \vspace in the source. +% Added support for apacite package which messes with bibname and TOC. +% Removed gb4e compatability code from distribution. % Use at your own risk! % Report bugs/problems/questions to % -\def\msu@version{2.6b} -\def\msu@date{2016/06/08} +\def\msu@version{2.7} +\def\msu@date{2017/06/22} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{msu-thesis}[\msu@date\space Michigan State University Thesis Class version \msu@version] +\newif\ifmsu@dissertation\msu@dissertationtrue % added v2.7 boolean for \msu@thesistype \newif\ifmsu@lscape\msu@lscapefalse \newif\ifmsu@stupidtoc\msu@stupidtocfalse \newif\ifmsu@mixedtoc\msu@mixedtocfalse \newif\ifmsu@plaintoc\msu@plaintoctrue % make this the default to see what the reaction is \newif\ifmsu@colonintoc\msu@colonintocfalse \newif\ifmsu@hyperloaded\msu@hyperloadedfalse -\DeclareOption{PhD}{\gdef\msu@degree{Doctor of Philosophy}\gdef\msu@diss{DISSERTATION}} -\DeclareOption{MA}{\gdef\msu@degree{Master of Arts}\gdef\msu@diss{THESIS}} -\DeclareOption{MS}{\gdef\msu@degree{Master of Science}\gdef\msu@diss{THESIS}} -%\DeclareOption{MAT}{\gdef\msu@degree{Master of Arts for Teachers}\gdef\msu@diss{THESIS}} -\DeclareOption{MBA}{\gdef\msu@degree{Master of Business Administration}\gdef\msu@diss{THESIS}} -\DeclareOption{MFA}{\gdef\msu@degree{Master of Fine Arts}\gdef\msu@diss{THESIS}} -\DeclareOption{MIPS}{\gdef\msu@degree{Master of International Planning Studies}\gdef\msu@diss{THESIS}} -\DeclareOption{MHRL}{\gdef\msu@degree{Master of Human Resources and Labor Relations}\gdef\msu@diss{THESIS}}\DeclareOption{MMus}{\gdef\msu@degree{Master of Music}\gdef\msu@diss{THESIS}} -%\DeclareOption{MSN}{\gdef\msu@degree{Master of Science in Nursing}\gdef\msu@diss{THESIS}} -\DeclareOption{MPP}{\gdef\msu@degree{Master of Public Policy}\gdef\msu@diss{THESIS}} -\DeclareOption{MSW}{\gdef\msu@degree{Master of Social Work}\gdef\msu@diss{THESIS}} -\DeclareOption{MURP}{\gdef\msu@degree{Master in Urban and Regional Planning}\gdef\msu@diss{THESIS}} +\DeclareOption{PhD}{\gdef\msu@degree{Doctor of Philosophy}} +\DeclareOption{DEd}{\gdef\msu@degree{Doctor of Education}} +\DeclareOption{DMA}{\gdef\msu@degree{Doctor of Musical Arts}} +\DeclareOption{DNP}{\gdef\msu@degree{Doctor of Nursing Practice}} +\DeclareOption{MA}{\gdef\msu@degree{Master of Arts}\global\msu@dissertationfalse} +\DeclareOption{MS}{\gdef\msu@degree{Master of Science}\global\msu@dissertationfalse} +\DeclareOption{MAT}{\gdef\msu@degree{Master of Arts for Teachers}\global\msu@dissertationfalse} +\DeclareOption{MBA}{\gdef\msu@degree{Master of Business Administration}\global\msu@dissertationfalse} +\DeclareOption{MFA}{\gdef\msu@degree{Master of Fine Arts}\global\msu@dissertationfalse} +\DeclareOption{MIPS}{\gdef\msu@degree{Master of International Planning Studies}\global\msu@dissertationfalse} +\DeclareOption{MHRL}{\gdef\msu@degree{Master of Human Resources and Labor Relations}\global\msu@dissertationfalse} +\DeclareOption{MMus}{\gdef\msu@degree{Master of Music}\global\msu@dissertationfalse} +%\DeclareOption{MSN}{\gdef\msu@degree{Master of Science in Nursing}\global\msu@dissertationfalse} +\DeclareOption{MPH}{\gdef\msu@degree{Master of Public Health}\global\msu@dissertationfalse} +\DeclareOption{MPP}{\gdef\msu@degree{Master of Public Policy}\global\msu@dissertationfalse} +\DeclareOption{MSW}{\gdef\msu@degree{Master of Social Work}\global\msu@dissertationfalse} +\DeclareOption{MURP}{\gdef\msu@degree{Master in Urban and Regional Planning}\global\msu@dissertationfalse} \DeclareOption{lscape}{% \msu@lscapetrue \AtEndDocument{\ClassWarningNoLine{msu-thesis}{You have chosen the [lscape] option. You may need to run latex twice to get landscape page numbering to display correctly}}} @@ -156,25 +172,31 @@ \DeclareOption*{ \PassOptionsToClass{\CurrentOption}{memoir} } -\ProcessOptions +\ProcessOptions\relax \LoadClass[12pt,oneside,letterpaper]{memoir}[2008/05/27] % Check for older versions of the latex kernel \ifx\e@alloc\@undefined \RequirePackage{etex} \fi % set up landscape page numbering +% make a boolean for selecting pagestyle properly if \chapter appears in a landscape environment +\newif\ifmsu@lscapemode\msu@lscapemodefalse \ifmsu@lscape \RequirePackage{pdflscape} % this will cause physical pages to be rotated in the PDF + \RequirePackage{etoolbox} + \AtBeginEnvironment{landscape}{\msu@lscapemodetrue} % to get chapter pagestyle correct \RequirePackage{tikz} -% adjust yshift (in both commands) to meet the thesis office requirements +% adjust \msu@landscapeyshift to meet the thesis office requirements % positive values will move the number closer to the bottom of the table -% 0 seems to satisfy them, though. +% 0 satisfied them for a few years and then they complained. + \newcommand*{\msu@landscapesyshift}{3.25} % changed 5/3/2017 + \tikzset{msu landscape pagenum/.style={outer sep=1cm,above,rotate=90,yshift=\msu@landscapesyshift}} \makepagestyle{lscape} \makeevenfoot{lscape}{}{\tikz[remember picture,overlay] - \node[outer sep=1cm,above,rotate=90,yshift=0] at (current page.east) + \node[msu landscape pagenum] at (current page.east) {\thepage};}{} \makeoddfoot{lscape}{}{\tikz[remember picture,overlay] - \node[outer sep=1cm,above,rotate=90,yshift=0] at (current page.east) + \node[msu landscape pagenum] at (current page.east) {\thepage};}{} \fi @@ -182,13 +204,13 @@ \settypeblocksize{9in}{6.5in}{*} \setlrmargins{1in}{*}{*} \setulmargins{1in}{*}{*} -\setheadfoot{\baselineskip}{.5in} +\setheadfoot{.5in}{.5in} % changed 5/3/2017 % set up contents title % we use a private macro here to avoid problems with babel and % polyglossia if they are loaded since they redefine the contents title % -\newcommand*\msu@contentsname{TABLE OF CONTENTS} +\newcommand*{\msu@contentsname}{TABLE OF CONTENTS} \newcommand*{\fieldofstudy}[1]{\gdef\msu@fieldofstudy{#1}} % removed \MakeUppercase 6/5/12 \newcommand{\dedication}[1]{\gdef\msu@dedication{#1}} \newcommand*{\msu@titleintro}{A~} % this is the beginning to the title page phrase @@ -201,20 +223,21 @@ % set up the title page % Because the title is set to \MakeUppercase we need to \protect line % breaks within the title. This has now been documented in the user docs. +\newcommand*\msu@thesistype{\ifmsu@dissertation{DISSERTATION}\else{THESIS}\fi} \pretitle{\begin{center}\MakeUppercase} \posttitle{\\[\baselineskip]\end{center}} \preauthor{\begin{center}By\\[\baselineskip]} \postauthor{\end{center}} -\predate{\vfill\begin{center}\msu@titleintro\msu@diss\\[\baselineskip]Submitted\\to Michigan State University\\in partial fulfillment of the requirements\\for the degree of\\[\baselineskip]\msu@fieldofstudy~\msu@fieldseparator~\msu@degree\\[\baselineskip]} +\predate{\vfill\begin{center}\msu@titleintro\msu@thesistype\\[\baselineskip]Submitted to\\Michigan State University\\in partial fulfillment of the requirements\\for the degree of\\[\baselineskip]\msu@fieldofstudy~\msu@fieldseparator~\msu@degree\\[\baselineskip]} % set up the chapter titles \chapterstyle{thatcher} \setlength{\beforechapskip}{0pt} -\setlength{\afterchapskip}{18pt} % 2016/06/08 because of thesis office complaints +\setlength{\afterchapskip}{2\baselineskip} % changed 2017/05/03 because of thesis office complaints \renewcommand*{\chapnamefont}{\centering\bfseries} \renewcommand*{\chapnumfont}{\bfseries} \renewcommand*{\chaptitlefont}{\SingleSpacing\bfseries} -\renewcommand*{\printchapternonum}{} +\renewcommand*{\printchapternonum}{} % modified 3/5/2017 \renewcommand*{\afterchapternum}{} \renewcommand*{\printchaptername}{% \centerline{\chapnumfont{\MakeUppercase\@chapapp\ \thechapter}}} @@ -226,6 +249,7 @@ % set up the section styles +\setbeforesecskip{0pt} \setsecheadstyle{\normalfont\SingleSpacing\large\bfseries} \setsubsecheadstyle{\normalfont\SingleSpacing\bfseries} \setsubsubsecheadstyle{\normalfont\SingleSpacing\bfseries} @@ -242,6 +266,12 @@ \renewcommand*{\cfttableaftersnum}{\@contdelim} % per thesis office punctuation idiocy \renewcommand*{\cftfigurename}{Figure\space} \renewcommand*{\cfttablename}{Table\space} +%\setlength{\cftbeforetableskip}{0pt} +%\setlength{\cftbeforefigureskip}{0pt} +\renewcommand{\insertchapterspace}{} +\setrmarg{3.55em plus1fil} % ragged right titles added 6/15/17 + + % Stupid option to make the TOC all bold \ifmsu@stupidtoc @@ -290,6 +320,7 @@ \renewcommand*{\cftsubsectionpagefont}{\msu@tocfont} \renewcommand*{\cftsubsubsectionpagefont}{\msu@tocfont} + \renewcommand*{\l@chapter}[2]{% \renewcommand{\cftchapterpagefont}{\msu@chapfont} \l@chapapp{\MakeUppercase{#1}}{#2}{\cftchaptername}} % Format chapter names @@ -300,6 +331,20 @@ \setlength{\cftchapternumwidth}{3em} \setrmarg{3.5em} % better wrapping of long titles +% Added to make sure that chapters within landscape mode have correct pagestyle +\renewcommand\chapter{% + \ifartopt\par\@nameuse{chapterblock}\else + \clearforchapter + \ifmsu@lscapemode + \thispagestyle{lscape} + \else + \thispagestyle{chapter} + \fi + \global\@topnum\z@ + \fi + \m@mindentafterchapter + \@ifstar{\@m@mschapter}{\@m@mchapter}} + % MSU requires double spacing between entries in the list of tables, figures etc. % so we add the commands to change the 'list of' % spacing after the ToC is formatted. @@ -308,8 +353,7 @@ \renewcommand\mem@tableofcontents[1]{% \oldmem@tableofcontents{#1}% \setlength{\cftbeforechapterskip}{0.0em \@plus\p@} - \setlength{\cftparskip}{1em} - \renewcommand*{\insertchapterspace}{} + \setlength{\cftparskip}{\baselineskip} \pagestyle{plain} } @@ -337,7 +381,7 @@ \captionstyle[\centering]{\raggedright} % Make the caption delimiter a space instead of colon space so that the % contents lists don't look so stupid. Can be changed if necessary. -\captiondelim{\space} +%\captiondelim{\space} \pagestyle{plain} @@ -356,25 +400,32 @@ \clearpage \thispagestyle{empty} \vspace*{7in} - {\raggedleft Copyright by\\\MakeUppercase{\theauthor}\\\thedate\\} % Author now uppercase 6/5/12 + {\raggedleft Copyright by\\\MakeUppercase{\theauthor}\\\thedate\\}% Author now uppercase 6/5/12 \clearpage} % make the dedication page % changed 2016/06/08 for vertical centering +% reverted back 2016/06/17 \newcommand*{\makededicationpage}{% \clearpage \pagestyle{plain} + \@setuppart {\centering - \null\vfill - \msu@dedication\par - \vfill}} + \normalfont + \interlinepenalty \@M + \par\msu@dedication\par + }\@endpart} \renewcommand{\mainmatter}{% \DoubleSpacing\pagestyle{plain}\@ifstar{\@smemmain}{\@memmain}} % This should probably be changed to {\null\vfill} + \afterpartskip % But we'll worry about this later. -\renewcommand{\beforepartskip}{\vspace*{.35\textheight}} +%\renewcommand{\beforepartskip}{\vspace*{.35\textheight}} +%\renewcommand{\beforepartskip}{\vspace*{\fill}} +\renewcommand{\beforepartskip}{\null\vfill} +\renewcommand{\afterpartskip}{\null\vfill\newpage} + % This code patches the memoir appendix code to automatically add % appendix cover pages with the correct label, and getting the stupid @@ -383,7 +434,7 @@ % we remove it for the title, but not for the section headings. % Redefining \@apppage as well to get the spacing right 2016/06/08 % -\def\msu@apppage{% +\newcommand{\msu@apppage}{% \@setuppart \mempreaddapppagetotochook \addappheadtotoc @@ -393,8 +444,7 @@ {\centering \interlinepenalty \@M \normalfont - \vfil - \printparttitle{\appendixpagename}\par\vfil}% + \printparttitle{\appendixpagename}\par}% \@endpart} \let\orig@appendix\appendix @@ -414,10 +464,13 @@ \orig@appendices} % make the bibliography page -% new version modeled after memoir code for appendix page -\def\msu@bibpage{% +% new version modelled after memoir code for appendix page +% removed extraneous \vfils +\newcommand\msu@bibpage{% + \let\bibtocname\bibname % moved inside this page to beat apacite + \let\bibpagename\bibname \cftinserthook{toc}{BIB} - \settocdepth{chapter} + \settocdepth{subsubsection} % changed v2.7 to allow for chapter bibs \@setuppart \msu@preaddbibpagetotochook \msu@addbibheadtotoc @@ -427,30 +480,29 @@ {\centering \interlinepenalty \@M \normalfont - \vfil - \printparttitle{\bibpagename}\par\vfil}% + \printparttitle{\bibpagename}\par}% \@endpart} \newcommand\msu@preaddbibpagetotochook{} \newcommand\msu@postaddbibpagetotochook{} \newcommand{\msu@bibpageinfo}[1]{} +\renewcommand{\prebibhook}{\vspace{\cftparskip}} % add extra space before entries to match ToC etc. 6/15/17 -\def\msu@addbibheadtotoc{% +\newcommand\msu@addbibheadtotoc{% \phantomsection\addcontentsline{toc}{chapter}{\bibtocname}} % Since the bibliography page is the TOC entry we remove the bib in the TOC % when it's introduced \nobibintoc % Modified 8/7/14 to add the bibliography cover page to the TOC and not the actual bibliography page % This should also work for biblatex even though memoir doesn't check for it -% but we'll worry about that when someone asks... -\let\bibtocname\bibname -\let\bibpagename\bibname + \newcommand*{\makebibliographypage}{\msu@bibpage} \let\makebibliographycover\makebibliographypage - % Do some stuff at begin document: \AtBeginDocument{% \let\msucaptiondelim\@contdelim -\topskip=0pt % setting this because the Grad School doesn’t know how to measure +% Moved to AtBeginDocument to override apacite +\@ifpackageloaded{apacite}{\@tocbibfalse}{} % added 6/22/17 +%\topskip=0pt % setting this because the Grad School doesn’t know how to measure -changed back 6/15/17 \checkandfixthelayout % % set up subscript sizes so that 10 pt is the smallest -- cgit v1.2.3