turabian-formatting (18mar17)

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

3 files changed, 23 insertions, 19 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 ce0fce143f5..29003fba222 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 @@
 % Manual for Writers of Research Papers, Theses, and Dissertations (8th edition)
 %
 % ==============================
-% Copyright 2013-2016 Omar Abdool
+% Copyright 2013-2017 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}
-\ProvidesPackage{turabian-formatting}[2016/10/09 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2017/03/18 Turabian Formatting]
 
 
 % Package options: flags
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 a877d379ae3..cf649ac788f 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 @@
 % Manual for Writers of Research Papers, Theses, and Dissertations (8th edition)
 %
 % ==============================
-% Copyright 2013-2016 Omar Abdool
+% Copyright 2013-2017 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}[2016/10/09 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2017/03/18 Turabian Research Paper]
 
 
 % Default point size
@@ -190,13 +190,15 @@
 
 % Title page: commands for use with \maketitle
 \newcommand{\subtitle}[1]{\gdef\tf@subtitle{#1}}
-\subtitle{\@empty}
+\subtitle{}
+
+\newcommand{\tf@subtitlesep}{\ifdefempty{\tf@subtitle}{}{:}}
 
 \newcommand{\submissioninfo}[1]{\gdef\tf@submissioninfo{#1}}
-\submissioninfo{\@empty}
+\submissioninfo{}
 
 \newcommand{\course}[1]{\gdef\tf@course{#1}}
-\course{\@empty}
+\course{}
 
 % Title page: command for emptying/completing \maketitle
 \newcommand{\tf@emptymaketitle}{%
@@ -231,7 +233,7 @@
 			\vspace*{-2\baselineskip}
 			\vspace*{0.333\paperheight}
 			\vspace*{-1in}
-			{	\bfseries\@title\par%
+			{	\bfseries\@title\tf@subtitlesep\par%
 				\tf@subtitle\par}%
 			\vspace*{2.35in}
 			\@author\@thanks\par
@@ -253,7 +255,7 @@
 			\parskip=1\baselineskip
 			\vspace*{0.5in}
 			\vspace*{-1.5\baselineskip}
-			{	\bfseries\@title\par%
+			{	\bfseries\@title\tf@subtitlesep\par%
 				\tf@subtitle\par}%
 			\vspace*{1\baselineskip}
 			\@author\@thanks\par
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 bcf728c650e..8f9da7de1e2 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 @@
 % Manual for Writers of Research Papers, Theses, and Dissertations (8th edition)
 %
 % ==============================
-% Copyright 2013-2016 Omar Abdool
+% Copyright 2013-2017 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}[2016/10/09 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2017/03/18 Turabian Theses and Dissertations]
 
 
 % Default point size
@@ -267,19 +267,21 @@
 
 % Title page: commands for use with \maketitle
 \newcommand{\subtitle}[1]{\gdef\tf@subtitle{#1}}
-\subtitle{\@empty}
+\subtitle{}
+
+\newcommand{\tf@subtitlesep}{\ifdefempty{\tf@subtitle}{}{:}}
 
 \newcommand{\submissioninfo}[1]{\gdef\tf@submissioninfo{#1}}
-\submissioninfo{\@empty}
+\submissioninfo{}
 
 \newcommand{\institution}[1]{\gdef\tf@institution{#1}}
-\institution{\@empty}
+\institution{}
 
 \newcommand{\department}[1]{\gdef\tf@department{#1}}
-\department{\@empty}
+\department{}
 
 \newcommand{\location}[1]{\gdef\tf@location{#1}}
-\location{\@empty}
+\location{}
 
 % Title page: command for emptying/completing \maketitle
 \newcommand{\tf@emptymaketitle}{%
@@ -330,7 +332,7 @@
 			\parskip=1\baselineskip
 			\tf@institution\par
 			\vspace*{\stretch{1}}
-			{\bfseries\@title}\par
+			{\bfseries\@title\tf@subtitlesep}\par
 			{\bfseries\tf@subtitle}\par%
 			\vspace*{\stretch{1}}
 			\tf@submissioninfo\par
@@ -401,8 +403,8 @@
 % Table of Contents: added lineskip
 \def\@addcontentslineskip{%
 	\begingroup
-		\let\origwrite\write
-		\def\write{\immediate\origwrite}%
+		\let\tf@write\write
+		\def\write{\immediate\tf@write}
 		\addtocontents{toc}{\protect\addvspace{1\baselineskip}}
 	\endgroup}