turabian-formatting (22may18)

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

3 files changed, 117 insertions, 98 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 1b6a94e2e6e..2350f66818d 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
@@ -1,10 +1,10 @@
 % Turabian Formatting for LaTeX
 %
-% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A
-% Manual for Writers of Research Papers, Theses, and Dissertations (8th edition)
+% Based on Kate L. Turabian's "A Manual for Writers of Research Papers, Theses, 
+% and Dissertations," 9th edition.
 %
 % ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 Omar Abdool
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,10 +27,10 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2017/11/04 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2018/05/21 Turabian Formatting]
 
 
-% Package options: flags
+% Package options: flags and variables
 
 \newif\if@optraggedright\@optraggedrightfalse
 
@@ -192,11 +192,9 @@
 % Set top section command name to "section" (default)
 \def\tf@topsecname{section}
 
-
 % Set adjustment for baselineskip after \section and \section* headings
 \def\tf@adjaftersec{\dimexpr \baselineskip -\tf@singlelineskip -\p@ \relax}
 
-
 % Headings formatting: \section, \subsection, and \subsubsection
 \setcounter{secnumdepth}{0}
 
@@ -221,11 +219,8 @@
 		{\tf@singlelineskip}%
 		{\normalfont\bfseries\normalsize\singlespacing\raggedright}}
 
-
-% Table of Contents, List of Figures, and List of Tables: section number alignment
-\def\tflist@beforesecnum{}
-\def\tflist@aftersecnum{\hfil}
-\def\numberline#1{\hb@xt@\@tempdima{\tflist@beforesecnum #1\tflist@aftersecnum}}
+% Headings formatting: following paragraphs start with an indent
+\def\tf@afterindent{\@afterindenttrue}
 
 
 % Table of Contents: renew formatting
@@ -235,7 +230,7 @@
 \renewcommand{\tableofcontents}{%
 	\tf@tocpagestyle
 	\expandafter\csname \tf@topsecname\endcsname*{\contentsname}%
-	\@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
+	\@mkboth{\contentsname}{\contentsname}%
 	\if@optraggedright
 		\let\tf@tocrmarg\@tocrmarg
 		\def\@tocrmarg{\tf@tocrmarg plus1fil}
@@ -244,12 +239,9 @@
 		\singlespacing
 		\@starttoc{toc}}}%
 
-% Table of Contents: right margin and number width formatting
-\def\@tocrmarg{5em}
-\def\@pnumwidth{2.5em}
-
 
 % List of Figures and List of Tables: adjust titles
+
 \renewcommand{\listfigurename}{Figures}
 \renewcommand{\listtablename}{Tables}
 
@@ -270,7 +262,8 @@
 % List of Figures
 \renewcommand{\listoffigures}{%
 	\expandafter\csname \tf@topsecname\endcsname*{\listfigurename}%
-	\@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}%
+	\@mkboth{\listfigurename}{\listfigurename}%
+	\addcontentsline{toc}{\tf@topsecname}{\listfigurename}%
 	{	\vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
 		\singlespacing
 		\@starttoc{lof}}}
@@ -278,7 +271,8 @@
 % List of Tables
 \renewcommand{\listoftables}{%
 	\expandafter\csname \tf@topsecname\endcsname*{\listtablename}%
-	\@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}%
+	\@mkboth{\listtablename}{\listtablename}%
+	\addcontentsline{toc}{\tf@topsecname}{\listtablename}%
 	{	\vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
 		\singlespacing
 		\@starttoc{lot}}}
