turabian-formatting (28feb16)

git-svn-id: svn://tug.org/texlive/trunk@39910 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 651 insertions, 545 deletions

diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README
index 772797f0286..b8862f45161 100644
--- a/Master/texmf-dist/doc/latex/turabian-formatting/README
+++ b/Master/texmf-dist/doc/latex/turabian-formatting/README
@@ -1,4 +1,4 @@
-Turabian Formatting for LaTeX (2015/11/14)
+Turabian Formatting for LaTeX (2016/02/27)
 
 
 INTRODUCTION
@@ -30,8 +30,6 @@ subdirectory of your local texmf directory. This is usually the
 texmf/tex/latex/ directory.
 
 
-LAST UPDATED: 2015/11/14
-
 
 For more information on using the package, refer to the accompanying
 manual, turabian-formatting-doc.pdf, included in this package.
diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf
index 9ad6380c922..efbfbc6aa7f 100644
--- a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf
+++ b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex
index db7adccc20e..c63c116e1bc 100644
--- a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex
+++ b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex
@@ -19,14 +19,14 @@
 % and turabian-formatting-doc.pdf (in addition to the README file).
 %
 % ==============================
-% Last updated: 2015/11/14
+% Last updated: 2016/02/27
 %
 %
 
 
 \documentclass{article}
 
-\usepackage{polyglossia, fontspec, csquotes, ellipsis}
+\usepackage{polyglossia, fontspec, csquotes}
 \setmainlanguage{english}
 \defaultfontfeatures{Ligatures=TeX}
 
@@ -58,10 +58,12 @@
 
 \interfootnotelinepenalty=10000
 
-\RequirePackage[defaultlines=2, all]{nowidow}
+\usepackage[defaultlines=2, all]{nowidow}
 
 \usepackage[hidelinks]{hyperref}
 
+\usepackage{ellipsis}
+
 \usepackage{listings}
 \lstset{%
 	language=TeX,
@@ -75,10 +77,10 @@
 	breakatwhitespace=true,
 	breakindent=0pt}
 
-\newcommand{\versionDateText}{2015/11/14}
+\newcommand{\versionDateText}{2016/02/27}
 
 \title{Turabian Formatting for \LaTeX{}}
-\author{Omar Abdool}
+\author{Omar Abdool \hspace{3ex} \href{mailto:turabian.formatting@gmail.com}{turabian.formatting@gmail.com}}
 \date{\today}
 
 
@@ -87,7 +89,7 @@
 
 \maketitle
 
-\renewcommand{\abstractname}{\vspace{-\baselineskip}}
+\renewcommand{\abstractname}{\vspace{-1\baselineskip}}
 
 \begin{abstract}
 \noindent This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers} (8th edition).
@@ -101,8 +103,8 @@
 \newgeometry{top=1.75in, bottom=1.75in, left=2.25in, right=1.25in, marginparsep=0.25in, marginparwidth=1.25in}
 
 \reversemarginpar
-\setlength{\parindent}{0in}
-\setlength{\parskip}{1\baselineskip}
+\setlength\parindent{0in}
+\setlength\parskip{1\baselineskip}
 
 
 
@@ -120,25 +122,9 @@ For citations, this package is designed to work well with David Fussner's outsta
 \section{Using the Package and Document Classes}
 \label{sec:implementation}
 
-A document may be formatted using \texttt{turabian-formatting} in one of three ways: either (1) loading the package in the \LaTeX{} source-file preamble, (2) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), or (3) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}).
-
-
-\subsection{Package for Turabian-Style Formatting}
-
-\marginnote{turabian-\newline formatting}%
-The \texttt{turabian-formatting} package is loaded in the preamble of the source file:
-
-\begin{lstlisting}
-	\usepackage{turabian-formatting}
-\end{lstlisting}
-
-Do not use this approach if the document class is either \texttt{turabian-researchpaper} or \texttt{turabian-thesis}.\footnote{%
-	The \texttt{turabian-formatting} package has been tested with the standard \texttt{article}, \texttt{report}, and \texttt{book} \LaTeX{} document classes.}
-
-This package should, also, always be loaded \emph{before} loading the \texttt{biblatex-chicago} package.
+A document may be formatted using \texttt{turabian-formatting} in one of three ways: either (1) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), (2) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}), or (3) loading the package in the \LaTeX{} source-file preamble.
 
 
-\clearpage
 \subsection{Document Class for Research Papers}
 
 \marginnote{turabian-\newline researchpaper}%
@@ -150,6 +136,7 @@ The \texttt{turabian-researchpaper} document class provides formatting specific
 This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{article} document class.
 
 
+\clearpage
 \subsection{Document Class for Theses and Dissertations}
 
 \marginnote{turabian-thesis}%
@@ -161,16 +148,35 @@ The \texttt{turabian-thesis} document class offers formatting specific to theses
 This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{book} document class. As such, support for chapter headings (\texttt{\textbackslash chapter} and \texttt{\textbackslash chapter*}), title pages specific to theses/dissertations (refer to subsection~\ref{subsec:titlepage}), table of contents, and formatting commands to structure the document into front matter, main matter, and back matter (refer to subsection~\ref{subsec:td_structure}), are also included.
 
 
+\subsection{Package for Turabian-Style Formatting}
+
+\marginnote{turabian-\newline formatting}%
+The \texttt{turabian-formatting} package can be loaded in the preamble of the source file as follows:\footnote{%
+	The \texttt{turabian-formatting} package has been tested with the standard \texttt{article}, \texttt{report}, and \texttt{book} \LaTeX{} document classes. If the document class is either \texttt{turabian-researchpaper} or \texttt{turabian-thesis}, however, do not load the \texttt{turabian-formatting} package again.}
+
+\begin{lstlisting}
+	\usepackage{turabian-formatting}
+\end{lstlisting}
+
+This package should always be loaded \emph{before} using the \texttt{biblatex-chicago} package.
+
 
 \section{Formatting Options}
 \label{sec:formatting_options}
 
-The \texttt{turabian-formatting} package adheres to the manual’s guidelines on the formatting of text. This includes double-spacing all text throughout the document except items that should have single-spacing \autocite[373]{turabian_manual_2013}. Paragraph indentation is set to 0.5 inches.
+The \texttt{turabian-formatting} package adheres to the manual's guidelines on the formatting of text. This includes double-spacing all text throughout the document except items that should have single-spacing \autocite[373]{turabian_manual_2013}.\footnote{%
+	Double-spaced text is typeset with a \texttt{\textbackslash baselinestretch} of \texttt{2}. This is different than the default values provided by the \texttt{setspace} package.}
+Paragraph indentation is set to 0.5 inches.
+
+Page margins, by default, are 1 inch from the edges of the paper.
+
+The \texttt{turabian-thesis} document class has an additional binding offset of 0.5 inches, effectively creating a left/inside margin of 1\nicefrac{1}{2} inches.\footnote{%
+	This is accomplished by \texttt{turabian-thesis} making changes to the following lengths: (1) setting \texttt{\textbackslash oddsidemargin} to \texttt{0.5in}; (2) setting \texttt{\textbackslash evensidemargin} to \texttt{0}; and (3) adding \texttt{-0.5in} to \texttt{\textbackslash textwidth}.}
 
 
 \subsection{Standard Options for Document Classes}
 Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support most of the standard document class options.\footnote{%
-	Neither the \texttt{notitlepage} nor the \texttt{twocolumn} options, however, are supported by either document class.}
+	The \texttt{twocolumn} option is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option either.}
 
 The default \texttt{normal} font size is twelve-point type (\texttt{12pt})---the preferred font type size for the body of the text \autocite[373]{turabian_manual_2013}. This package also supports \texttt{normal} font type sizes of \texttt{10pt} and \texttt{11pt}.
 
@@ -179,54 +185,41 @@ The default page size, for both document classes, is 8\nicefrac{1}{2} × 11 inch
 Both documents classes, by default, are set to \texttt{oneside}.
 
 
-\subsection{Page Layout and Empty Margins}
-\label{subsec:pagelayout_emptymargins}
-
-Page margins, by default, are 1 inch from the edges of the paper.\footnote{
-	The \texttt{turabian-thesis} document class has an additional binding offset of 0.5 inches, effectively creating a left/inside margin of 1\nicefrac{1}{2} inches. The binding offset can be adjusted through the \texttt{geometry} package by using the \texttt{bindingoffset} option of the \texttt{\textbackslash geometry} command.}
-To make changes to the page layout, use of the \texttt{geometry} package is recommended.
+\subsection{Ragged Right (Left Align) Text}
 
