turabian-formatting (13jul16)

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

3 files changed, 415 insertions, 208 deletions

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 99173b8c487..08e2137cfc0 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
@@ -27,7 +27,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2016/03/18 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2016/07/12 Turabian Formatting]
 
 
 % Flags adjusted with package options
@@ -52,13 +52,6 @@
 \DeclareOption{endnotes}{\@endnotesformattrue}
 
 
-% emptymargins (deprecated option and flag)
-
-\newif\if@optemptymargins\@optemptymarginsfalse
-
-\DeclareOption{emptymargins}{\@optemptymarginstrue}
-
-
 \ProcessOptions\relax
 
 
@@ -104,11 +97,16 @@
 
 % Set default paragraph indent
 \setlength\parindent{0.5in}
+
+% Renew \raggedright to preserve paragraph indent and set \@optraggedright to true
+\def\raggedright{%
+	\let\\\@centercr\@rightskip\@flushglue \rightskip\@rightskip
+	\leftskip\z@skip
+	\@optraggedrighttrue}
+
+% Set \raggedright if raggedright option true
 \if@optraggedright
-	\newlength\tf@parindentraggedright
-	\setlength\tf@parindentraggedright{\parindent}
 	\raggedright
-	\setlength\parindent{\tf@parindentraggedright}
 \fi
 
 % Prevent widowed text with 2 line default
@@ -196,31 +194,73 @@
 
 % Thesis-related document structure formatting
 
-\appto{\frontmatter}{%
-	\pagenumbering{roman}
-	\pagestyle{empty}}
-
-\renewcommand{\contentsname}{Table of Contents}
-
-\preto{\tableofcontents}{%
-	\pagestyle{plain}}
-
-\appto{\mainmatter}{%
-	\pagenumbering{arabic}
-	\pagestyle{headings}}
+\ifcsdef{chapter}%
+	{%
+		\providebool{@mainmatter}
+		\@mainmattertrue
+	
+		\def\frontmatter{%
+			\cleardoublepage
+			\@mainmatterfalse
+			\pagenumbering{roman}
+			\pagestyle{empty}}
+
+		\def\mainmatter{%
+			\cleardoublepage
+			\@mainmattertrue
+			\pagenumbering{arabic}
+			\pagestyle{headings}
+			\addtocontents{toc}{\protect\addvspace{1\baselineskip}}}
+
+		\def\backmatter{%
+			\if@openright
+				\cleardoublepage
+			\else
+				\clearpage
+			\fi
+			\@mainmatterfalse
+			\setcounter{chapter}{0}%
+			\setcounter{figure}{0}%
+			\setcounter{table}{0}%
+			\addtocontents{toc}{\protect\addvspace{1\baselineskip}}}
+	}%
+	{}
 
 
 % Headings formatting of \chapter, \section, \subsection, and \subsubsection
 
+% Top section command name (chapter or section?)
+\ifcsdef{chapter}%
+	{\def\tf@topsecname{chapter}}%
+	{\def\tf@topsecname{section}}
+
 \setcounter{secnumdepth}{0}
 
