From 7e58d40557545aed226fc852f4e32f86f76517bd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Nov 2017 22:05:09 +0000 Subject: turabian-formatting (5nov17) git-svn-id: svn://tug.org/texlive/trunk@45700 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/turabian-formatting/README | 2 +- .../turabian-formatting-doc.pdf | Bin 104099 -> 104714 bytes .../turabian-formatting-doc.tex | 20 ++-- .../turabian-formatting/turabian-formatting.sty | 122 +++++++++++---------- .../turabian-formatting/turabian-researchpaper.cls | 37 ++++--- .../latex/turabian-formatting/turabian-thesis.cls | 48 ++++++-- 6 files changed, 136 insertions(+), 93 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README index b3393923fa1..3a3b8d82ede 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 (2017/03/18) +Turabian Formatting for LaTeX (2017/11/04) INTRODUCTION 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 f1a2fb3198c..ca70a9dfbc3 100644 Binary files a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf and b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf differ 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 86ffba27dc0..2a82ed864bc 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,7 +19,7 @@ % and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== -% Last updated: 2017/03/18 +% Last updated: 2017/11/04 % % @@ -177,7 +177,7 @@ When placed in the source document preamble, the following specifies the documen 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 \textcmd{baselinestretch} of \texttt{2} using the \texttt{setspace} package.} + Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \texttt{setspace} package's \textcmd{setstretch} command.} Paragraph indentation is set to 0.5 inches. Page margins, by default, are 1 inch from the edges of the paper. @@ -242,10 +242,10 @@ When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted \marginnote{\textbackslash part\{\}} A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be separated into parts using the \textcmd{part} command. -The \textcmd{part} command creates a part-title page with an optional descriptive title. If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title is preceded by a \emph{Part} label and part number (in capitalized roman numerals) at the top of the page---the ``descriptive title separated from the label and number by a blank line. Although the part-title page is counted in pagination, no page number is placed on the page \autocite[390]{turabian_manual_2013}. +The \textcmd{part} command creates a new part-title page. If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the page is labelled \emph{Part} and is ``followed by the part number [in capitalized roman numerals] at the top of the page." If a descriptive title is provided, it is separated from the label and number by a blank line. Although the part-title page is counted in pagination, no page number is placed on the page \autocite[390]{turabian_manual_2013}. \marginnote{\textbackslash part*\{\}} -The \textcmd{part*} command also starts a new page with a descriptive title. If in the main matter, this command provides the same \emph{Part} label and part number as \textcmd{part}. Unlike \textcmd{part}, however, \textcmd{part*} allows for ``text introducing the contents of the part on the part-tile page" to follow a descriptive title, separated by two blank lines. A page number, using the \texttt{plain} page style (refer to subsection~\ref{subsec:page_styles}), is placed on the page \autocite[390]{turabian_manual_2013}. +The \textcmd{part*} command also starts a new part-title page. If in the main matter, this command provides the same \emph{Part} label and part number as \textcmd{part}. Unlike \textcmd{part}, however, \textcmd{part*} allows for ``text introducing the contents of the part on the part-tile page" to follow a descriptive title, separated by two blank lines. A page number, using the \texttt{plain} page style (refer to subsection~\ref{subsec:page_styles}), is placed on the page \autocite[390]{turabian_manual_2013}. \subsection{Chapters} @@ -428,6 +428,14 @@ The following packages are highly recommended: \texttt{biblatex-chicago}, \textt \label{sec:updates} +\marginnote{\rmfamily{2017/11/04}}% + +Improved support for the \texttt{setspace} package's \textcmd{setstretch} command. + +Adjustments to how blank lines are set immediately following part, chapter, section, and subsection headings. + +Improvements to the spacing before and after figures, tables, and the \texttt{quotation} environment. + \marginnote{\rmfamily{2017/03/18}}% Adjustments to title page formatting. @@ -470,9 +478,7 @@ Removed options: \texttt{emptymargins}. Support for changes made to the \texttt{biblatex} package (2016/03/03). -\marginnote{\rmfamily{2016/03/15}}% - -An \texttt{authordate} option has been added, improving support for the author-date citation style. +\marginnote{\rmfamily{2016/03/15}} An \texttt{authordate} option has been added, improving support for the author-date citation style. Adjustments to the formatting of both enumerated and itemized lists. 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 29003fba222..1b6a94e2e6e 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}[2017/03/18 Turabian Formatting] +\ProvidesPackage{turabian-formatting}[2017/11/04 Turabian Formatting] % Package options: flags @@ -58,30 +58,19 @@ % Margin size: 1 inch on all sides -\setlength\textwidth{\paperwidth} -\addtolength\textwidth{-2in} +\setlength\textwidth{\dimexpr \paperwidth -2in \relax} \setlength\hoffset{\z@} -\setlength\textheight{\paperheight} -\addtolength\textheight{-2in} +\setlength\textheight{\dimexpr \paperheight -2in \relax} \setlength\voffset{\z@} \setlength\oddsidemargin{\z@} \setlength\evensidemargin{\z@} -% Header height: set to 1 line of text -\ifcase \@ptsize - \setlength\headheight{10pt} -\or - \setlength\headheight{11pt} -\or - \setlength\headheight{12pt} -\fi - % Header top and footer baseline: set to 0.5in from page edges \setlength\topmargin{-0.5in} -\setlength\headsep{0.5in} -\addtolength\headsep{-\headheight} +\setlength\headheight{\dimexpr \f@size pt \relax} +\setlength\headsep{\dimexpr 0.5in -\headheight \relax} \setlength\footskip{0.5in} @@ -89,9 +78,23 @@ \RequirePackage{setspace} \setstretch{2} -% Preserve length of one line of text for subsequent use + +% Preserve normalsize and footnotesize single spacing baselineskip values + \newlength\tf@singlelineskip -\setlength\tf@singlelineskip{0.5\baselineskip} +\newlength\tf@fnsinglelineskip + +\ifcase \@ptsize + \setlength\tf@singlelineskip{12pt} + \setlength\tf@fnsinglelineskip{9.5pt} +\or + \setlength\tf@singlelineskip{13.6pt} + \setlength\tf@fnsinglelineskip{11pt} +\or + \setlength\tf@singlelineskip{14.5pt} + \setlength\tf@fnsinglelineskip{12pt} +\fi + % Paragraph indent \setlength\parindent{0.5in} @@ -148,10 +151,11 @@ \newcommand{\tf@setfnpunct}[1]{\def\tf@thefnpunct{#1\,\,}} \tf@setfnpunct{.} -% Footnotes: Renew command for typesetting footnotes +% Footnotes: renew command for typesetting footnotes \renewcommand{\@makefntext}[1]{% \if@optraggedright \raggedright \fi \setlength\parindent{\footnotemargin}% + \setlength\tf@singlelineskip{\tf@fnsinglelineskip}% \@thefnmark\tf@thefnpunct#1} @@ -189,29 +193,32 @@ \def\tf@topsecname{section} -% Headings formatting: \section, \subsection, and \subsubsection +% 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} \renewcommand{\section}{% \@startsection{section}{1}% {\z@}% {-\tf@singlelineskip}% - {1\p@}% + {\tf@singlelineskip}% {\normalfont\bfseries\normalsize\singlespacing\centering}} \renewcommand{\subsection}{% \@startsection{subsection}{2}% {\z@}% {-\tf@singlelineskip}% - {1\p@}% + {\tf@singlelineskip}% {\normalfont\mdseries\normalsize\singlespacing\centering}} \renewcommand{\subsubsection}{% \@startsection{subsubsection}{3}% {\z@}% {-\tf@singlelineskip}% - {1\p@}% + {\tf@singlelineskip}% {\normalfont\bfseries\normalsize\singlespacing\raggedright}} @@ -221,8 +228,10 @@ \def\numberline#1{\hb@xt@\@tempdima{\tflist@beforesecnum #1\tflist@aftersecnum}} -% Table of Contents: renew \tableofcontents with single spacing support +% Table of Contents: renew formatting + \def\tf@tocpagestyle{\@empty} + \renewcommand{\tableofcontents}{% \tf@tocpagestyle \expandafter\csname \tf@topsecname\endcsname*{\contentsname}% @@ -231,10 +240,9 @@ \let\tf@tocrmarg\@tocrmarg \def\@tocrmarg{\tf@tocrmarg plus1fil} \fi - \singlespacing% - \vspace{-1\baselineskip} - \@starttoc{toc}% - \setstretch{2}}% + { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}% + \singlespacing + \@starttoc{toc}}}% % Table of Contents: right margin and number width formatting \def\@tocrmarg{5em} @@ -263,19 +271,17 @@ \renewcommand{\listoffigures}{% \expandafter\csname \tf@topsecname\endcsname*{\listfigurename}% \@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}% - \singlespacing% - \vspace{-1\baselineskip} - \@starttoc{lof} - \setstretch{2}} + { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}% + \singlespacing + \@starttoc{lof}}} % List of Tables \renewcommand{\listoftables}{% \expandafter\csname \tf@topsecname\endcsname*{\listtablename}% \@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}% - \singlespacing% - \vspace{-1\baselineskip} - \@starttoc{lot} - \setstretch{2}} + { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}% + \singlespacing + \@starttoc{lot}}} % List of Illustrations \newcommand{\listillustrationname}{Illustrations} @@ -284,21 +290,23 @@ \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}} + { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}% + \singlespacing + {\tf@illustrsection Figures}\par\nopagebreak + \@starttoc{lof} + \vspace{\tf@singlelineskip} + {\tf@illustrsection Tables}\par\nopagebreak + \@starttoc{lot}}} % 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} +\setlength\textfloatsep{% + \dimexpr 2\tf@singlelineskip +\p@ \relax minus 1\tf@singlelineskip} +\setlength\floatsep{% + \dimexpr 1\tf@singlelineskip +\p@ \relax plus 1\tf@singlelineskip} +\setlength\intextsep{% + \dimexpr 1\tf@singlelineskip +\p@ \relax plus 1\tf@singlelineskip} \def\fps@table{!htb} \def\fps@figure{!htb} @@ -322,8 +330,7 @@ \setlength\leftmarginiii{\parindent} \setlength\leftmarginiv{\parindent} \setlength\labelsep{.65em} -\setlength\labelwidth{\parindent} -\addtolength\labelwidth{-\labelsep} +\setlength\labelwidth{\dimexpr \parindent -\labelsep \relax} % Lists: formatting command for both enumerate and itemize \def\tf@listformat{% @@ -380,12 +387,7 @@ \setlength\rightmargin{\leftmargin} \fi \setlength\parsep{\z@} - % Place line spacing between text and quotation - \ifnum \baselinestretch =1 - \setlength\topsep{\baselineskip} - \else - \setlength\topsep{\z@} - \fi}% + \setlength\topsep{\dimexpr 2\tf@singlelineskip -\baselineskip \relax}}% \singlespacing% \item\relax% } @@ -400,9 +402,7 @@ \renewcommand\@openbib@code{% \singlespacing \setlength\leftmargin{\bibindent} - \setlength\itemindent{-\bibindent} - \addtolength\itemindent{\labelsep} - \addtolength\itemindent{\labelwidth} + \setlength\itemindent{\dimexpr -\bibindent +\labelsep +\labelwidth \relax} \setlength\itemsep{\tf@singlelineskip} \setlength\parsep{\z@}} @@ -429,7 +429,9 @@ \fi \renewcommand{\bibsetup}{% \addcontentsline{toc}{\tf@topsecname}{\bibname} - \singlespacing} + \vspace{\dimexpr -2\tf@singlelineskip +1\baselineskip \relax}% + \singlespacing% + \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}} \renewcommand{\bibitemsep}{1\baselineskip} \renewcommand{\bibhang}{0.5in} }{}} @@ -470,7 +472,7 @@ \renewcommand{\enoteformat}{% \if@optraggedright \raggedright \fi \setlength\parindent{\footnotemargin} - \vspace{1\baselineskip} + \vspace{\tf@singlelineskip} \theenmark.\,\,} \else 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 cf649ac788f..ba32c40228b 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}[2017/03/18 Turabian Research Paper] +\ProvidesClass{turabian-researchpaper}[2017/11/04 Turabian Research Paper] % Default point size @@ -98,23 +98,26 @@ \par\nobreak \vspace*{1\baselineskip}% \fi - \ifstrempty{#2}{}{#2\par\nobreak \vspace{1\baselineskip}}}} + \ifstrempty{#2}% + {}% + {#2\par\nobreak}}% + \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}} \def\@spart#1{% { \tf@partformat \interlinepenalty \@M - #1\par\nobreak - \vspace{1\baselineskip}}} + #1\par\nobreak}% + \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}} +% Sections: command to disable differentiate and reformat \section* +\gdef\noadjustssect{\@adjustssectionfalse} + % Sections: \section* adjustment to space after heading \newif\if@adjustssection\@adjustssectiontrue \newlength\tf@ssect@afterskip \setlength\tf@ssect@afterskip{1\p@} -% Sections: command to disable differentiate and reformat \section* -\gdef\noadjustssect{\@adjustssectionfalse} - % Sections: adjustment to space after \section heading \newif\if@tf@adjustsection\@tf@adjustsectionfalse \newlength\tf@sect@afterskip @@ -132,16 +135,18 @@ \if@nobreak \everypar{} \else \addpenalty\@secpenalty\addvspace\@tempskipa \fi - \setlength\tf@ssect@afterskip{#5} + \setlength\tf@ssect@afterskip{\dimexpr #5 -\tf@adjaftersec \relax} \if@adjustssection \ifstrequal{#1}{section}% - {\setlength\tf@ssect@afterskip{\tf@singlelineskip}}% + {\setlength\tf@ssect@afterskip{% + \dimexpr 2\tf@singlelineskip -\tf@adjaftersec \relax}}% {} \fi - \setlength\tf@sect@afterskip{#5} + \setlength\tf@sect@afterskip{\dimexpr #5 -\tf@adjaftersec \relax} \if@tf@adjustsection \ifstrequal{#1}{section}% - {\setlength\tf@sect@afterskip{\tf@singlelineskip}}% + {\setlength\tf@sect@afterskip{% + \dimexpr 2\tf@singlelineskip -\tf@adjaftersec \relax}}% {} \fi \@ifstar @@ -292,8 +297,8 @@ \renewcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty\@secpenalty - \addvspace{1\baselineskip}% \setlength\@tempdima{\z@}% + \vskip 1\baselineskip { \parindent \z@ \rightskip \@tocrmarg \parfillskip -\rightskip @@ -381,10 +386,10 @@ \section*{\notesname}% \markboth{\notesname}{\notesname}% \addcontentsline{toc}{section}{\notesname}% - \mbox{}\par% - \vspace{-1.5\baselineskip}% - \let\@afterindentfalse\@afterindenttrue - \singlespacing}% + \vspace{\dimexpr -4\tf@singlelineskip +1\baselineskip \relax} + \singlespacing\mbox{}% + \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax} + \let\@afterindentfalse\@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 8f9da7de1e2..38a3d963798 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}[2017/03/18 Turabian Theses and Dissertations] +\ProvidesClass{turabian-thesis}[2017/11/04 Turabian Theses and Dissertations] % Default point size @@ -174,7 +174,8 @@ \vspace*{1\baselineskip}% \fi \fi - \ifstrempty{#1}{}{#1\par\nobreak \vspace{1\baselineskip}}} + \ifstrempty{#1}{}{#1\par\nobreak}}% + \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax} \@afterheading} \def\@endpart{\if@openright \cleardoublepage \else \clearpage \fi} @@ -219,6 +220,13 @@ % Chapter: formatting \def\tf@chapformat{\normalfont\bfseries\normalsize\singlespacing\centering} +\newlength\tf@adjafterchapskip +\setlength\tf@adjafterchapskip{\z@} + +\def\tf@setafterchapskip{% + \setlength\tf@adjafterchapskip{% + \dimexpr 3\tf@singlelineskip -\baselineskip \relax}} + \def\@chapter[#1]#2{% \@figuredblnumfalse \@tabledblnumfalse @@ -247,6 +255,7 @@ \@afterheading} \def\@makechapterhead#1{% + \tf@setafterchapskip { \tf@chapformat \ifnum \c@secnumdepth >\m@ne \if@mainmatter @@ -256,13 +265,33 @@ \fi \fi \interlinepenalty\@M - \ifstrempty{#1}{}{#1\par\nobreak \vspace{1\baselineskip}}}} + \ifstrempty{#1}{}{#1\par\nobreak \vspace{\tf@adjafterchapskip}}}} \def\@makeschapterhead#1{% + \tf@setafterchapskip { \tf@chapformat \interlinepenalty\@M #1\par\nobreak - \vspace{1\baselineskip}}} + \vspace{\tf@adjafterchapskip}}} + + +% Sections: redefine \@startsection to support adjusting space after section headings +\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 + \@ifstar + {\@ssect{#3}{#4}{\dimexpr #5 -\tf@adjaftersec \relax}{#6}}% + {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\dimexpr #5 -\tf@adjaftersec \relax}{#6}}}} % Title page: commands for use with \maketitle @@ -355,7 +384,8 @@ % Table of Contents: formatting -\setcounter{tocdepth}{0} + +\setcounter{tocdepth}{0} \renewcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax @@ -480,10 +510,10 @@ \tf@chapter*{\notesname}% \@mkboth{\MakeUppercase\notesname}{\MakeUppercase\notesname}% \addcontentsline{toc}{chapter}{\notesname}% - \mbox{}\par% - \vspace{-1.5\baselineskip}% - \let\@afterindentfalse\@afterindenttrue - \singlespacing}% + \vspace{\dimexpr -5\tf@singlelineskip +1\baselineskip \relax}% + \singlespacing\mbox{}% + \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax} + \let\@afterindentfalse\@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}{% -- cgit v1.2.3