-Headers and footers, by default, are placed inside the margins. The top of the header is 0.5 inches from the top of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page. (Refer to section~\ref{sec:page_styles} for typesetting headers and footers.)
+\marginnote{raggedright}%
+By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature" \autocite[404]{turabian_manual_2013}. For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option.
 
-\marginnote{emptymargins}%
-The \texttt{emptymargins} option removes headers and footers from within the margin and, instead, places them within the space normally used for the body text. As such, the page margins are empty of all text.
 
-Using the \texttt{emptymargins} option, however, reduces the text height (\texttt{textheight}) by 0.5 inches when a header or footer is placed on the page. Because some pages within a document will have headers, and others footers, the \texttt{emptymargins} option allows for pages to have either a header or a footer on a page---although not both on the same page. Empty pages have neither a header nor a footer (refer to section~\ref{sec:page_styles}).
+\subsection{Adjusting Bibliography Formatting}
 
+For citations, this package is designed to work well with the \texttt{biblatex-chicago} package.\footnote{%
+	If loaded before the \texttt{biblatex-chicago} package, \texttt{turabian-formatting} will pass the following options to \texttt{biblatex-chicago}: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}.}
+This includes support for both the Notes-Bibliography and Author-Date styles (the former being the default style).
 
-\subsection{Ragged Right (Left Align) Text}
+\marginnote{noadjustbib}%
+Formatting support that adjusts the Bibliography generated by \texttt{biblatex-chicago} can be disabled using the \texttt{noadjustbib} formatting option. The following code, loaded at the end of the preamble, is affected by this option:
 
-\marginnote{raggedright}%
-By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature" \autocite[404]{turabian_manual_2013}. For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option.
+\begin{lstlisting}
+	\renewcommand{\bibsetup}{\singlespacing}
+	\renewcommand{\bibitemsep}{1\baselineskip}
+	\renewcommand{\bibhang}{0.5in}
+\end{lstlisting}
 
 
 \subsection{Support for Endnotes}
 
-Endnotes can be used instead of footnotes by loading the \texttt{endnotes} package in the \LaTeX{} document source preamble.\footnote{%
+Although citations use footnotes by default, endnotes can be used instead by loading the \texttt{endnotes} package in the \LaTeX{} document source preamble.\footnote{%
 	When using the \texttt{endnotes} package, cite keys must not contain an underscore character, ``\texttt{\_}".}
 
 \marginnote{endnotes}%
 Formatting support for the \texttt{endnotes} package can be enabled using the \texttt{endnotes} option. With the \texttt{endnotes} option, footnotes are restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ \autocite[156]{turabian_manual_2013}. More so, each endnote is single-spaced with a ``blank line between notes." The list of endnotes is labelled \emph{Notes}.\footnote{%
-	The \emph{Notes} heading is typeset using either \texttt{\textbackslash chapter*} or \texttt{\textbackslash section*}, depending upon the document class.}
+	The \emph{Notes} heading is typeset using either \texttt{\textbackslash section*} or, if \texttt{\textbackslash chapter} has been defined by the document class, \texttt{\textbackslash chapter*}.}
 Numbering of endnotes is also restarted for each chapter with subheadings dividing the list by each chapter \autocite[157]{turabian_manual_2013}.
 
-To place the \emph{Notes} list, use the \texttt{\textbackslash theendnotes} command provided by the \texttt{endnotes} package.
-
-
-\subsection{Adjusting Bibliography Formatting}
-
-For citations, this package is designed to work well with the \texttt{biblatex-chicago} package. This includes support for both the Notes-Bibliography and Author-Date styles (the former being the default style).\footnote{%
-	To maintain this support if \texttt{turabian-formatting} is loaded as a package, the package should always be loaded \emph{before} loading the \texttt{biblatex-chicago} package. If \texttt{biblatex-chicago} is loaded, the following options are passed to it: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}. If the \texttt{endnotes} option is enabled for \texttt{turabian-formatting}, then \texttt{notetype=endonly} is also passed to the \texttt{biblatex-chicago} package.}
-
-\marginnote{noadjustbib}%
-Formatting support that adjusts the Bibliography, generated by \texttt{biblatex-chicago}, can be disabled using the \texttt{nodajustbib} formatting option. This option is only available when loading \texttt{turabian-formatting} as a package. The following code is affected by this option:
+If loaded before the \texttt{biblatex-chicago} package, \texttt{turabian-formatting} will also pass the \texttt{notetype=endonly} option to \texttt{biblatex-chicago}.
 
-\begin{lstlisting}
-	\AtBeginBibliography{\vspace*{-0.333\baselineskip}}
-	\renewcommand{\bibsetup}{\singlespacing}
-	\renewcommand{\bibitemsep}{1\baselineskip}
-	\renewcommand{\bibhang}{0.5in}
-\end{lstlisting}
+To place the list of endnotes, use the \texttt{\textbackslash theendnotes} command provided by the \texttt{endnotes} package.
 
 
 
@@ -243,10 +236,11 @@ The \texttt{turabian-formatting} package provides support for document classes t
 \marginnote{\textbackslash chapter}
 The \texttt{\textbackslash chapter} command starts a new page and creates a \emph{Chapter} label ``followed by the chapter number at the top of the page" in arabic numerals. The ``descriptive title" of the chapter is placed ``two lines down, following a blank line" and is separated from the first line of following text by ``two blank lines" \autocite[391]{turabian_manual_2013}.
 
+\clearpage
 \marginnote{\textbackslash chapter*}
 \texttt{\textbackslash chapter*}, unlike \texttt{\textbackslash chapter}, does not provide a line with a \emph{Chapter} label and numbering nor is it included in the Table of Contents.\footnote{%
-	To add a numberless ``chapter" to the Table of Contents, use the \texttt{\textbackslash addcontentsline} command immediately following the \texttt{\textbackslash chapter*} command. For the \emph{Bibliography} or \emph{References} heading from \texttt{\textbackslash printbibliography} (from the \texttt{biblatex-chicago} package), place this command immediately \emph{after} the use of the \texttt{\textbackslash clearpage} and \texttt{\textbackslash addcontentsline} commands. The same applies to the \texttt{\textbackslash theendnotes} command from the \texttt{endnotes} package.}
-This is useful for the titles/headings of specific elements, including the \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Abstract} \autocite[389]{turabian_manual_2013}, \emph{Conclusion} \autocite[398]{turabian_manual_2013}, \emph{Appendixes} \autocite[398]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}.
+	To add a numberless ``chapter" to the Table of Contents, use the \texttt{\textbackslash addcontentsline} command immediately following the \texttt{\textbackslash chapter*} command. For the \emph{Bibliography} or \emph{References} heading from \texttt{\textbackslash printbibliography} (from the \texttt{biblatex-chicago} package), place this command immediately \emph{after} the use of the \texttt{\textbackslash clearpage} and \texttt{\textbackslash addcontentsline} commands. Using the \texttt{endnotes} option will place the \emph{Notes} heading in the table of contents.}
+This is useful for the titles/headings of specific elements, including \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Abstract} \autocite[389]{turabian_manual_2013}, \emph{Conclusion} \autocite[398]{turabian_manual_2013}, \emph{Appendixes} \autocite[398]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}.
 
 \subsubsection*{Sections and Subsections}
 
@@ -255,15 +249,18 @@ This package provides support for three levels of sections and subsections: \tex
 
 \texttt{\textbackslash section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)" \autocite[393]{turabian_manual_2013}.
 
-\marginnote{\textbackslash section*}
-If the document class does not define chapter headings, \texttt{\textbackslash section*} will instead provide two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including the \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}.
+\marginnote{\textbackslash section*\newline \textbackslash noadjustssect}
+If the document class does not define chapter headings, \texttt{\textbackslash section*} will instead provide two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}. Inserting the \texttt{\textbackslash noadjustssect} command in the document preamble will disable this behaviour.
 
 
 \subsection{Page Styles: Headers and Footers}
 \label{sec:page_styles}
 
+Headers and footers, by default, are placed within the margins. The top of the header is 0.5 inches from the top edge of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page \autocite[372, 374]{turabian_manual_2013}.
+
 \marginnote{\textbackslash pagestyle\newline \textbackslash thispagestyle}
