turabian-formatting (20mar21)

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

3 files changed, 28 insertions, 23 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 b2e56dccda7..ab002b87bd7 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
@@ -4,7 +4,7 @@
 % and Dissertations," 9th edition.
 %
 % ==============================
-% Copyright 2013-2020 Omar Abdool
+% Copyright 2013-2021 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,12 +27,12 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2020/03/19 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2021/03/20 Turabian Formatting]
 
 
 % Package options: flags and variables
 
-\newif\if@optraggedright\@optraggedrightfalse
+\newif\if@optraggedright\@optraggedrighttrue
 
 \newif\if@authordateformat\@authordateformatfalse
 
@@ -43,7 +43,7 @@
 
 % Package options: handling
 
-\DeclareOption{raggedright}{\@optraggedrighttrue}
+\DeclareOption{noraggedright}{\@optraggedrightfalse}
 
 \DeclareOption{authordate}{\@authordateformattrue}
 
@@ -98,11 +98,10 @@
 % Paragraph indent
 \setlength\parindent{0.5in}
 
-% Renew \raggedright to preserve paragraph indent and set \@optraggedright to true
+% Renew \raggedright to preserve paragraph indent
 \def\raggedright{%
 	\let\\\@centercr\@rightskip\@flushglue \rightskip\@rightskip
-	\leftskip\z@skip
-	\@optraggedrighttrue}
+	\leftskip\z@skip}
 
 % Use \raggedright if raggedright option true
 \if@optraggedright \raggedright \fi
@@ -428,7 +427,7 @@
 			\setlength\parsep{\z@}
 			\setlength\topsep{\dimexpr 2\tf@singlelineskip -\baselineskip \relax}}%
 		\singlespacing%
-		\item\relax%
+		\item\relax\noindent\ignorespaces%
 	}
 	{\endlist}
 \def\quote{\quotation}
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 e97d559a64d..959dbdf3320 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
@@ -4,7 +4,7 @@
 % and Dissertations," 9th edition.
 %
 % ==============================
-% Copyright 2013-2020 Omar Abdool
+% Copyright 2013-2021 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}[2020/03/19 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2021/03/20 Turabian Research Paper]
 
 
 % Default point size
@@ -36,7 +36,7 @@
 
 % Document class options: handling
 
-\DeclareOption{raggedright}{%
+\DeclareOption{noraggedright}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 \DeclareOption{authordate}{%
@@ -63,7 +63,11 @@
 	\OptionNotUsed}
 
 \DeclareOption{endnotesonly}{%
-	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider using the 'endnotes' option instead}
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is no longer available. Consider using the 'endnotes' option instead}
+	\OptionNotUsed}
+
+\DeclareOption{raggedright}{%
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated.}
 	\OptionNotUsed}
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
@@ -241,7 +245,7 @@
 		\vskip 2\tf@singlelineskip %
 		\setlength\@tempdima{0.5in}%
 		{	\parindent \z@ \rightskip \z@
-			\parfillskip -\@rightskip
+			\parfillskip -\rightskip
 			\leavevmode
 			\advance\leftskip\@tempdima
 			\hskip -\leftskip
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 0fdcff0aa4f..95da4cb33e6 100644
--- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
+++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
@@ -4,7 +4,7 @@
 % and Dissertations," 9th edition.
 %
 % ==============================
-% Copyright 2013-2020 Omar Abdool
+% Copyright 2013-2021 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}[2020/03/19 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2021/03/20 Turabian Theses and Dissertations]
 
 
 % Default point size
@@ -36,7 +36,7 @@
 
 % Document class options: handling
 
-\DeclareOption{raggedright}{%
+\DeclareOption{noraggedright}{%
 	\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
 
 \DeclareOption{authordate}{%
@@ -66,6 +66,10 @@
 	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is no longer available}
 	\OptionNotUsed}
 
+\DeclareOption{raggedright}{%
+	\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated.}
+	\OptionNotUsed}
+
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 
 \ProcessOptions\relax
@@ -231,11 +235,11 @@
 			\typeout{\@chapapp\space\thechapter}
 			\addcontentsline{toc}{chapter}%
 				{\protect\numberline{\@chapapp\space\thechapter}#1}
-			\tf@endnotesection{\@chapapp\space\thechapter}
+		\tf@endnotesection{\@chapapp\space\thechapter}
 		\else
 			\tf@restoreftcounters
 			\addcontentsline{toc}{chapter}{#1}
-			\tf@endnotesection{#1}
+		\tf@endnotesection{#1}
 		\fi
 	\else
 		\addcontentsline{toc}{chapter}{#1}
@@ -386,7 +390,7 @@
 		\setlength\@tempdima{1.25in}%
 		{	\parindent \z@
 			\rightskip \z@
-			\parfillskip -\@rightskip
+			\parfillskip -\rightskip
 			\leavevmode
 			\advance\leftskip\@tempdima
 			\hskip -\leftskip
@@ -482,7 +486,7 @@
 		\addcontentsline{toc}{chapter}%
 			{\protect\numberline{\@chapapp\space\thechapter}##1}
 		\chaptermark{##1}
-		\tf@endnotesection{\@chapapp\space\thechapter}
+	\tf@endnotesection{\@chapapp\space\thechapter}
 		\begingroup
 			\setlength\parskip{\tf@singlelineskip}
 			\singlespacing
@@ -530,9 +534,7 @@
 \def\tf@endnotesection#1{%
 	\if@endnotesformat
 		\setcounter{endnote}{0}
-		\if@enotesopen
-			\addtoendnotes{\noexpand\tf@enotesechead{#1}}
-		\fi
+		\addtoendnotes{\noexpand\tf@enotesechead{#1}}
 	\fi}
 
 % Endnotes: format and make endnote section heading if followed by an endnote