8 files changed, 22 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/README b/Master/texmf-dist/doc/latex/msu-thesis/README
index 18f4380798b..406a4311ddd 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/README
+++ b/Master/texmf-dist/doc/latex/msu-thesis/README
@@ -1,4 +1,4 @@
-MSU Thesis Class Version 2.1c 2012/05/18
+MSU Thesis Class Version 2.1d 2012/05/27
 
 Copyright 2011,2012 by Alan Munn <amunn@msu.edu>
 
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf b/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf
index e430f077e97..5e5aca00a17 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.pdf
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.tex b/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.tex
index e31c5446e67..413752c2b71 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.tex
+++ b/Master/texmf-dist/doc/latex/msu-thesis/msu-thesis.tex
@@ -1,7 +1,7 @@
 \documentclass[11pt]{article}
 \title{\textbf{Using the MSU Thesis Class}}
 \author{\textbf{Alan Munn}\\Department of Linguistics and Languages\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
-\date{Version 2.1c\\May 18, 2012}
+\date{Version 2.1d\\May 27, 2012}
 \usepackage[T1]{fontenc}
 \usepackage[margin=1.25in]{geometry}
 \usepackage{titling}
@@ -64,7 +64,7 @@
 \thispagestyle{empty}
 \renewcommand{\abstractname}{\sffamily Abstract}
 
-\abstract{\noindent\begin{quote} This is a class file for MSU theses and dissertations.  It is based on the \pkg{memoir} class, and therefore supports all of the functionality of that class.  It should generate a document which meets all the basic formatting requirements laid out by the \emph{2010 Formatting Guide For Electronic Submission of Master’s Theses and Doctoral Dissertations} produced by the Graduate School, including requirements for margins, titlepage, page numbering, section titles, sub- and superscript sizes etc.\end{quote}}
+\abstract{\noindent\begin{quote} This is a class file for MSU theses and dissertations.  It is based on the \pkg{memoir} class, and therefore supports all of the functionality of that class.  It should generate a document which meets all the basic formatting requirements laid out by the \emph{Formatting Guide For Submission of Master’s Theses and Doctoral Dissertations} (2012) produced by the Graduate School, including requirements for margins, titlepage, page numbering, section titles, sub- and superscript sizes etc.\end{quote}}
 \section{Introduction}
 Formatting a dissertation according to a University's thesis requirements is not always a simple task in \LaTeX, especially since the requirements are generally aimed at MSWord users.  Furthermore, most of the work of formatting a document is supposed to be done by the documentclass itself, and not by the individual user.  Fortunately, Michigan State University's thesis requirements are actually sane, and fairly straightforward.  The present class file is designed to further make the process easier for \LaTeX\ users, by doing all the heavy lifting for you, so that you can focus on the content and not the formatting.
 \section{Background}
@@ -80,13 +80,13 @@ In addition to any options passed to the \pkg{memoir} class (e.g. |oldfontcomman
 {[PhD]} &  Doctoral dissertation (default)\\
 {[MA]} & Master of Arts\\
 {[MS]} & Master of Science\\
-{[MAT]} & Master of Arts for Teachers 	 \\
+%{[MAT]} & Master of Arts for Teachers 	 \\
 {[MBA]} & Master of Business Administration 	 \\
 {[MFA]} & Master of Fine Arts 	 \\
 {[MIPS]} & Master of International Planning Studies 	 \\
 {[MHRL]} & Master of Human Resources and Labor Relations  \\
 {[MMus]} & Master of Music 	 \\
-{[MSN]} & Master of Science in Nursing 	 \\
+%{[MSN]} & Master of Science in Nursing 	 \\
 {[MPP]} & Master of Public Policy 	 \\
 {[MSW]} & Master of Social Work 	 \\
 {[MURP]} & Master in Urban and Regional Planning 	 \\
@@ -191,6 +191,7 @@ I have created a basic looking style for Chapter headings based on the |thatcher
 Despite there being no explicit formatting requirements for Chapter headings (other than that they start 1 in from the top of the page), the thesis office has been known to dislike many things, so if you do decide to change things, be prepared for rejection or a frustrating fight.
 \subsection{Things to watch out for}
 \begin{itemize}[label={\textbullet}]
+\item If your title is long and you want to put a newline (|\\|) into it to improve the spacing, you must precede the newline with |\protect|.
 \item Make sure you pay attention to any ``Overfull hbox'' warnings when you are producing your final copy. You should make sure you eliminate all of them or else the thesis office is likely to reject your thesis. One common way to eliminate such warnings is to place the command |\sloppy| at the beginning of the paragraph that triggers the warning. You should only use this technique at the very end when you are completely done with everything.  Alternatively, rewording the text may also fix things. 
 \item Remember to use the |\tableofcontents*| command so that your table of contents is not listed in the table of contents.
 \item Remember to use the command |\appendicestrue| if you have more than one appendix.
@@ -199,7 +200,7 @@ Despite there being no explicit formatting requirements for Chapter headings (ot
 
 \section{Bugs and redistribution}
 \subsection{Current version}
-The latest copy of \pkg{msu-thesis} will always be available on  \href{http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=msu-thesis}{CTAN}. If you use TeXLive, then \pkg{tlmgr} will update or install the latest version. If you want others to use the class, \textsc{please} point them to that link, so that they can get an up-to-date version with all accompanying documentation and examples rather than passing along your copy. Please report \textsc{any} problems you have with the class to me \href{mailto:amunn@msu.edu}{amunn@msu.edu}, as this will aid in making things easier for those who follow you.
+The latest copy of \pkg{msu-thesis} will always be available on  \href{http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=msu-thesis}{CTAN}. If you use TeXLive or MiKTeX then their respective package managers will update or install the latest version. If you are using a Linux-based distribution, you may need to install the latest copy in your local |texmf| directory. If you want others to use the class, \textsc{please} point them to CTAN, so that they can get an up-to-date version with all accompanying documentation and examples rather than passing along your copy. Please report \textsc{any} problems you have with the class to me \href{mailto:amunn@msu.edu}{amunn@msu.edu}, as this will aid in making things easier for those who follow you.
 \subsection{Version history}
 Previous versions of \pkg{msuthesis} (versions 1.0--1.4b) were created for non-electronic submission and should not be used. Versions 1.5--1.6 (the first electronic submission versions) contained a |\makeabstract| command and a separate |msuabstract| environment. These have been removed as of version 1.7.  Users who are upgrading from earlier versions to version 1.7 do not need to change these commands however but their use will trigger a warning.)
 \section{Acknowledgements}
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf
index 8b58013cade..8f919a7e85f 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf
+++ b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.tex b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.tex
index 86b4c33c58e..4742a77ff07 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.tex
+++ b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-template.tex
@@ -37,7 +37,6 @@
 \author{Joe Linguist}
 \fieldofstudy{Linguistics}
 \date{2010}
-\renewcommand*{\afterchapternum}{}
 
 % If you want a dedication page, specify the text of the dedication here and uncomment the next command.
 %
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf
index e5ec7108e23..7623cdce8cb 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf
+++ b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf
diff --git a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex
index f533a4ff59e..e9f1b16bc81 100644
--- a/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex
+++ b/Master/texmf-dist/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex
@@ -7,7 +7,8 @@
 \usepackage[T1]{fontenc}
 \usepackage{mathptmx}
 \usepackage{amsmath}
-\title{The syntax and semantics of phonology}
+% If you need newlines in your title, you must use \protect\\
+\title{Topics in the Syntax and Semantics of Phonology}
 \author{Joe Linguist}
 \fieldofstudy{Linguistics}
 \dedication{This thesis is dedicated to someone.}
@@ -94,7 +95,7 @@ Men & Women & Monsters\\
 \end{figure}
 \lipsum[5]
 \lipsum[10]
-\chapter{A chapter with a really long title to see whether the chapter titles wrap correctly}
+\chapter{A chapter with a really long title to see if the chapter titles wrap correctly}
 \lipsum
 \begin{figure}
 \centering
@@ -190,7 +191,6 @@ A & B & C & D & E & F & G \\
 %
 % Uncomment this next command if you have more than one appendix
 %\appendicestrue
-
 % This command creates the cover page for the appendix/appendices
 \makeappendixcover
 \appendix
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 3ad6599cd72..6814ebb638d 100644
--- a/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls
+++ b/Master/texmf-dist/tex/latex/msu-thesis/msu-thesis.cls
@@ -81,21 +81,24 @@
 % Version 2.1b 2012/05/18 Fixed  bug with redefinition of \contentsname
 %                         when babel is loaded.
 % Version 2.1c 2012/05/18 Generalized babel bugfix to work with polyglossia
+% Version 2.1d 2012/05/27 Removed superfluous title redefinition;
+%                         Made title in abstract upper case (bug);
+%                         Updated documentation; updated degree list
 % Use at your own risk! 
 % Report bugs/problems/questions to <amunn@msu.edu>
 %
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{msu-thesis}[2012/05/18  Michigan State University Thesis Class version 2.1b]
+\ProvidesClass{msu-thesis}[2012/05/18  Michigan State University Thesis Class version 2.1c]
 \newif\ifmsu@lscape\msu@lscapefalse
 \DeclareOption{PhD}{\gdef\@degree{DOCTOR OF PHILOSOPHY}\gdef\@diss{DISSERTATION}}
 \DeclareOption{MA}{\gdef\@degree{MASTER OF ARTS}\gdef\@diss{THESIS}}
 \DeclareOption{MS}{\gdef\@degree{MASTER OF SCIENCE}\gdef\@diss{THESIS}}
-\DeclareOption{MAT}{\gdef\@degree{MASTER OF ARTS FOR TEACHERS}\gdef\@diss{THESIS}}
+%\DeclareOption{MAT}{\gdef\@degree{MASTER OF ARTS FOR TEACHERS}\gdef\@diss{THESIS}}
 \DeclareOption{MBA}{\gdef\@degree{MASTER OF BUSINESS ADMINISTRATION}\gdef\@diss{THESIS}}
 \DeclareOption{MFA}{\gdef\@degree{MASTER OF FINE ARTS}\gdef\@diss{THESIS}}
 \DeclareOption{MIPS}{\gdef\@degree{MASTER OF INTERNATIONAL PLANNING STUDIES}\gdef\@diss{THESIS}}
 \DeclareOption{MHRL}{\gdef\@degree{MASTER OF HUMAN RESOURCES AND LABOR RELATIONS}\gdef\@diss{THESIS}}\DeclareOption{MMus}{\gdef\@degree{MASTER OF MUSIC}\gdef\@diss{THESIS}}
-\DeclareOption{MSN}{\gdef\@degree{MASTER OF SCIENCE IN NURSING}\gdef\@diss{THESIS}}
+%\DeclareOption{MSN}{\gdef\@degree{MASTER OF SCIENCE IN NURSING}\gdef\@diss{THESIS}}
 \DeclareOption{MPP}{\gdef\@degree{MASTER OF PUBLIC POLICY}\gdef\@diss{THESIS}}
 \DeclareOption{MSW}{\gdef\@degree{MASTER OF SOCIAL WORK}\gdef\@diss{THESIS}}
 \DeclareOption{MURP}{\gdef\@degree{MASTER IN URBAN AND REGIONAL PLANNING}\gdef\@diss{THESIS}}
@@ -133,7 +136,6 @@
 \setheadfoot{\baselineskip}{.5in}
 \AtBeginDocument{%
 \checkandfixthelayout
-
 % set up subscript sizes so that 10 pt is the smallest
 % (MSU Requirement)
 \DeclareMathSizes{12}{12}{10}{10}
@@ -150,16 +152,7 @@
 % polyglossia if they are loaded since they redefine the contents title
 % 
 \newcommand*\MSU@contentsname{TABLE OF CONTENTS} 
-
-%\renewcommand{\title}[1]{\gdef\@title{\MakeUppercase{#1}}}
-\addtoiargdef{\title}{%
-  \begingroup\let\footnote\@gobble}{%
-  \begingroup
-    \renewcommand{\thanks}[1]{}
-    \renewcommand{\thanksmark}[1]{}
-    \renewcommand{\thanksgap}[1]{}
-    \protected@xdef\thetitle{\MakeUppercase{#1}}
-  \endgroup\endgroup}
+  
 \newif\ifappendices\appendicesfalse
 \newcommand*{\@appendixcover}{\ifappendices{APPENDICES}\else{APPENDIX}\fi}
 \newcommand*{\fieldofstudy}[1]{\gdef\@fieldofstudy{\MakeUppercase{#1}}}
@@ -180,6 +173,8 @@
 \setlength{\droptitle}{.25in}
 
 % set up the title page
+% Because the title is sent to \MakeUppercase we need to \protect line
+% breaks within the title.  This has now been documented in the user docs.
 \pretitle{\begin{center}\MakeUppercase}
 \posttitle{\\[\baselineskip]\end{center}}
 \preauthor{\begin{center}by\\[\baselineskip]}
@@ -189,7 +184,7 @@
 % set up the chapter titles
 \chapterstyle{thatcher}
 \setlength{\beforechapskip}{0pt}
-%\setlength{\afterchapskip}{28pt}
+%\setlength{\afterchapskip}{28pt} % Thesis office didn't like this
 \renewcommand*{\chapnamefont}{\centering\bfseries}
 \renewcommand*{\chapnumfont}{\bfseries}
 \renewcommand*{\chaptitlefont}{\bfseries}
@@ -208,6 +203,7 @@
 \renewcommand*{\cftchaptername}{Chapter\space}
 \renewcommand*{\cftappendixname}{Appendix\space}
 \renewcommand*{\cftchapterdotsep}{\cftdotsep}
+
 \renewcommand*{\l@chapter}[2]{%
   \l@chapapp{\MakeUppercase{#1}}{#2}{\cftchaptername}} % Format chapter names
 \renewcommand*{\l@appendix}[2]{%
@@ -247,7 +243,7 @@
    \thispagestyle{empty}
    \plainbreak{-1.5}
     \begin{center}
-    		\thetitle\plainbreak{1}by\plainbreak{1}\theauthor
+    		\MakeUppercase{\thetitle}\plainbreak{1}by\plainbreak{1}\theauthor
  	\end{center}
      \DoubleSpacing
    }{\par}