@@ -289,7 +283,8 @@
 
 \newcommand{\listofillustrations}{%
 	\expandafter\csname \tf@topsecname\endcsname*{\listillustrationname}%
-	\@mkboth{\MakeUppercase\listillustrationname}{\MakeUppercase\listillustrationname}%
+	\@mkboth{\listillustrationname}{\listillustrationname}%
+	\addcontentsline{toc}{\tf@topsecname}{\listillustrationname}%
 	{	\vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
 		\singlespacing
 		{\tf@illustrsection Figures}\par\nopagebreak
@@ -409,7 +404,7 @@
 
 % biblatex-chicago: set formatting defaults and pass options
 \PassOptionsToPackage%
-	{isbn=false, autolang=other, footmarkoff, backend=biber}%
+	{isbn=false, autolang=other, footmarkoff, noibid, backend=biber}%
 	{biblatex-chicago}
 \if@authordateformat
 	\PassOptionsToPackage{authordate}{biblatex-chicago}
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 ba32c40228b..8e7ac1b695d 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
@@ -1,10 +1,10 @@
 % Turabian Formatting for LaTeX
 %
-% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A
-% Manual for Writers of Research Papers, Theses, and Dissertations (8th edition)
+% Based on Kate L. Turabian's "A Manual for Writers of Research Papers, Theses, 
+% and Dissertations," 9th edition.
 %
 % ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 Omar Abdool
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-researchpaper}[2017/11/04 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2018/05/21 Turabian Research Paper]
 
 
 % Default point size
@@ -49,7 +49,7 @@
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 \DeclareOption{twocolumn}{%
-	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.}
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported}
 	\OptionNotUsed}
 
 \DeclareOption{10pt}{\def\@@ptsize{10pt}}
@@ -80,13 +80,13 @@
 
 
 % Part: formatting