-Headers and footers are determined by the specific page styles. They are used with the \texttt{\textbackslash pagestyle} and \texttt{\textbackslash thispagestyle} commands.
+The layout of the headers and footers are determined by the specific page styles. They are used with the \texttt{\textbackslash pagestyle} and \texttt{\textbackslash thispagestyle} commands.\footnote{%
+	The \texttt{fancyhdr} package can be used to typset (and adjust) these page styles. This includes placing optional text (such as a page identifier) in the header and/or footer \autocite[374]{turabian_manual_2013}.}
 
 \textbf{\texttt{empty}}: An empty page style with no header or footer.
 
@@ -271,8 +268,6 @@ Headers and footers are determined by the specific page styles. They are used wi
 
 \textbf{\texttt{headings}}: The default page style places a page number in the right-hand corner of the header.
 
-The \texttt{fancyhdr} package can be used to typset (and adjust) these page styles. This includes placing optional text (such as a page identifier) in the header and/or footer \autocite[374]{turabian_manual_2013}.
-
 
 \subsection{Document Structure for Thesis/Dissertation}
 \label{subsec:td_structure}
@@ -283,6 +278,7 @@ A thesis/dissertation is divided into three, distinct components: (1) front matt
 \marginnote{\textbackslash frontmatter}
 The front matter is declared with the \texttt{\textbackslash frontmatter} command. By default, the \texttt{\textbackslash pagestyle} is set to \texttt{empty} (refer to section~\ref{sec:page_styles}). The numbering of pages in the front matter begins with the title page, although page numbers are not placed on pages until the Table of Contents \autocite[373--374, 376, 380]{turabian_manual_2013}.
 
+\marginnote{\texttt{\textbackslash tableofcontents}}
 Placing the \texttt{\textbackslash tableofcontents} command in the front matter will cause page numbers to appear on pages with the Table of Contents and subsequent pages of the front matter. These page numbers use roman numerals and are placed in centre of the footer \autocite[373--374]{turabian_manual_2013} using the \texttt{plain} page style (refer to section~\ref{sec:page_styles}).
 
 \subsubsection*{Main Matter}
@@ -299,61 +295,59 @@ The back matter is declared using the \texttt{\textbackslash backmatter} command
 \subsection{Title Page}
 \label{subsec:titlepage}
 
+The \texttt{turabian-researchpaper} document class provides a title page intended for research papers.\footnote{%
+	The \texttt{turabian-formatting} package provides a title page for research papers.}
+Page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model" title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter \autocite[376, 378]{turabian_manual_2013}.
+
 \marginnote{\textbackslash maketitle}%
-The \texttt{\textbackslash maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default document class option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}.
+The \texttt{\textbackslash maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}.
 
-The \texttt{turabian-researchpaper} document class produces a title page intended for research papers. Page numbering begins immediately following the title page.
+\marginnote{\textbackslash title\newline \textbackslash subtitle\newline \textbackslash author\newline \textbackslash date\newline}
+\texttt{\textbackslash maketitle} uses information specified in the source document preamble, through the following commands (each of which is self-evident): \texttt{\textbackslash title}, \texttt{\textbackslash author}, \texttt{\textbackslash date}, and \texttt{\textbackslash subtitle}. For research paper title pages, footnotes (as well as \texttt{\textbackslash thanks}) can also be used.
 
-\marginnote{\textbackslash title\newline \textbackslash subtitle\newline \textbackslash author\newline \textbackslash date\newline \textbackslash course\newline \textbackslash institution}
-\texttt{\textbackslash maketitle} uses information specified in the source document preamble, through the following commands (each of which is self-evident): \texttt{\textbackslash title}, \texttt{\textbackslash author}, \texttt{\textbackslash date}, \texttt{\textbackslash subtitle}, \texttt{\textbackslash course}, and \texttt{\textbackslash institution}.
+\marginnote{\textbackslash submissioninfo}
+For a research paper, \texttt{\textbackslash submissioninfo} is used for typesetting ``any information requested by your instructor," between the name of the course and the date \autocite[376]{turabian_manual_2013}. For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department.
 
-The \texttt{turabian-thesis} document class provides a ``model" title page intended for a thesis or dissertation---a title page different than one intended for a research paper. The title page of a thesis/dissertation is included in the page numbering of the front matter \autocite[376, 378]{turabian_manual_2013}.\footnote{%
-	When \texttt{turabian-formatting} is loaded as a package, the default title page created is for that of a research paper. The ``model" title page for theses/dissertations is only available to the \texttt{turabian-thesis} document class.}
+\marginnote{\textbackslash course}
+\texttt{turabian-researchpaper} provides the optional \texttt{\textbackslash course} command for typesetting course information (such as the name of the course).
 
-\marginnote{\textbackslash faculty\newline \textbackslash mydegree\newline \textbackslash department\newline \textbackslash location}
-The following commands are available only with a title page for \texttt{turabian-thesis}: \texttt{\textbackslash faculty}, \texttt{\textbackslash mydegree}, \texttt{\textbackslash department}, and \texttt{\textbackslash location}.
+\marginnote{\textbackslash institution\newline \textbackslash department\newline \textbackslash location}
+\texttt{turabian-thesis} also provides: (1) \texttt{\textbackslash institution} for typesetting the institution at the top of the page, (2) for typesetting the name of the department, and (3) \texttt{\textbackslash location} for typesetting a location just above the date.
 
-To create a custom title page, however, use the \texttt{titlepage} environment.
+To create a custom title page, use the \texttt{titlepage} environment.
 
 
-\subsection{Table Footnotes}
+\section{Required and Recommended Packages}
+\label{sec:required_packages}
 
-A table is described as having four kinds of footnotes: ``(1) source lines \dots, (2) general footnotes that apply to the whole table, (3) footnotes that apply to specific parts of the table, and (4) notes on levels of statistical significance" \autocite[366]{turabian_manual_2013}.
+This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, \texttt{endnotes}, \texttt{xparse}, and \texttt{geometry}.\footnote{%
+	The \texttt{geometry} package is only required if using the deprecated \texttt{emptymargins} option.}
 
-\marginnote{\textbackslash tablenote}%
-The optional \texttt{\textbackslash tablenote} command provides formatting for each table footnote. It can be repeatedly used for each footnote accompanying a table.\footnote{A footnote mark for specific parts, however, is \emph{not} generated by the \texttt{\textbackslash tablenote} command. This must either be done manually or through the use of another package.}
+The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{fancyhdr}, \texttt{ellipsis}, and \texttt{threeparttable}.
 
-For each table, \texttt{\textbackslash tablenote} must be located inside the \texttt{table} environment, after the table itself.
 
-The following is an example accompanying the use of the \texttt{tabular} environment:
-\begin{lstlisting}
-	\begin{table}
-		...
-		\end{tabular}
-		\footnotesize
-		\tablenote{\emph{Source:} Citation for the table.}
-		\tablenote{\emph{Note:} A note related to the table.}
-		...
-	\end{table}
-\end{lstlisting}
+\section{Updates}
+\label{sec:updates}
 
+\marginnote{\rmfamily{\versionDateText}}%
 
+This update is a significant rewrite of \texttt{turabian-formatting}. It is designed to be faster and require fewer packages.
 
-\section{Required and Recommended Packages}
-\label{sec:required_packages}
+Both \texttt{turabian-researchpaper} and \texttt{turabian-thesis} can use the \texttt{noadjustbib} option.
 
-This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{setspace}, \texttt{xifthen}, \texttt{etoolbox}, \texttt{geometry}, \texttt{nowidow}, \texttt{footmisc}, \texttt{fancyhdr}, \texttt{titlesec}, \texttt{quoting}, \texttt{flafter}, \texttt{caption}, \texttt{endnotes}, \texttt{url}, \texttt{chngcntr}, and \texttt{xparse}.
+Significant adjustments made to the \texttt{\textbackslash maketitle} command, including support for footnotes.
 
-The following packages are highly recommended: \texttt{biblatex-chicago} and \texttt{ellipsis}.
+Double-spaced text is typeset with a \texttt{\textbackslash baselinestretch} of \texttt{2} using the \texttt{\textbackslash setstretch} command provided by the \texttt{setspace} package (instead of \texttt{\textbackslash doublespacing}). This is different than previous versions of \texttt{turabian-formatting} and should be more-consistent with expectations for ``double spaced" work.
 
-The \texttt{emptypage} package is also helpful in making empty pages without header and footers when using the \texttt{twoside} document class option.
+Packages no longer required: \texttt{xifthen}, \texttt{fancyhdr}, \texttt{titlesec}, \texttt{quoting}, \texttt{caption}, \texttt{flafter}, \texttt{url}, and \texttt{chngcntr}.
 
+Deprecated options: \texttt{emptymargins}.
 