-% \section formatting
+% \section and \chapter formatting
 
 \ifcsdef{chapter}%
 	{%	If \chapter defined...
 		% \chapter formatting
+		\def\tf@chapformat{\normalfont\bfseries\normalsize\singlespacing\centering}
+		\def\tf@chapcounter{\refstepcounter{chapter}}
+		\def\@chapter[#1]#2{%
+			\ifnum \c@secnumdepth >\m@ne
+				\if@mainmatter
+					\tf@chapcounter
+					\typeout{\@chapapp\space\thechapter.}%
+					\addcontentsline{toc}{chapter}%
+						{\protect\numberline{\@chapapp\space\thechapter.}#1}%
+				\else
+					\addcontentsline{toc}{chapter}{#1}%
+				\fi
+			\else
+				\addcontentsline{toc}{chapter}{#1}%
+			\fi
+			\chaptermark{#1}%
+			\@makechapterhead{#2}%
+			\@afterheading}
 		\def\@makechapterhead#1{%
-			{	\normalfont\bfseries\normalsize\singlespacing\centering
+			{	\tf@chapformat
 				\ifnum \c@secnumdepth >\m@ne
 					\if@mainmatter
 						\@chapapp\space \thechapter
@@ -229,29 +269,37 @@
 					\fi
 				\fi
 				\interlinepenalty\@M
-				#1\par\nobreak
-				\vspace{1\baselineskip}}}
+				\ifstrempty{#1}%
+					{}%
+					{%
+						#1\par\nobreak
+						\vspace{1\baselineskip}%
+					}}}
 		% \chapter* formatting
 		\def\@makeschapterhead#1{%
-			{	\normalfont\bfseries\normalsize\singlespacing\centering
+			{	\tf@chapformat
 				\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*
+		% \section* adjustment to space after heading
 		\newif\if@adjustssection\@adjustssectiontrue
 
+		\newlength\tf@ssectafterskip
+		\setlength\tf@ssectafterskip{1\p@}
+
 		% Command to disable differentiate and reformat \section*
 		\gdef\noadjustssect{\@adjustssectionfalse}
 
-		% Set length of space after \section*
-		\newlength\tf@ssectionafterskip
-		\setlength\tf@ssectionafterskip{\tf@singlelineskip}
+		% \section adjustment to space after heading
+		\newif\if@tf@adjustsection\@tf@adjustsectionfalse
+
+		\newlength\tf@sectafterskip
+		\setlength\tf@sectafterskip{1\p@}
 
+		% Redefine \@startsection to differentiate starred version
 		\def\@startsection#1#2#3#4#5#6{%
 			\if@noskipsec \leavevmode \fi
 			\par
@@ -268,12 +316,58 @@
 			\setlength\tf@ssectafterskip{#5}
 			\if@adjustssection
 				\ifstrequal{#1}{section}%
-					{\setlength\tf@ssectafterskip{\tf@ssectionafterskip}}%
+					{\setlength\tf@ssectafterskip{\tf@singlelineskip}}%
+					{}%
+			\fi
+			\setlength\tf@sectafterskip{#5}
+			\if@tf@adjustsection
+				\ifstrequal{#1}{section}%
+					{\setlength\tf@sectafterskip{\tf@singlelineskip}}%
 					{}%
 			\fi
 			\@ifstar
 				{\@ssect{#3}{#4}{\tf@ssectafterskip}{#6}}%
-				{\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
+				{\@dblarg{\@sect{#1}{#2}{#3}{#4}{\tf@sectafterskip}{#6}}}}
+
+		% Default formatting between \@svsec and heading
+		\protected@edef\tf@secsep#1#2{\@empty}
+		
+		% Default formatting of TOC \addcontentsline
+		\def\tf@tocline#1{%
+			\protect\numberline{\csname the#1\endcsname\quad}}
+
+		% Redefine \@sect to support variable formatting (i.e. appendixes)
+		\def\@sect#1#2#3#4#5#6[#7]#8{%
+			\ifnum #2>\c@secnumdepth
+				\let\@svsec\@empty
+			\else
+				\refstepcounter{#1}%
+				\protected@edef\@svsec{\@seccntformat{#1}\relax}%
+			\fi
+			\@tempskipa #5\relax
+			\ifdim \@tempskipa>\z@
+				\begingroup
+					#6{%
+						\@hangfrom{\hskip #3\relax\@svsec}%
+						\interlinepenalty \@M \tf@secsep{#1}{#8}#8\@@par}%
+				\endgroup
+				\csname #1mark\endcsname{#7}%
+				\addcontentsline{toc}{#1}{%
+					\ifnum #2>\c@secnumdepth \else
+						\tf@tocline{#1}%
+					\fi
+					#7}%
+			\else
+				\def\@svsechd{%
+					#6{\hskip #3\relax\@svsec #8}%
+					\csname #1mark\endcsname{#7}%
+					\addcontentsline{toc}{#1}{%
+						\ifnum #2>\c@secnumdepth \else
+							\protect\numberline{\csname the#1\endcsname\quad}%
+						\fi
+						#7}}%
+			\fi
+			\@xsect{#5}}
 	}
 
 % \subsection and \subsubsection formatting
@@ -399,30 +493,181 @@
 	\global\let\submissioninfo\relax}
 
 
-% Block quotation and quote formatting
+% Table of Contents 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}
+% Renew \tableofcontents with single spacing support
 
-% Set quote environment to be the same as the quotation environment
-\def\quote{\quotation}
+\renewcommand{\tableofcontents}{%
+	\ifstrequal{\tf@topsecname}{chapter}%
+		{\pagestyle{plain}}%
+		{\thispagestyle{plain}}%
+	\expandafter\csname \tf@topsecname\endcsname*{\contentsname}%
+	\@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
+	\if@optraggedright
+		\let\tf@tocrmarg\@tocrmarg
+		\def\@tocrmarg{\tf@tocrmarg plus1fil}
+	\fi
+	\singlespacing%
+	\vspace{-1\baselineskip}
+	\@starttoc{toc}%
+	\setstretch{2}}%
+
+% Right margin and number width formatting
+\def\@tocrmarg{0.5in}
+\def\@pnumwidth{0.2in}
+
+\ifcsdef{chapter}%
+	{%	If \chapter defined...
+		\setcounter{tocdepth}{0}	
+
+		\renewcommand*{\l@chapter}[2]{%
+			\ifnum \c@tocdepth >\m@ne
+				\addpenalty{-\@highpenalty}%
+				\setlength\@tempdima{7.5em}%
+				\vskip 1\baselineskip
+				{	\parindent \z@
+					\rightskip \@tocrmarg
+					\parfillskip -\rightskip
+					\leavevmode
+					\ifnum \c@tocdepth >\z@ \bfseries \fi
+					\advance\leftskip\@tempdima
+					\hskip -\leftskip
+					#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+					\penalty\@highpenalty}
+			\fi}
+
+		\renewcommand*{\l@section}{%
+			\ifnum \c@tocdepth >\z@ \vskip 1\baselineskip \fi
+			\@dottedtocline{1}{1.5in}{\z@}}
+
+		\renewcommand*{\l@subsection}{%
+			\ifnum \c@tocdepth >1 \vskip 1\baselineskip \fi
+			\@dottedtocline{2}{2.0in}{\z@}}
+
+		\renewcommand*{\l@subsubsection}{%
+			\ifnum \c@tocdepth >2 \vskip 1\baselineskip \fi
+			\@dottedtocline{3}{2.5in}{\z@}}
+	}%
+	{%	If \chapter not defined, \section used instead
+		\setcounter{tocdepth}{1}
+
+		\renewcommand*{\l@section}[2]{%
+			\ifnum \c@tocdepth >\z@
+				\addpenalty\@secpenalty
+				\addvspace{1\baselineskip}%
+				\setlength\@tempdima{\z@}%
+				{	\parindent \z@
+					\rightskip \@tocrmarg
+					\parfillskip -\rightskip
+					\leavevmode
+					\ifnum \c@tocdepth >\@ne \bfseries \fi
+					\advance\leftskip\@tempdima
+					\hskip -\leftskip
+					#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}
+			\fi}
+
+		\renewcommand*{\l@subsection}{%
+			\ifnum \c@tocdepth >1 \vskip 1\baselineskip \fi
+			\@dottedtocline{2}{0.5in}{\z@}}
+
+		\renewcommand*{\l@subsubsection}{%
+			\ifnum \c@tocdepth >2 \vskip 1\baselineskip \fi
+			\@dottedtocline{3}{1.0in}{\z@}}
+	}
+
+
+% Figures, Tables, and Illustrations formatting
+
+% List label names of Figures and Tables
+\renewcommand{\listfigurename}{Figures}
+\renewcommand{\listtablename}{Tables}
+
+\AtEndPreamble{
+	\@ifpackageloaded{polyglosia}%
+		{%
+			\addto\captionsenglish{%
+				\renewcommand{\listfigurename}{Figures}
+				\renewcommand{\listtablename}{Tables}}%
+		}{}
+	\@ifpackageloaded{babel}%
+		{%
+			\addto\captionsenglish{%
+				\renewcommand{\listfigurename}{Figures}
+				\renewcommand{\listtablename}{Tables}}%
+		}{}}
+
+% List of Figures
+\renewcommand{\listoffigures}{%
+	\expandafter\csname \tf@topsecname\endcsname*{\listfigurename}%
+	\@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}%
+	\singlespacing%
+	\vspace{-1\baselineskip}
+	\@starttoc{lof}
+	\setstretch{2}}
+
+\renewcommand*{\l@figure}[2]{%
+	\addpenalty{-\@highpenalty}%
+	\setlength\@tempdima{0.5in}%
+	\vskip 1\baselineskip
+	{	\parindent \z@
+		\rightskip \@tocrmarg
+		\parfillskip -\rightskip
+		\leavevmode
+		\advance\leftskip\@tempdima
+		\hskip -\leftskip
+		#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+		\penalty\@highpenalty}}
+
+% List of Tables
+\renewcommand{\listoftables}{%
+	\expandafter\csname \tf@topsecname\endcsname*{\listtablename}%
+	\@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}%
+	\singlespacing%
+	\vspace{-1\baselineskip}
+	\@starttoc{lot}
+	\setstretch{2}}
+
+\def\l@table{\l@figure}
+
+% List of Illustrations
+\newcommand{\listillustrationname}{Illustrations}
+\def\tf@illustrsection{\normalfont\bfseries\normalsize\singlespacing\noindent}
+
+\newcommand{\listofillustrations}{%
+	\expandafter\csname \tf@topsecname\endcsname*{\listillustrationname}%
+	\@mkboth{\MakeUppercase\listillustrationname}{\MakeUppercase\listillustrationname}%
+	\singlespacing%
+	\vspace{-1\baselineskip}
+	{\tf@illustrsection Figures}\par\nopagebreak
+	\@starttoc{lof}
+	\vspace{1\baselineskip}
+	{\tf@illustrsection Tables}\par\nopagebreak
+	\@starttoc{lot}
+	\setstretch{2}}
+
+
+% Figures and Tables: float positioning
+
+\setlength\textfloatsep{2\tf@singlelineskip}
+\setlength\floatsep{2\tf@singlelineskip minus 0.5\tf@singlelineskip}
+\setlength\intextsep{2\tf@singlelineskip minus 0.25\tf@singlelineskip}
+
+\def\fps@table{!htb}
+\def\fps@figure{!htb}
+
+
+% Figures and Tables: caption formatting
+
+\setlength\abovecaptionskip{\z@}
+\setlength\belowcaptionskip{\z@}
+
+\long\def\@makecaption#1#2{%
+	\vskip\abovecaptionskip
+	\if@optraggedright
+		\raggedright%
+	\fi
+	\small#1. #2\par
+	\vskip\belowcaptionskip}
 
 
 % Lists: enumerate and itemize
@@ -481,43 +726,96 @@
 	\fi}
 
 
-% Tables and Figures: float positioning
-
-\setlength\textfloatsep{1\baselineskip plus 2pt}
-\setlength\floatsep{1\baselineskip plus 2pt}
-\setlength\intextsep{1\baselineskip plus 2pt}
-
-\def\fps@table{!htb}
-\def\fps@figure{!htb}
-
+% Block quotation formatting
 
-% Tables and Figures: caption formatting
-
-\setlength\abovecaptionskip{\z@}
-\setlength\belowcaptionskip{\z@}
+\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}
 
-\long\def\@makecaption#1#2{%
-	\vskip\abovecaptionskip
-	\if@optraggedright
-		\raggedright%
-	\fi
-	\small#1. #2\par
-	\vskip\belowcaptionskip}
+% Set quote environment to be the same as the quotation environment
+\def\quote{\quotation}
 
 
-% Table footnote (deprecated)
+% Appendixes formatting
 
-\newcommand{\tablenote}[1]{%
-	\if@optraggedright
-		\raggedright%
-	\fi
-	\vspace{1\baselineskip}
-	#1\par}
+\AtEndPreamble{%
+	\let\tf@appendix\appendix
+	\def\appendix{\@empty}}
 
+\newif\if@appendixes\@appendixesfalse
 
-% Table footnote source line (deprecated)
+% New appendixes environment
+\ifcsdef{chapter}%
+	{%	If \chapter defined...
+		\newcounter{appendix}
+	
+		% appendixes environment resets figure and tables counts with "A." prefix
+		\newenvironment{appendixes}%
+			{%
+				\@appendixestrue
+				\@mainmattertrue
+				\tf@appendix
+				\def\tf@chapcounter{%
+					\refstepcounter{appendix}
+					\gdef\thechapter{\@Alph\c@appendix}}
+				\setcounter{figure}{0}
+				\setcounter{table}{0}
+				\renewcommand{\thefigure}{A.\@arabic\c@figure}
+				\renewcommand{\thetable}{A.\@arabic\c@table}
+			}%
+			{}%
+	}%
+	{%	If \chapter not defined, using \section...
+		% Adjust formatting of section headings for appendixes environment
+		\def\tf@appendixsecfrmt{%
+			\DeclareRobustCommand{\@seccntformat}[1]{%
+				\ifstrequal{##1}{section}%
+					{\appendixname\space \csname the##1\endcsname}%
+					{\csname the##1\endcsname\quad}}
+			\DeclareRobustCommand{\tf@secsep}[2]{%
+				\ifstrequal{##1}{section}%
+					{%
+						\ifstrempty{##2}%
+							{}%
+							{%
+								\par\nobreak
+								\vspace{1\baselineskip}%
+							}%
+					}%
+					{\@empty}}
+			\def\tf@tocline##1{\appendixname\space \csname the##1\endcsname.\quad}
+			\@tf@adjustsectiontrue}
 
-\newcommand{\tablesource}{\tablenote}
+		% Make appendixes environment
+		\newenvironment{appendixes}%
+			{%
+				\@appendixestrue
+				\setcounter{secnumdepth}{1}
+				\tf@appendixsecfrmt
+				\tf@appendix
+			}%
+			{%
+				\setcounter{secnumdepth}{0}%
+				\setcounter{section}{0}%
+				\gdef\thesection{\@arabic\c@section}%
+			}%
+	}
 
 
 % thebibliography environment formatting (adjust \@openbib@code hook default)
@@ -539,7 +837,7 @@
 % 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}%
+		\PackageWarningNoLine{turabian-formatting}{Loading the 'biblatex-chicago' package after the 'turabian-formatting' package is recommended. See documentation for more information}%
 	}%
 	{}
 
@@ -571,18 +869,6 @@
 \fi
 
 
-% Patch incompatibility between biblatex-chicago (2014/01/29) and biblatex (2016/03/03)
-
-\AtEndPreamble{%
-	\@ifpackageloaded{biblatex-chicago}%
-		{%
-			\@ifpackagelater{biblatex}{2016/03/03}%
-				{\let\ifblx@load@version@one\ifblx@load@version@legacy}%
-				{}
-		}%
-		{}}
-
-
 % endnotes package support: formatting
 
 \if@endnotesformat
@@ -600,11 +886,12 @@
 		{%	If \chapter defined...
 			\let\tf@chapter\chapter
 
-			% Renew Notes heading formatted as \chapter* (also added to Table of Content)
 			\@addtoreset{endnote}{chapter}
+
+			% Renew Notes heading formatted as \chapter* (also added to Table of Content)
 			\renewcommand{\enoteheading}{%
 				\tf@chapter*{\notesname}%
-				\@mkboth{\notesname}{\notesname}%
+				\@mkboth{\MakeUppercase\notesname}{\MakeUppercase\notesname}%
 				\addcontentsline{toc}{chapter}{\notesname}%
 				\mbox{}\par%
 				\vspace{-1.5\baselineskip}%
@@ -614,24 +901,34 @@
 			% 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}%
-					{%
+					{%	if \chapter*
 						\tf@chapter*{#3}%
 						\setcounter{endnote}{0}%
 						\addtoendnotes{%
-							\noexpand\enotedivision%
-								{\noexpand\section*}%
-								{\unexpanded{#3}}}%
+							\noexpand\tf@enotedivider%
+								{\noexpand\section*}{\unexpanded{#3}}}%
 					}%
-					{%
+					{%	if \chapter
 						\IfNoValueTF{#2}%
 							{\tf@chapter{#3}}%
 							{\tf@chapter[#2]{#3}}%
-						\addtoendnotes{%
-							\noexpand\enotedivision%
-								{\noexpand\section*}%
-								{\chaptername\ \thechapter}}%
+						\if@mainmatter
+							\addtoendnotes{%
+								\noexpand\tf@enotedivider%
+									{\noexpand\section*}{\@chapapp\space \thechapter}}%
+						\else
+							\addtoendnotes{%
+								\noexpand\tf@enotedivider%
+									{\noexpand\section*}{\unexpanded{#3}}}%
+						\fi
 					}}
-			\def\enotedivision#1#2{\@ifnextchar\enotedivision{}{#1{#2}}}%
+			
+			% Empty subheading divider before \theendnotes for use with \tf@enotedivider
+			\preto{\theendnotes}{%
+				\addtoendnotes{\noexpand\tf@enotedivider{}{}}}
+
+			% Make endnote divider if not followed by another endnote divider
+			\def\tf@enotedivider#1#2{\@ifnextchar\tf@enotedivider{}{#1{#2}}}%
 		}%
 		{%	If \chapter not defined, Notes heading formatted as \section*
 			\renewcommand{\enoteheading}{%
@@ -680,65 +977,3 @@
 \fi
 
 
-% emptymargins option (deprecated)
-
-\if@optemptymargins
-
-	\PackageWarningNoLine{turabian-formatting}{The 'emptymargins' option has been deprecated}
-
-	% 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}
-
-	\AtEndPreamble{%
-		\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 910e8f400bd..7235a6b5696 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
@@ -27,7 +27,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-researchpaper}[2016/03/18 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2016/07/12 Turabian Research Paper]
 
 
 % Default point size
@@ -59,9 +59,9 @@
 \DeclareOption{12pt}{\def\@@ptsize{12pt}}
 
 
-% Deprecated options
+% Deprecated/removed options
 \DeclareOption{emptymargins}{%
-	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated}
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is no longer available}
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 \DeclareOption{endnotesonly}{%
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 5bb94221d73..be804f7a2f2 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
@@ -27,7 +27,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-thesis}[2016/03/18 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2016/07/12 Turabian Theses and Dissertations]
 
 
 % Default point size
@@ -63,9 +63,9 @@
 \DeclareOption{12pt}{\def\@@ptsize{12pt}}
 
 
-% Deprecated option
+% Deprecated/removed options
 \DeclareOption{emptymargins}{%
-	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated.}
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is no longer available}
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 
@@ -89,15 +89,6 @@
 \addtolength\textwidth{-\oddsidemargin}
 
 
-% Title page commands for use with \maketitle (deprecated, not functional)
-
-\newcommand{\faculty}[1]{\gdef\tf@faculty{#1}}
-\faculty{\@empty}
-
-\newcommand{\mydegree}[1]{\gdef\tf@mydegree{#1}}
-\mydegree{\@empty}
-
-
 % Renew \maketitle command for Thesis/Dissertation title page
 
 \submissioninfo{%
@@ -141,25 +132,6 @@
 	\end{titlepage}%
 	\setcounter{page}{2}
 	\tf@emptymaketitle
-	\global\let\@faculty\@empty
-	\global\let\@mydegree\@empty
-	\global\let\faculty\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}}%
-		}{}}
-
-