-\def\tf@partformat{\normalfont\bfseries\normalsize\singlespacing\centering}
+\def\tf@partformat{\normalfont\bfseries\singlespacing\centering}
 
 \def\@part[#1]#2{%
 	\ifnum \c@secnumdepth >-2\relax
 		\refstepcounter{part}%
 		\addcontentsline{toc}{part}%
-			{\protect\numberline{\thepart.}#1}%
+			{\protect{\partname\space\thepart}}%
 	\else
 		\addcontentsline{toc}{part}{#1}%
 	\fi
@@ -130,7 +130,7 @@
 	\@tempskipa #4\relax
 	\@afterindenttrue
 	\ifdim \@tempskipa <\z@
-		\@tempskipa -\@tempskipa \@afterindentfalse
+		\@tempskipa -\@tempskipa \tf@afterindent
 	\fi
 	\if@nobreak \everypar{} \else
 		\addpenalty\@secpenalty\addvspace\@tempskipa
@@ -157,7 +157,7 @@
 \protected@edef\tf@secsep#1#2{\@empty}
 
 % Sections: formatting of TOC \addcontentsline
-\def\tf@tocline#1{\protect\numberline{\csname the#1\endcsname\quad}}
+\def\tf@tocline#1{\protect{\csname the#1\endcsname\quad}}
 
 % Sections: redefine \@sect to support optional two-line formatting
 \def\@sect#1#2#3#4#5#6[#7]#8{%
@@ -186,7 +186,7 @@
 			\csname #1mark\endcsname{#7}%
 			\addcontentsline{toc}{#1}{%
 				\ifnum #2>\c@secnumdepth \else
-					\protect\numberline{\csname the#1\endcsname\quad}%
+					\tf@tocline{#1}%
 				\fi
 				#7}}%
 	\fi
@@ -275,63 +275,58 @@
 \fi
 
 
-% Table of Contents: formatting
+% Table of Contents, List of Figures, and List of Tables: item number alignment
+%\def\numberline#1{\hb@xt@\@tempdima{\hfil #1\hspace{1em}}}
+
+\def\@tocrmarg{0.75in}
+\def\@pnumwidth{3.5ex}
 
+
+% Table of Contents: formatting
 \setcounter{tocdepth}{1}
 
 \renewcommand*{\l@part}[2]{%
 	\ifnum \c@tocdepth >-2\relax
 		\addpenalty{-\@highpenalty}%
 		\addvspace{1\baselineskip}%
-		\setlength\@tempdima{3em}%
-		\vskip 1\baselineskip
+		\setlength\@tempdima{0.5in}%
+		\vskip \tf@singlelineskip
 		{	\parindent \z@
 			\rightskip \z@
 			\parfillskip -\@rightskip
 			\leavevmode
 			\advance\leftskip\@tempdima
 			\hskip -\leftskip
-			\bfseries #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}
+			\bfseries #1\nobreak\hfil \nobreak\par}
 	\fi}
 
 \renewcommand*{\l@section}[2]{%
 	\ifnum \c@tocdepth >\z@
 		\addpenalty\@secpenalty
 		\setlength\@tempdima{\z@}%
-		\vskip 1\baselineskip
+		\vskip \tf@singlelineskip
 		{	\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
+	\ifnum \c@tocdepth >1 \vskip \tf@singlelineskip \fi
 	\@dottedtocline{2}{0.5in}{\z@}}
 
 \renewcommand*{\l@subsubsection}{%
-	\ifnum \c@tocdepth >2 \vskip 1\baselineskip \fi
+	\ifnum \c@tocdepth >2 \vskip \tf@singlelineskip \fi
 	\@dottedtocline{3}{1.0in}{\z@}}
 
 
 % List of Figures: formatting
-\renewcommand*{\l@figure}[2]{%
-	\def\tflist@beforesecnum{\hfil}
-	\def\tflist@aftersecnum{\hspace{3.5em}}
-	\setlength\@tempdima{5em}
-	\vskip 1\baselineskip
-	{	\leftskip \z@ \relax
-		\rightskip \@tocrmarg
-		\parfillskip -\rightskip
-		\parindent \z@ \relax\@afterindenttrue
-		\interlinepenalty\@M
-		\leavevmode
-		\advance\leftskip\@tempdima \null\nobreak\hskip -\leftskip
-		#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}}
+\renewcommand*\l@figure{
+	\vskip \tf@singlelineskip
+	\@dottedtocline{1}{1em}{0.5in}}
 
 
 % List of Tables: formatting
@@ -389,7 +384,7 @@
 		\vspace{\dimexpr -4\tf@singlelineskip +1\baselineskip \relax}
 		\singlespacing\mbox{}%
 		\def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}
-		\let\@afterindentfalse\@afterindenttrue}%
+		\let\tf@afterindent\@afterindenttrue}%
 \fi
 
 
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 38a3d963798..cc3c694829c 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
@@ -1,10 +1,10 @@
 % Turabian Formatting for LaTeX
 %
-% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A
-% Manual for Writers of Research Papers, Theses, and Dissertations (8th edition)
+% Based on Kate L. Turabian's "A Manual for Writers of Research Papers, Theses, 
+% and Dissertations," 9th edition.
 %
 % ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 Omar Abdool
 %
 % This work may be distributed and/or modified under the conditions of the LaTeX
 % Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-thesis}[2017/11/04 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2018/05/21 Turabian Theses and Dissertations]
 
 
 % Default point size
@@ -90,13 +90,17 @@
 
 
 % Figures: number formatting
+\def\tf@figuredblnumprefix{\thechapter}
 \newif\if@figuredblnum\@figuredblnumfalse
-\renewcommand{\thefigure}{\if@figuredblnum \thechapter.\fi \@arabic\c@figure}
+
+\renewcommand{\thefigure}{\if@figuredblnum \tf@figuredblnumprefix.\fi \@arabic\c@figure}
 
 
 % Tables: number formatting
+\def\tf@tabledblnumprefix{\thechapter}
 \newif\if@tabledblnum\@tabledblnumfalse
-\renewcommand{\thetable}{\if@tabledblnum \thechapter.\fi \@arabic\c@table}
+
+\renewcommand{\thetable}{\if@tabledblnum \tf@tabledblnumprefix.\fi \@arabic\c@table}
 
 
 % Document structure: formatting
@@ -104,8 +108,7 @@
 	\if@openright \cleardoublepage \else \clearpage \fi
 	\@mainmatterfalse
 	\pagenumbering{roman}
-	\pagestyle{empty}
-	\def\tf@tocpagestyle{\pagestyle{plain}}}
+	\pagestyle{plain}}
 
 \def\mainmatter{%
 	\if@openright \cleardoublepage \else \clearpage \fi
@@ -133,9 +136,9 @@
 		\if@mainmatter
 			\refstepcounter{part}%
 			\addcontentsline{toc}{part}%
-				{\protect\numberline{\partname\space\thepart.}#1}%
+				{\protect\numberline{\partname\space\thepart}#1}%
 		\else
-			\addcontentsline{toc}{part}{#1}%			
+			\addcontentsline{toc}{part}{#1}%
 		\fi
 	\else
 		\addcontentsline{toc}{part}{#1}%
@@ -160,7 +163,7 @@
 		\if@mainmatter
 			\refstepcounter{part}%
 			\addcontentsline{toc}{part}%
-				{\protect\numberline{\partname\space\thepart.}#1}%
+				{\protect\numberline{\partname\space\thepart}#1}%
 		\fi
 	\fi
 	\markboth{}{}%
@@ -230,12 +233,13 @@
 \def\@chapter[#1]#2{%
 	\@figuredblnumfalse
 	\@tabledblnumfalse
+	\tf@afterindent
 	\ifnum \c@secnumdepth >\m@ne
 		\if@mainmatter
 			\tf@chapcounter
 			\typeout{\@chapapp\space\thechapter.}%
 			\addcontentsline{toc}{chapter}%
-				{\protect\numberline{\@chapapp\space\thechapter.}#1}%
+				{\protect\numberline{\@chapapp\space\thechapter}#1}%
 		\else
 			\tf@restoreftcounters
 			\addcontentsline{toc}{chapter}{#1}%
@@ -251,6 +255,7 @@
 	\@figuredblnumfalse
 	\@tabledblnumfalse
 	\tf@restoreftcounters
+	\tf@afterindent
 	\@makeschapterhead{#1}%
 	\@afterheading}
 
@@ -282,7 +287,7 @@
 	\@tempskipa #4\relax
 	\@afterindenttrue
 	\ifdim \@tempskipa <\z@
-		\@tempskipa -\@tempskipa \@afterindentfalse
+		\@tempskipa -\@tempskipa \tf@afterindent
 	\fi
 	\if@nobreak
 		\everypar{}%
@@ -375,6 +380,7 @@
 			\@date
 			\parskip=0pt
 		\end{center}%
+		\thispagestyle{empty}
 	\end{titlepage}%
 	\setcounter{page}{2}
 	% if not endnotes, reset footnote counter
@@ -383,15 +389,23 @@
 	\cleardoublepage}
 
 
-% Table of Contents: formatting
+% Table of Contents, List of Figures, and List of Tables: section number alignment
+\def\tflist@beforesecnum{}
+\def\tflist@aftersecnum{\hfil}
+\def\numberline#1{\hb@xt@\@tempdima{\tflist@beforesecnum #1\tflist@aftersecnum}}
+
+\def\@tocrmarg{0.75in}
+\def\@pnumwidth{3.5ex}
+
 
+% Table of Contents: formatting
 \setcounter{tocdepth}{0}
 
 \renewcommand*{\l@part}[2]{%
 	\ifnum \c@tocdepth >-2\relax
 		\addpenalty{-\@highpenalty}%
 		\addvspace{1\baselineskip}%
-		\setlength\@tempdima{7.5em}%
+		\setlength\@tempdima{1.25in}%
 		\vskip 1\baselineskip
 		{	\parindent \z@
 			\rightskip \z@
@@ -399,19 +413,18 @@
 			\leavevmode
 			\advance\leftskip\@tempdima
 			\hskip -\leftskip
-			\bfseries #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}
+			{\bfseries #1}\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}
 	\fi}
 
 \renewcommand*{\l@chapter}[2]{%
 	\ifnum \c@tocdepth >\m@ne
 		\addpenalty{-\@highpenalty}%
-		\setlength\@tempdima{7.5em}%
+		\setlength\@tempdima{1.25in}%
 		\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
@@ -419,50 +432,62 @@
 	\fi}
 
 \renewcommand*{\l@section}{%
-	\ifnum \c@tocdepth >\z@ \vskip 1\baselineskip \fi
+	\ifnum \c@tocdepth >\z@ \vskip \tf@singlelineskip \fi
 	\@dottedtocline{1}{1.5in}{\z@}}
 
 \renewcommand*{\l@subsection}{%
-	\ifnum \c@tocdepth >1 \vskip 1\baselineskip \fi
-	\@dottedtocline{2}{2.0in}{\z@}}
+	\ifnum \c@tocdepth >1 \vskip \tf@singlelineskip \fi
+	\@dottedtocline{2}{1.75in}{\z@}}
 
 \renewcommand*{\l@subsubsection}{%
-	\ifnum \c@tocdepth >2 \vskip 1\baselineskip \fi
-	\@dottedtocline{3}{2.5in}{\z@}}
+	\ifnum \c@tocdepth >2 \vskip \tf@singlelineskip \fi
+	\@dottedtocline{3}{2in}{\z@}}
 
 % Table of Contents: added lineskip
 \def\@addcontentslineskip{%
 	\begingroup
 		\let\tf@write\write
 		\def\write{\immediate\tf@write}
-		\addtocontents{toc}{\protect\addvspace{1\baselineskip}}
+		\addtocontents{toc}{\protect\addvspace{\tf@singlelineskip}}
 	\endgroup}
 
 
 % List of Figures: formatting
-\renewcommand*{\l@figure}[2]{%
-	\def\tflist@beforesecnum{\hfil}
-	\if@doublenumerate
-		\def\tflist@aftersecnum{\hspace{3em}}
-	\else
-		\def\tflist@aftersecnum{\hspace{3.5em}}
-	\fi
-	\setlength\@tempdima{5em}
-	\vskip 1\baselineskip
-	{	\leftskip \z@ \relax
-		\rightskip \@tocrmarg
-		\parfillskip -\rightskip
-		\parindent \z@ \relax\@afterindenttrue
-		\interlinepenalty\@M
-		\leavevmode
-		\advance\leftskip\@tempdima \null\nobreak\hskip -\leftskip
-		#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}}
+\renewcommand*\l@figure{%
+	\vskip \tf@singlelineskip
+	\@dottedtocline{0}{\z@}{4em}}
 
 
 % List of Tables: formatting
 \def\l@table{\l@figure}
 
 
+% Figures and Tables: caption formatting
+\def\tf@numberlinedbl#1#2{\hb@xt@0.3\@tempdima{\hfil #1}\hb@xt@0.7\@tempdima{#2 \hfil}}
+
+\long\def\@caption#1[#2]#3{%
+	\par
+		\csname if@#1dblnum\endcsname
+			\addcontentsline{\csname ext@#1\endcsname}{#1}{%
+				\protect\tf@numberlinedbl{\csname tf@#1dblnumprefix\endcsname}%
+				{.\@arabic{\csname c@#1\endcsname}}%
+				{\ignorespaces #2}}%
+		\else
+			\addcontentsline{\csname ext@#1\endcsname}{#1}{%
+				\protect\tf@numberlinedbl{\csname the#1\endcsname}%
+				{\@empty}%
+				{\ignorespaces #2}}%
+		\fi
+	\begingroup
+		\@parboxrestore
+		\if@minipage
+			\@setminipage
+		\fi
+		\normalsize
+		\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+	\endgroup}
+
+
 % Appendixes: formatting
 % appendixes environment resets figure and tables counts with "A." prefix
 
@@ -480,11 +505,15 @@
 				\setcounter{tf@tempchapfcnt}{\value{figure}}
 				\setcounter{tf@tempchaptcnt}{\value{table}}
 			\fi
+			\def\tf@chapcounter{%
+				\refstepcounter{appendix}
+				\@figuredblnumtrue
+				\@tabledblnumtrue}
 			\setcounter{figure}{0}
 			\setcounter{table}{0}
+			\def\tf@figuredblnumprefix{A}
+			\def\tf@tabledblnumprefix{A}
 		\fi
-		\renewcommand{\thefigure}{\if@doublenumerate A.\fi \@arabic\c@figure}
-		\renewcommand{\thetable}{\if@doublenumerate A.\fi \@arabic\c@table}
 	}%
 	{%
 		\if@doublenumerate
@@ -508,12 +537,12 @@
 	% Renew Notes heading formatted as \chapter* (also added to Table of Content)
 	\renewcommand{\enoteheading}{%
 		\tf@chapter*{\notesname}%
-		\@mkboth{\MakeUppercase\notesname}{\MakeUppercase\notesname}%
+		\@mkboth{\notesname}{\notesname}%
 		\addcontentsline{toc}{chapter}{\notesname}%
 		\vspace{\dimexpr -5\tf@singlelineskip +1\baselineskip \relax}%
 		\singlespacing\mbox{}%
 		\def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}
-		\let\@afterindentfalse\@afterindenttrue}%
+		\let\tf@afterindent\@afterindenttrue}%
 
 	% Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
 	\RenewDocumentCommand{\chapter}{som}{%