+Deprecated commands: \texttt{\textbackslash tablenote}, \texttt{\textbackslash tablesource}, \texttt{\textbackslash faculty}, and \texttt{\textbackslash mydegree}.
 
-\section{Updates}
-\label{sec:updates}
+Removed commands: \texttt{\textbackslash setpageidentifier}, and \texttt{\textbackslash setwordcount}.
 
-\marginnote{\rmfamily{\versionDateText}}%
+\marginnote{\rmfamily{2015/11/14}}%
 
 Added support for the \texttt{endnotes} package. An \texttt{endnotes} option has been added, removing the need for an \texttt{endnotesonly} option for \texttt{turabian-researchpaper}.
 
@@ -373,8 +367,7 @@ Adjustments to the behaviour of table and figure positioning.
 
 Deprecated commands: \texttt{\textbackslash setwordcount}, \texttt{\textbackslash setpageidentifier}, and \texttt{\textbackslash tablesource}.
 
-Removed commands: 
-\texttt{\textbackslash mytitlepage}, and \texttt{\textbackslash setdraftindicator}.
+Removed commands: \texttt{\textbackslash mytitlepage} and \texttt{\textbackslash setdraftindicator}.
 
 \marginnote{\rmfamily{2014/12/27}}%
 Formatting changes to both subsection titles and title page for both research papers and theses/dissertations.
@@ -389,11 +382,6 @@ Adjustments to formatting that more-accurately reflect the 8th edition of Turabi
 
 The \texttt{endnotes} option generates an error if a cite key contains an underscore character (\texttt{\_}) when used with the \texttt{biblatex-chicago} package.
 
-Table captions, when the table is positioned at the top of a page, will have an additional vertical space of \texttt{0.5\textbackslash baselineskip} between the caption text and the top margin.
-
-Using the \texttt{geometry} package's \texttt{showframe} formatting option with the \texttt{emptymargins} formatting option, when making adjustments to the header and/or footer of the \texttt{plain} page style, will not render properly.
-
-
 
 \printbibliography
 
@@ -446,5 +434,6 @@ At this point, you've changed everything (including your marks!). Time to wrap u
 \end{lstlisting}
 
 
+\end{document}
+
 
-\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
index 4721c0e9db4..36636109f96 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
@@ -27,487 +27,610 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2015/11/14 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2016/02/27 Turabian Formatting]
 
 
 % Flags adjusted with package options
 
 \newif\if@optraggedright\@optraggedrightfalse
 
-\newif\if@optemptymargins\@optemptymarginsfalse
-
 \newif\if@appendbibformat\@appendbibformattrue
 
 \newif\if@endnotesformat\@endnotesformatfalse
 
 
-% Options for package
+% Declare package options
 
 \DeclareOption{raggedright}{\@optraggedrighttrue}
 
-\DeclareOption{emptymargins}{\@optemptymarginstrue}
+\DeclareOption{noadjustbib}{\@appendbibformatfalse}
 
 \DeclareOption{endnotes}{\@endnotesformattrue}
 
-\DeclareOption{noadjustbib}{\@appendbibformatfalse}
 
-\ProcessOptions\relax
+% emptymargins (deprecated option and flag)
 
+\newif\if@optemptymargins\@optemptymarginsfalse
 
-% Packages used throughout
+\DeclareOption{emptymargins}{\@optemptymarginstrue}
 
-\RequirePackage{setspace, xifthen, etoolbox}
 
+\ProcessOptions\relax
 
-% Page geometry and layout
 
-\RequirePackage{geometry}
+\RequirePackage{etoolbox}
 
-\geometry{margin=1in, ignoreall}
-\geometry{headheight=14.5pt, headsep=0.5in-\headheight}
-\geometry{footskip=0.5in-\headheight}
 
-\if@optemptymargins
-	\geometry{includehead}
+% Default margin size of 1 inch on all sides
+\setlength\textwidth{\paperwidth}
+	\addtolength\textwidth{-2in}
+\setlength\hoffset{\z@}
+
+\setlength\textheight{\paperheight}
+	\addtolength\textheight{-2in}
+\setlength\voffset{\z@}
+
+\setlength\oddsidemargin{\z@}
+\setlength\evensidemargin{\z@}
+
+% Default header height set to height of 1 line of text
+\ifcase \@ptsize
+	\setlength\headheight{10pt}
+\or
+	\setlength\headheight{11pt}
+\or
+	\setlength\headheight{12pt}
 \fi
 
+% Set header top and footer baseline to 0.5in from page edges
+\setlength\topmargin{-0.5in}
+\setlength\headsep{0.5in}
+	\addtolength\headsep{-\headheight}
+
+\setlength\footskip{0.5in}
 
-% Text formatting
 
-\doublespacing
-\setlength{\parindent}{0.5in}
+% Set default text spacing as double spaced
+\RequirePackage{setspace}
+\setstretch{2}
 
+% Preserve length of one line of text for subsequent use
+\newlength\tf@singlelineskip
+\setlength\tf@singlelineskip{0.5\baselineskip}
+
+% Set default paragraph indent
+\setlength\parindent{0.5in}
 \if@optraggedright
-	\newlength{\@parindentraggedright}
-	\setlength{\@parindentraggedright}{\parindent}
+	\newlength\tf@parindentraggedright
+	\setlength\tf@parindentraggedright{\parindent}
 	\raggedright
-	\setlength{\parindent}{\@parindentraggedright}
+	\setlength\parindent{\tf@parindentraggedright}
 \fi
 
-\RequirePackage[defaultlines=2, all]{nowidow}
-
-\RequirePackage{url}
-\urlstyle{same}
+% Prevent widowed text with 2 line default
+\PassOptionsToPackage{defaultlines=2, all}{nowidow}
+\AtEndPreamble{%
+	\@ifpackageloaded{nowidow}%
+		{}%
+		{\RequirePackage{nowidow}}}
 
 
-% Notes layout and formatting
+% Footnote layout and formatting
 
+\PassOptionsToPackage{bottom, marginal}{footmisc}
 \if@endnotesformat
 	\PassOptionsToPackage{perpage}{footmisc}
 \fi
 
-\RequirePackage[bottom, marginal]{footmisc}
+\RequirePackage{footmisc}
+
+\setlength\footnotemargin{\parindent}
 
-\setlength{\skip\footins}{12pt}
-\setlength{\footnotesep}{0.833\baselineskip}
+% Chicago symbols used when needed
+\setfnsymbol{chicago}
 
+% Separation between footnotes based on text size
+\ifcase \@ptsize
+	\setlength\footnotesep{16.65pt}
+\or
+	\setlength\footnotesep{18.7pt}
+\or
+	\setlength\footnotesep{20.4pt}
+\fi
+
+\setlength{\skip\footins}{\footnotesep}
+
+% Readjust default footnote rule size and placement
 \renewcommand{\footnoterule}{%
 	\vspace*{-3pt}
 	\hrule width 2in height 0.4pt
-	\vspace*{-10.4pt}}
+	\vspace*{-4pt}}
 
-% Footnote marker formatting: adjust \parindent and raggedright option
-\setlength{\footnotemargin}{0.5in}
+% Command to set footnote punctuation
+\newcommand{\tf@setfnpunct}[1]{\def\tf@thefnpunct{#1\,\,}}
+\tf@setfnpunct{.}
 
+% Renew command for typesetting footnotes
 \renewcommand{\@makefntext}[1]{%
 	\if@optraggedright
 		\raggedright%
 	\fi
-	\setlength{\parindent}{\footnotemargin}%
-	\@thefnmark.\,\,#1}
-
-
-% Header and footer style layouts
-
-\RequirePackage{fancyhdr}
-
-% Other identifier accompanying page number (deprecated formatting command)
-\newcommand{\pageidentifier}{}
-
-\newlength{\@pageidentifierspace}
-\setlength{\@pageidentifierspace}{0em}
-
-\newcommand{\setpageidentifier}[2][3ex]{%
-	\setlength{\@pageidentifierspace}{#1}
-	\renewcommand{\pageidentifier}{%
-		#2\hspace*{\@pageidentifierspace}}}
-
-\setpageidentifier{}
-
-% Draft indicator text (deprecated command not functional)
-\newcommand{\setdraftindicator}[1]{}
-
-% fancyhdr: page styles
-\fancyhf{}
-
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
-
-\fancypagestyle{plain}{%
-	\fancyhf{}
-	\fancyfoot[C]{\normalfont\singlespace \thepage}
-	\if@optemptymargins
-		\setlength{\headheight}{0pt}
-		\setlength{\headsep}{0pt}
-	\fi}
-
-\renewcommand{\plainheadrulewidth}{0pt}
-\renewcommand{\plainfootrulewidth}{0pt}
-
-\fancypagestyle{headings}{%
-	\fancyhf{}
-	\fancyhead[R]{\normalfont\singlespace \pageidentifier\thepage}}
-
-% fancy page style: allow customization of geometry first
-\AtEndPreamble{%
-	\pagestyle{headings}}
+	\setlength\parindent{\footnotemargin}%
+	\@thefnmark\tf@thefnpunct#1}
+
+
+% Redefine headings page style (places page number in header)
+\def\ps@headings{%
+	\let\@oddfoot\@empty
+	\let\@evenfoot\@empty
+	\def\@evenhead{\thepage\hfil\slshape\leftmark}
+	\def\@oddhead{{\slshape\rightmark}\hfil\thepage}
+	\let\@mkboth\@gobbletwo
+	\let\markboth\@mkboth
+	\let\chaptermark\@gobble
+	\let\sectionmark\@gobble}
+
+% Set myheadings page style to be the same as the headings page style 
+\let\ps@myheadings\ps@headings
+
+% Set default page style and page numbering
+\pagestyle{headings}
+\pagenumbering{arabic}
+
+% Adjust empty page style if twoside option used
+\if@twoside
+	\def\cleardoublepage{%
+		\clearpage
+		\ifodd\c@page
+		\else
+			\hbox{}
+			\thispagestyle{empty}
+			\newpage
+		\fi}
+\fi
 
-% Thesis-related front and main matter formatting
-\newlength{\@bindingoffsetfm}
-\setlength{\@bindingoffsetfm}{0in}
 
-\newlength{\@lmarginfm}
-\newlength{\@rmarginfm}
-\newlength{\@tmarginfm}
-\newlength{\@bmarginfm}
-
-% \frontmatter and \tableofcontents preserves geometry specified in preamble
-\AtEndPreamble{%
-	\setlength{\@bindingoffsetfm}{\Gm@bindingoffset}
-	\setlength{\@lmarginfm}{\Gm@lmargin}
-	\setlength{\@rmarginfm}{\Gm@rmargin}
-	\setlength{\@tmarginfm}{\Gm@tmargin}
-	\setlength{\@bmarginfm}{\Gm@bmargin}}
+% Thesis-related document structure formatting
 
 \appto{\frontmatter}{%
-	\singlespacing
-	\newgeometry{left=\@lmarginfm, right=\@rmarginfm, top=\@tmarginfm, bottom=\@bmarginfm, bindingoffset=\@bindingoffsetfm, ignoreall, noheadfoot}
+	\pagenumbering{roman}
 	\pagestyle{empty}}
 
-\if@optemptymargins
-	\preto{\tableofcontents}{%
-		\renewcommand{\contentsname}{Table of Contents}
-		\newgeometry{left=\@lmarginfm, right=\@rmarginfm, top=\@tmarginfm, bottom=\@bmarginfm, bindingoffset=\@bindingoffsetfm, ignoreall, nohead, includefoot, bottom=1in+\headheight}
-		\pagestyle{plain}}
-\else
-	\preto{\tableofcontents}{%
-		\renewcommand{\contentsname}{Table of Contents}
-		\restoregeometry
-		\pagestyle{plain}}
-\fi
+\renewcommand{\contentsname}{Table of Contents}
+
+\preto{\tableofcontents}{%
+	\pagestyle{plain}}
 
 \appto{\mainmatter}{%
-	\doublespacing
-	\restoregeometry
+	\pagenumbering{arabic}
 	\pagestyle{headings}}
 
 
-% Test if \chapter is defined by document class
-% Note: Important to test before titlesec defines \chapter
+% Headings formatting of \chapter, \section, \subsection, and \subsubsection
 
-\newif\if@nochapter\@nochaptertrue
+\setcounter{secnumdepth}{0}
 
-\ifcsdef{chapter}%
-	{\@nochapterfalse}%
-	{}
-
-
-% Title section formatting (including chapter)
-
-\RequirePackage[compact]{titlesec}
-
-\titleformat{\chapter}[display]%
-	{\normalfont\bfseries\normalsize\singlespacing\centering}%
-	{Chapter \thechapter}%
-	{0.833\baselineskip}%
-	{}
-\titlespacing*{\chapter}%
-	{0em}%
-	{-1.2\baselineskip}%
-	{0.833\baselineskip}
-\titlespacing*{name=\chapter,numberless}%
-	{0em}%
-	{-1.2\baselineskip}%
-	{0.833\baselineskip}
-
-\titleformat{\section}[block]%
-	{\normalfont\bfseries\normalsize\singlespacing\centering}%
-	{}%
-	{0pt}%
-	{}
-\titlespacing*{\section}%
-	{0em}%
-	{0.5\baselineskip}%
-	{0pt}
-% Two lines separating \section* heading from text if \chapter not defined
-\if@nochapter
-	\titlespacing*{name=\section,numberless}%
-		{0em}%
-		{0.5\baselineskip}%
-		{0.833\baselineskip}
-\fi
-
-\titleformat{\subsection}[block]%
-	{\normalfont\mdseries\normalsize\singlespacing\centering}%
-	{}%
-	{0pt}%
-	{}
-\titlespacing*{\subsection}%
-	{0em}%
-	{0.5\baselineskip}%
-	{0pt}
-
-\titleformat{\subsubsection}[block]%
-	{\normalfont\bfseries\normalsize\singlespacing\raggedright}%
-	{}%
-	{0pt}%
-	{}
-\titlespacing*{\subsubsection}%
-	{0em}%
-	{0.5\baselineskip}%
-	{0pt}
-
-
-% Title Page: optional text
-
-\newcommand{\subtitle}[1]{\def\@subtitle{#1}}
-\subtitle{}
-
-\newcommand{\course}[1]{\def\@course{#1}}
-\course{}
-
-\newcommand{\institution}[1]{\def\@institution{#1}}
-\institution{}
-
-% Custom title page command (deprecated command not functional)
-\newcommand{\mytitlepage}{}
-
-% Word-count text on title page (deprecated command)
-\newcommand{\setwordcount}[1]{\def\@wordcount{#1}}
-\setwordcount{}
-
-\newcommand{\@makewordcount}{%
-	\ifthenelse{\equal{\@wordcount}{}}%
-		{}
-		{\hspace*{\fill}\@wordcount}}
-
-
-% Renew \maketitle command if “titlepage” option (based on Research Paper title page).
+% \section formatting
 
+\ifcsdef{chapter}%
+	{%	If \chapter defined...
+		% \chapter formatting
+		\def\@makechapterhead#1{%
+			{	\normalfont\bfseries\normalsize\singlespacing\centering
+				\ifnum \c@secnumdepth >\m@ne
+					\if@mainmatter
+						\@chapapp\space \thechapter
+						\par\nobreak
+						\vspace*{1\baselineskip}%
+					\fi
+				\fi
+				\interlinepenalty\@M
+				#1\par\nobreak
+				\vspace{1\baselineskip}}}
+		% \chapter* formatting
+		\def\@makeschapterhead#1{%
+			{	\normalfont\bfseries\normalsize\singlespacing\centering
+				\interlinepenalty\@M
+				#1\par\nobreak
+				\vspace{1\baselineskip}}}
+	}%
+	{%	If \chapter not defined, differentiate and reformat \section*
+		\newlength\tf@ssectafterskip
+		\setlength\tf@ssectafterskip{1\p@}
+
+		% Flag if differentiate and reformat \section*
+		\newif\if@adjustssection\@adjustssectiontrue
+
+		% Command to disable differentiate and reformat \section*
+		\gdef\noadjustssect{\@adjustssectionfalse}
+
+		% Set length of space after \section*
+		\newlength\tf@ssectionafterskip
+		\setlength\tf@ssectionafterskip{\tf@singlelineskip}
+
+		\def\@startsection#1#2#3#4#5#6{%
+			\if@noskipsec \leavevmode \fi
+			\par
+			\@tempskipa #4\relax
+			\@afterindenttrue
+			\ifdim \@tempskipa <\z@
+				\@tempskipa -\@tempskipa \@afterindentfalse
+			\fi
+			\if@nobreak
+				\everypar{}%
+			\else
+				\addpenalty\@secpenalty\addvspace\@tempskipa
+			\fi
+			\setlength\tf@ssectafterskip{#5}
+			\if@adjustssection
+				\ifstrequal{#1}{section}%
+					{\setlength\tf@ssectafterskip{\tf@ssectionafterskip}}%
+					{}%
+			\fi
+			\@ifstar
+				{\@ssect{#3}{#4}{\tf@ssectafterskip}{#6}}%
+				{\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+	}
+
+% \subsection and \subsubsection formatting
+
+\renewcommand{\section}{%
+	\@startsection{section}{1}%
+		{\z@}%
+		{-\tf@singlelineskip}%
+		{1\p@}%
+		{\normalfont\bfseries\normalsize\singlespacing\centering}}
+
+\renewcommand{\subsection}{%
+	\@startsection{subsection}{2}%
+		{\z@}%
+		{-\tf@singlelineskip}%
+		{1\p@}%
+		{\normalfont\mdseries\normalsize\singlespacing\centering}}
+
+\renewcommand{\subsubsection}{%
+	\@startsection{subsubsection}{3}%
+		{\z@}%
+		{-\tf@singlelineskip}%
+		{1\p@}%
+		{\normalfont\bfseries\normalsize\singlespacing\raggedright}}
+
+
+% Title page commands for use with \maketitle
+
+\newcommand{\subtitle}[1]{\gdef\tf@subtitle{#1}}
+\subtitle{\@empty}
+
+\newcommand{\submissioninfo}[1]{\gdef\tf@submissioninfo{#1}}
+\submissioninfo{\@empty}
+
+\newcommand{\course}[1]{\gdef\tf@course{#1}}
+\course{\@empty}
+
+\newcommand{\institution}[1]{\gdef\tf@institution{#1}}
+\institution{\@empty}
+
+\newcommand{\department}[1]{\gdef\tf@department{#1}}
+\department{\@empty}
+
+\newcommand{\location}[1]{\gdef\tf@location{#1}}
+\location{\@empty}
+
+% Renew \maketitle (for research papers default)
 \if@titlepage
+	% Formatting for titlepage option
 	\renewcommand{\maketitle}{%
 		\begin{titlepage}%
-			\newgeometry{margin=1in, ignoreall, noheadfoot}
-			\let\footnotesize\small
+			\tf@setfnpunct{}
+			\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
 			\let\footnoterule\relax
-			\let\footnote\thanks
 			\normalfont\normalsize\centering\singlespacing
-			\vspace*{-1.2\baselineskip}
+			\parskip=1\baselineskip
+			\vspace*{-2\baselineskip}
 			\vspace*{0.333\paperheight}
 			\vspace*{-1in}
-			\ifthenelse{\equal{\@subtitle}{}}%
-				{%
-					{\bfseries\@title}\par%
-				}%
-				{%
-					{\bfseries\@title :}\par
-					\vspace*{0.833\baselineskip}
-					{\bfseries\@subtitle}\par%
-				}
-			\vspace*{\stretch{1}}
-			\parskip=0.833\baselineskip
-			\@author\par
-			\@course\par
-			\@institution\par
+			{	\bfseries\@title\par%
+				\tf@subtitle\par}%
+			\vspace*{2.35in}
+			\@author\@thanks\par
+			\tf@course\par
+			\tf@submissioninfo\par
 			\@date\par
-			\parskip=0pt
-			\vspace*{\stretch{1}
-			\@makewordcount}
+			\parskip=\z@
 		\end{titlepage}%
-
-		\setcounter{footnote}{0}%
-
-		\global\let\thanks\relax
-		\global\let\maketitle\relax
-
-		\global\let\@thanks\@empty
-		\global\let\@author\@empty
-		\global\let\@course\@empty
-		\global\let\@institution\@empty
-		\global\let\@date\@empty
-		\global\let\@title\@empty
-		\global\let\@subtitle\@empty
-		\global\let\@wordcount\@empty
-
-		\global\let\title\relax
-		\global\let\subtitle\relax
-		\global\let\author\relax
-		\global\let\date\relax
-		\global\let\course\relax
-		\global\let\institution\relax
-		\global\let\and\relax
-		\global\let\setwordcount\relax
-		
-		\restoregeometry}
+		\tf@emptymaketitle
+		\cleardoublepage}
+\else
+	% Formatting for notitlepage option
+	\renewcommand{\maketitle}{%
+		\thispagestyle{plain}
+		{	\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
+			\normalfont\normalsize\centering\singlespacing
+			\parskip=1\baselineskip
+			\vspace*{0.5in}
+			\vspace*{-1.5\baselineskip}
+			{	\bfseries\@title\par%
+				\tf@subtitle\par}%
+			\vspace*{1\baselineskip}
+			\@author\@thanks\par
+			\tf@course\par
+			\tf@submissioninfo\par
+			\@date\par
+			\vspace*{0.5in}
+			\vspace*{-1\baselineskip}}
+		\tf@emptymaketitle}
 \fi
 
+% Command for emptying/completing \maketitle
+\newcommand{\tf@emptymaketitle}{%
+	% if not endnotes, reset footnote counter
+	\if@endnotesformat
+	\else
+		\setcounter{footnote}{0}
+	\fi
 
-% Block quotations/quotes formatting
+	% Clear command content at end of \maketitle
+	\global\let\thanks\relax
+	\global\let\maketitle\relax
+
+	\global\let\@thanks\@empty
+	\global\let\@author\@empty
+	\global\let\@date\@empty
+	\global\let\@title\@empty
+	\global\let\tf@subtitle\@empty
+	\global\let\tf@course\@empty
+	\global\let\tf@institution\@empty
+	\global\let\tf@department\@empty
+	\global\let\tf@location\@empty
+	\global\let\tf@submissioninfo\@empty
+
+	\global\let\title\relax
+	\global\let\author\relax
+	\global\let\date\relax
+	\global\let\subtitle\relax
+	\global\let\course\relax
+	\global\let\institution\relax
+	\global\let\department\relax
+	\global\let\location\relax
+	\global\let\submissioninfo\relax}
+
+
+% Block quotation and quote formatting
+
+\renewenvironment{quotation}
+	{	\list{}{%
+			\setlength\listparindent{\parindent}
+			\setlength\itemindent{\listparindent}
+			\setlength\leftmargin{\parindent}
+			% Adjust right margin based on raggedright option
+			\if@optraggedright	
+				\setlength\rightmargin{\z@}
+			\else
+				\setlength\rightmargin{\leftmargin}
+			\fi
+			\setlength\parsep{\z@}
+			% Place line spacing between text and quotation
+			\ifnumequal{\baselinestretch}{1}%
+				{\setlength\topsep{\baselineskip}}%
+				{\setlength\topsep{\z@}}}%
+		\singlespacing%
+		\item\relax}
+	{\endlist}
+
+% Set quote environment to be the same as the quotation environment
+\def\quote{\quotation}
 
-\RequirePackage{quoting}
 
-\renewcommand*{\quotingfont}{\singlespace}
-\quotingsetup{%
-	vskip=0\baselineskip,
-	leftmargin=0.5in,
-	rightmargin=0.5in}
+% Tables and Figures: float positioning
 
-\if@optraggedright	
-	\quotingsetup{rightmargin=0in}
-\fi
+\setlength\textfloatsep{1\baselineskip plus 2pt}
+\setlength\floatsep{1\baselineskip plus 2pt}
+\setlength\intextsep{1\baselineskip plus 2pt}
 
-\renewcommand{\quotation}{\quoting}
-\renewcommand{\quote}{\quoting}
+\def\fps@table{!htb}
+\def\fps@figure{!htb}
 
 
-% Tables and Figures: float positioning
+% Tables and Figures: caption formatting
 
-\renewcommand\fps@table{!htp}
-\renewcommand\fps@figure{!htp}
+\setlength\abovecaptionskip{\z@}
+\setlength\belowcaptionskip{\z@}
 
-\setlength{\textfloatsep}{1\baselineskip plus0.5\baselineskip minus0.5\baselineskip}
-\setlength{\intextsep}{1\baselineskip plus0.5\baselineskip minus0.5\baselineskip}
+\long\def\@makecaption#1#2{%
+	\vskip\abovecaptionskip
+	\if@optraggedright
+		\raggedright%
+	\fi
+	\small#1. #2\par
+	\vskip\belowcaptionskip}
 
-\RequirePackage{flafter}
 
+% Table footnote (deprecated)
 
-\setlength{\abovecaptionskip}{0pt}
-\setlength{\belowcaptionskip}{0pt}
+\newcommand{\tablenote}[1]{%
+	\if@optraggedright
+		\raggedright%
+	\fi
+	\vspace{1\baselineskip}
+	#1\par}
 
 
-% Tables and Figures: caption formatting
+% Table footnote source line (deprecated)
 
-\RequirePackage{caption}
+\newcommand{\tablesource}{\tablenote}
 
-\captionsetup{%
-	format=plain,
-	font=small,
-	singlelinecheck=false,
-	justification=justified,
-	labelsep=period,
-	skip=0.167\baselineskip}
 
-\if@optraggedright
-	\captionsetup{justification=raggedright}
-\fi
+% thebibliography environment formatting (adjust \@openbib@code hook default)
 
-\captionsetup[table]{position=top}
+\setlength\bibindent{\parindent}
 
-\captionsetup[figure]{position=bottom}
+\renewcommand\@openbib@code{%
+	\singlespacing
+	\setlength\leftmargin{\bibindent}
+	\setlength\itemindent{-\bibindent}
+	\addtolength\itemindent{\labelsep}
+	\addtolength\itemindent{\labelwidth}
+	\setlength\itemsep{\tf@singlelineskip}
+	\setlength\parsep{\z@}}
 
 
-% Tables: table footnote formatting command
+% biblatex-chicago: set formatting defaults
 
-\newcommand{\tablenote}[1]{%
-	\if@optraggedright
-		\raggedright%
-	\fi
-	\vspace{1\baselineskip}
-	#1\par}
+% Provide warning if biblatex-chicago loaded before turabian-formatting
+\@ifpackageloaded{biblatex-chicago}%
+	{%
+		\PackageWarningNoLine{turabian-formatting}{Consider loading the biblatex-chicago package after the turabian-formatting package. See documentation for more information}%
+	}%
+	{}
 
-% Table footnote source line (deprecated command made same as \tablenote)
-\newcommand{\tablesource}{\tablenote}
+\PassOptionsToPackage%
+	{isbn=false, autolang=other, footmarkoff, backend=biber}%
+	{biblatex-chicago}
+
+\if@appendbibformat
+	\AtEndPreamble{%
+		\@ifpackageloaded{biblatex}%
+			{%
+				\renewcommand{\bibsetup}{\singlespacing}
+				\renewcommand{\bibitemsep}{1\baselineskip}
+				\renewcommand{\bibhang}{0.5in}
+			}%
+			{}}
+\fi
 
 
 % endnotes package support: formatting
-% Note: endnotes package causes error when cite keys contain “_”.
+% Note: endnotes package causes error when cite keys contain "_".
 
 \if@endnotesformat
 
-	\RequirePackage{endnotes, chngcntr, xparse}
+	\RequirePackage{endnotes, xparse}
 
 	% Changes footnote marker type and formatting
-	\setfnsymbol{chicago}
+	\tf@setfnpunct{}
 	\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
-	\renewcommand{\@makefntext}[1]{%
-		\if@optraggedright
-			\raggedright%
-		\fi
-		\setlength{\parindent}{\footnotemargin}%
-		\@thefnmark\,\,#1}
 
 	\PassOptionsToPackage{notetype=endonly}{biblatex-chicago}
 
-	% Endnotes layout and formatting
-	\if@nochapter
-		\renewcommand{\enoteheading}{%
-			\section*{\notesname}%
-			\@mkboth{\notesname}{\notesname}%
-			\mbox{}\par%
-			\vspace*{-1.833\baselineskip}%
-			\let\@afterindentfalse\@afterindenttrue
-			\singlespacing}%
-	\else
-		\let\latexchapter\chapter
-
-		\counterwithin*{endnote}{chapter}
-		\renewcommand{\enoteheading}{%
-			\latexchapter*{\notesname}%
-			\@mkboth{\notesname}{\notesname}%
-			\mbox{}\par%
-			\vspace*{-1.833\baselineskip}%
-			\let\@afterindentfalse\@afterindenttrue
-			\singlespacing}%
-
-		% Insert chapter subheadings in \theendnotes
-		\RenewDocumentCommand{\chapter}{som}{%
-			\IfBooleanTF{#1}%
-				{%
-					\latexchapter*{#3}%
-					\setcounter{endnote}{0}%
-					\addtoendnotes{%
-						\noexpand\enotedivision{\noexpand\section*}%
-							{\unexpanded{#3}}}%
-				}%
-				{%
-					\IfNoValueTF{#2}%
-						{\latexchapter{#3}}%
-						{\latexchapter[#2]{#3}}%
-					\addtoendnotes{%
-						\noexpand\enotedivision%
-							{\noexpand\section*}%
-							{\chaptername\ \thechapter}}%
-				}}
-		\def\enotedivision#1#2{\@ifnextchar\enotedivision{}{#1{#2}}}
-	\fi
+	% Endnotes layout and formatting (based on if chapter is defined)
+	\ifcsdef{chapter}%
+		{%	If \chapter defined...
+			\let\tf@chapter\chapter
+
+			% Renew Notes heading formatted as \chapter* (also added to Table of Content)
+			\@addtoreset{endnote}{chapter}
+			\renewcommand{\enoteheading}{%
+				\tf@chapter*{\notesname}%
+				\@mkboth{\notesname}{\notesname}%
+				\addcontentsline{toc}{chapter}{\notesname}%
+				\mbox{}\par%
+				\vspace{-1.5\baselineskip}%
+				\let\@afterindentfalse\@afterindenttrue
+				\singlespacing}%
+
+			% Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
+			\RenewDocumentCommand{\chapter}{som}{%
+				\IfBooleanTF{#1}%
+					{%
+						\tf@chapter*{#3}%
+						\setcounter{endnote}{0}%
+						\addtoendnotes{%
+							\noexpand\enotedivision%
+								{\noexpand\section*}%
+								{\unexpanded{#3}}}%
+					}%
+					{%
+						\IfNoValueTF{#2}%
+							{\tf@chapter{#3}}%
+							{\tf@chapter[#2]{#3}}%
+						\addtoendnotes{%
+							\noexpand\enotedivision%
+								{\noexpand\section*}%
+								{\chaptername\ \thechapter}}%
+					}}
+			\def\enotedivision#1#2{\@ifnextchar\enotedivision{}{#1{#2}}}%
+		}%
+		{%	If \chapter not defined, Notes heading formatted as \section*
+			\renewcommand{\enoteheading}{%
+				\section*{\notesname}%
+				\markboth{\notesname}{\notesname}%
+				\addcontentsline{toc}{section}{\notesname}%
+				\mbox{}\par%
+				\vspace{-1.5\baselineskip}%
+				\let\@afterindentfalse\@afterindenttrue
+				\singlespacing}%
+		}%
+
+	% Set default endnotes formatting
 	\renewcommand{\enotesize}{\normalsize}
 	\renewcommand{\enoteformat}{%
 		\if@optraggedright
 			\raggedright%
 		\fi
-		\setlength{\parindent}{\footnotemargin}
-		\vspace*{1\baselineskip}
+		\setlength\parindent{\footnotemargin}
+		\vspace{1\baselineskip}
 		\theenmark.\,\,}
 
 \fi
 
 
-% biblatex-chicago: citation formatting defaults
+% emptymargins option (deprecated)
 
-\PassOptionsToPackage%
-	{isbn=false, autolang=other, footmarkoff, backend=biber}%
-	{biblatex-chicago}
+\if@optemptymargins
+
+	% Adjust top margin height by 0.5in
+	\addtolength\textheight{-0.5in}
+	\addtolength\topmargin{0.5in}
+
+	\newlength\tf@headsep
+	\setlength\tf@headsep{\headsep}
+
+	% Load geometry if needed
+	\@ifpackageloaded{geometry}%
+		{}%
+		{\RequirePackage{geometry}}
+
+	% Set geometry package defaults to match default layout
+	\geometry{margin=1in, ignoreall, onecolumn}
+	\geometry{headheight=14.5pt}
+	\geometry{footskip=0.5in}
+	\geometry{includehead}
+
+	% Adjust plain page style formatting
+	\appto{\ps@plain}{%
+		\setlength\headsep{\z@}
+		\setlength\headheight{\z@}}
+
+	\newlength\tf@lmargin
+	\newlength\tf@rmargin
+	\newlength\tf@tmargin
+	\newlength\tf@bmargin
+	\newlength\tf@bindingoffset
+
+	% Adjustments to empty page style layout
+	\newcommand{\tf@emptygeometry}{%
+		\newgeometry{left=\tf@lmargin, right=\tf@rmargin, top=\tf@tmargin, bottom=\tf@bmargin, bindingoffset=\tf@bindingoffset, ignoreall, noheadfoot}}
+		
+	\if@titlepage
+		\preto{\maketitle}{\tf@emptygeometry}
+		\appto{\maketitle}{\restoregeometry}
+	\fi
+
+	\preto{\frontmatter}{\tf@emptygeometry}
+	\preto{\tableofcontents}{\restoregeometry}
+	\preto{\mainmatter}{\restoregeometry}
 
-\if@appendbibformat
 	\AtEndPreamble{%
-		\@ifpackageloaded{biblatex}%
-			{%
-				\AtBeginBibliography{\vspace*{-0.333\baselineskip}}
-				\renewcommand{\bibsetup}{\singlespacing}
-				\renewcommand{\bibitemsep}{1\baselineskip}
-				\renewcommand{\bibhang}{0.5in}
-			}%
-			{}}
+		\setlength\tf@bindingoffset{\oddsidemargin}
+		\geometry{bindingoffset=\tf@bindingoffset, headsep=\tf@headsep}		
+
+		% Preserve lengths for subsequent use with \tf@emptygeometry
+		\setlength\tf@lmargin{\Gm@lmargin}
+		\setlength\tf@rmargin{\Gm@rmargin}
+		\setlength\tf@tmargin{\Gm@tmargin}
+		\setlength\tf@bmargin{\Gm@bmargin}
+		\setlength\tf@bindingoffset{\Gm@bindingoffset}}
+
 \fi
 
 
diff --git a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
index 03e71de5223..8894de03c3e 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
@@ -27,52 +27,56 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-researchpaper}[2015/11/14 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2016/02/27 Turabian Research Paper]
 
 
 % Default point size
 \def\@@ptsize{12pt}
 
 
-% Options for document class, some passed to article class
+% Options for document class
 
 \DeclareOption{raggedright}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
-\DeclareOption{emptymargins}{%
+\DeclareOption{noadjustbib}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 \DeclareOption{endnotes}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
-% Option for Endnotes (deprecated option not functional)
-\DeclareOption{endnotesonly}{%
-	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider the 'endnotes' option instead.}
-	\OptionNotUsed}
-
 \DeclareOption{twocolumn}{%
 	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.}
 	\OptionNotUsed}
 
-\DeclareOption{notitlepage}{%
-	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.}
-	\OptionNotUsed}
-
 \DeclareOption{10pt}{\def\@@ptsize{10pt}}
 
 \DeclareOption{11pt}{\def\@@ptsize{11pt}}
 
 \DeclareOption{12pt}{\def\@@ptsize{12pt}}
 
+
+% Deprecated options
+\DeclareOption{emptymargins}{%
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated.}
+	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
+
+\DeclareOption{endnotesonly}{%
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider using the 'endnotes' option instead.}
+	\OptionNotUsed}
+
+
+% Pass other options to article document class
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 
 \ProcessOptions\relax
 
 
+% Build upon article document class
 \LoadClass[titlepage,oneside,onecolumn,\@@ptsize]{article}
 
 
-
+% Load turabian-formatting package
 \RequirePackage{turabian-formatting}
 
 
diff --git a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
index ae4bbeb6775..04ec2bdb1b6 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
@@ -27,19 +27,19 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-thesis}[2015/11/14 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2016/02/27 Turabian Theses and Dissertations]
 
 
 % Default point size
 \def\@@ptsize{12pt}
 
 
-% Options for document class, some passed to book class
+% Options for document class
 
 \DeclareOption{raggedright}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
-\DeclareOption{emptymargins}{%
+\DeclareOption{noadjustbib}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 \DeclareOption{endnotes}{%
@@ -59,112 +59,104 @@
 
 \DeclareOption{12pt}{\def\@@ptsize{12pt}}
 
+
+% Deprecated option
+\DeclareOption{emptymargins}{%
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated.}
+	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
+
+
+% Pass other options to book document class
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 
 \ProcessOptions\relax
 
 
+% Build upon book document class
 \LoadClass[titlepage,oneside,onecolumn,\@@ptsize]{book}
 
 
-\RequirePackage{geometry}
-
+% Load turabian-formatting package
 \RequirePackage{turabian-formatting}
 
 
-% Margin adjustment by increasing the binding off-set
+% Create binding offset of 0.5in
+\setlength\oddsidemargin{0.5in}
+\setlength\evensidemargin{\z@}
+\addtolength\textwidth{-\oddsidemargin}
 
-\geometry{bindingoffset=0.5in}
 
+% Title page commands for use with \maketitle (deprecated, not functional)
 
-% Renew \maketitle command Thesis/Dissertation title page.
+\newcommand{\faculty}[1]{\gdef\tf@faculty{#1}}
+\faculty{\@empty}
+
+\newcommand{\mydegree}[1]{\gdef\tf@mydegree{#1}}
+\mydegree{\@empty}
 
-\institution{[Institution]}
 
-\newcommand{\faculty}[1]{\def\@faculty{#1}}
-\faculty{[Faculty]}
+% Renew \maketitle command for Thesis/Dissertation title page
 
-\newcommand{\mydegree}[1]{\def\@mydegree{#1}}
-\mydegree{[Degree]}
+\submissioninfo{%
+	A Dissertation Submitted to\par
+	[Faculty]\par
+	in Candidacy for the Degree of\par
+	[Degree]}
 
-\newcommand{\department}[1]{\def\@department{#1}}
 \department{[Department]}
 
-\newcommand{\location}[1]{\def\@location{#1}}
+\institution{[Institution]}
+
 \location{[City], [State/Province]}
 
 \renewcommand{\maketitle}{%
 	\begin{titlepage}%
-		\let\footnotesize\small
+		\singlespacing
+		\tf@setfnpunct{}
+		\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
 		\let\footnoterule\relax
-		\renewcommand{\thanks}[1]{\def\@thanks{##1}}
-		\thanks{}
 		\normalfont\normalsize
 		\begin{center}
 			\vspace*{-1.2\baselineskip}
-			\parskip=0.833\baselineskip
-			\@institution\par
+			\parskip=1\baselineskip
+			\tf@institution\par
 			\vspace*{\stretch{1}}
-			\ifthenelse{\equal{\@subtitle}{}}%
-				{%
-					{\bfseries\@title}\par%
-				}%
-				{%
-					{\bfseries\@title :}\par
-					{\bfseries\@subtitle}\par%
-				}
+			{\bfseries\@title}\par
+			{\bfseries\tf@subtitle}\par%
 			\vspace*{\stretch{1}}
-			A Dissertation Submitted to\par
-			\@faculty\par
-			in Candidacy for the Degree of\par
-			\@mydegree\par
+			\tf@submissioninfo\par
 			\vspace*{1\baselineskip}
-			\@department\par
+			\tf@department\par
 			\vspace*{\stretch{1}}
 			by\par
 			{\bfseries\@author}\par
 			\vspace*{\stretch{1}}
-			\@location\par
+			\tf@location\par
 			\@date
 			\parskip=0pt
 		\end{center}%
 	\end{titlepage}%
-
-	% Copyright page
 	\setcounter{page}{2}
-	\singlespacing
-	\vspace*{\stretch{1}}
-	\noindent Copyright \copyright\ \the\year\ by \@author \\*\noindent All rights reserved
-	\clearpage
-
-	\setcounter{footnote}{0}
-
-	\global\let\thanks\relax
-	\global\let\maketitle\relax
-
-	\global\let\@thanks\@empty
-	\global\let\@author\@empty
-	\global\let\@course\@empty
-	\global\let\@institution\@empty
-	\global\let\@date\@empty
-	\global\let\@title\@empty
-	\global\let\@subtitle\@empty
-	\global\let\@location\@empty
-	\global\let\@mydegree\@empty
-	\global\let\@department\@empty
+	\tf@emptymaketitle
 	\global\let\@faculty\@empty
-
-	\global\let\title\relax
-	\global\let\subtitle\relax
-	\global\let\author\relax
-	\global\let\date\relax
-	\global\let\course\relax
-	\global\let\institution\relax
-	\global\let\location\relax
-	\global\let\mydegree\relax
-	\global\let\department\relax
+	\global\let\@mydegree\@empty
 	\global\let\faculty\relax
-	\global\let\and\relax
-}
+	\global\let\mydegree\relax
+	\cleardoublepage}
+
+
+% Renew \contentsname based on language package
+
+\AtEndPreamble{
+	\@ifpackageloaded{polyglosia}%
+		{%
+			\addto\captionsenglish{%
+				\renewcommand{\contentsname}{Table of Contents}}%
+		}{}
+	\@ifpackageloaded{babel}%
+		{%
+			\addto\captionsenglish{%
+				\renewcommand{\contentsname}{Table of Contents}}%
+		}{}}