From 4f3f1acc81147436b6d0077d72876be7a20df1e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 20 Mar 2021 22:19:37 +0000 Subject: turabian-formatting (20mar21) git-svn-id: svn://tug.org/texlive/trunk@58561 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/turabian-formatting/README | 4 +- .../turabian-formatting-doc.pdf | Bin 113704 -> 114043 bytes .../turabian-formatting-doc.tex | 76 +++++++++++++-------- .../turabian-formatting/turabian-formatting.sty | 15 ++-- .../turabian-formatting/turabian-researchpaper.cls | 14 ++-- .../latex/turabian-formatting/turabian-thesis.cls | 22 +++--- 6 files changed, 77 insertions(+), 54 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README index a08b2544d77..dc7187af448 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 (2020/03/19) +Turabian Formatting for LaTeX (2021/03/20) INTRODUCTION @@ -37,7 +37,7 @@ manual, turabian-formatting-doc.pdf, included in this package. ============================== -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 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 f200f9042c7..e75525e14b0 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 e9616ac054c..eef5f67747a 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 @@ -1,7 +1,7 @@ % Turabian Formatting for LaTeX -- Package Documentation % % ============================== -% 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 @@ -19,7 +19,7 @@ % and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== -% Last updated: 2020/03/19 +% Last updated: 2021/03/20 % % @@ -200,13 +200,12 @@ Both document classes, by default, are set to \texttt{oneside}. The \texttt{twos \clearpage \subsection{Ragged Right (Left Align) Text} -\label{subsec:raggedright} +\label{subsec:noraggedright} -\marginnote{raggedright}% -By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature."\autocite[416]{turabian_manual_2018} For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option. - -Alternatively, placing the \textcmd{raggedright} command in the document preamble will have the same effect as using the \texttt{raggedright} option. The \textcmd{raggedright} command, however, does not pass a \texttt{raggedright} option to other loaded packages. +The default text alignment is ``flush left with a ragged right margin.'' Automated line hyphenation is also disabled.\autocite[303, 416]{turabian_manual_2018} +\marginnote{noraggedright}% +The default use of ragged right formatting by \texttt{turabian-formatting} can be disabled using the \texttt{noraggedright} formatting option (thus enabling both full justification of text as well as automated line hyphenation). \subsection{Notes-Bibliography and Author-Date Styles} @@ -227,7 +226,7 @@ Although footnotes are used by default, endnotes can also be used by specifying With the \texttt{endnotes} option, footnotes are restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ .\autocite[161]{turabian_manual_2018} The \texttt{notetype=endonly} option is also passed to the \texttt{biblatex-chicago} package. -To produce a list of endnotes, use the \textcmd{theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes." The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{% +To produce a list of endnotes, use the \textcmd{theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes.'' The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{% The \emph{Notes} heading, when using the \texttt{turabian-researchpaper} document class, is typeset with \textcmd{section*}. The \texttt{turabian-thesis} document class, however, typesets the \emph{Notes} heading with \textcmd{chapter*}. If there are no endnotes preceding \textcmd{theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.} When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter (using the \textcmd{chapter} command).\footnote{% @@ -246,10 +245,10 @@ In this case, the endnotes list then uses subheadings that divide endnotes by ea \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 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[402]{turabian_manual_2018} +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[402]{turabian_manual_2018} \marginnote{\textbackslash part*\{\}} -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[402]{turabian_manual_2018} +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[402]{turabian_manual_2018} \subsection{Chapters} @@ -258,11 +257,11 @@ The \textcmd{part*} command also starts a new part-title page. If in the main ma \marginnote{\textbackslash chapter\{\}} A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be divided into chapters using the \textcmd{chapter} command. -The \textcmd{chapter} command starts a new page with a descriptive title of the chapter, separated from the first line of following text by ``two blank lines." If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title---separated by a blank line---is preceded by a \emph{Chapter} label and chapter number (in arabic numerals) at the top of the page.\autocite[402]{turabian_manual_2018} +The \textcmd{chapter} command starts a new page with a descriptive title of the chapter, separated from the first line of following text by ``two blank lines.'' If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title---separated by a blank line---is preceded by a \emph{Chapter} label and chapter number (in arabic numerals) at the top of the page.\autocite[402]{turabian_manual_2018} \marginnote{\textbackslash chapter*\{\}} -\textcmd{chapter*}, unlike \textcmd{chapter}, does not provide a line with a \emph{Chapter} label and numbering nor is it included in the table of contents.\footnote{% - To add a numberless ``chapter" to the table of contents, use the \textcmd{addcontentsline} command immediately following the \textcmd{chapter*} command.} +\textcmd{chapter*}, unlike \textcmd{chapter}, does not provide a line with a \emph{Chapter} label and numbering, nor is it included in the table of contents.\footnote{% + To add a numberless ``chapter'' to the table of contents, use the \textcmd{addcontentsline} command immediately following the \textcmd{chapter*} command.} \clearpage @@ -271,7 +270,7 @@ The \textcmd{chapter} command starts a new page with a descriptive title of the \marginnote{\textbackslash section\{\}\newline \textbackslash subsection\{\}\newline \textbackslash subsubsection\{\}} Three levels of sections and subsections are supported: \textcmd{section}, \textcmd{subsection}, and \textcmd{subsubsection} (including their asterisked versions). These section and subsection commands do not provide any label or numbering. -\textcmd{section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)."\autocite[404]{turabian_manual_2018} +\textcmd{section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after).''\autocite[404]{turabian_manual_2018} \marginnote{\textbackslash section*\{\}\newline \textbackslash noadjustssect} When used with \texttt{turabian-researchpaper}, the \textcmd{section*} command places two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including \emph{Introduction}, \emph{Notes}, and \emph{Bibliography}.\autocite[400--411]{turabian_manual_2018} Inserting the \textcmd{noadjustssect} command in the document preamble will disable this behaviour. @@ -290,7 +289,7 @@ This package provides the following page styles: \begin{pagestyleoptions} \item[empty] An empty page style with no header or footer. - \item[plain] A ``plain" page style that centres the page number in the footer. For a thesis or dissertation, it applies to pages with page numbers in the front matter as well as the first page of each chapter in the main matter and back matter (refer to subsection~\ref{subsec:td_structure}). + \item[plain] A ``plain'' page style that centres the page number in the footer. For a thesis or dissertation, it applies to pages with page numbers in the front matter as well as the first page of each chapter in the main matter and back matter (refer to subsection~\ref{subsec:td_structure}). \item[headings] The default page style places a page number in the right-hand corner of the header. \end{pagestyleoptions} @@ -320,7 +319,7 @@ The back matter is declared using the \textcmd{backmatter} command. Page numberi \subsection{Title Page} \label{subsec:titlepage} -The \texttt{turabian-researchpaper} document class provides a title page intended for research papers in which page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model" title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter (but does not have a page number on it).\autocite[385--386, 388]{turabian_manual_2018} +The \texttt{turabian-researchpaper} document class provides a title page intended for research papers in which page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model'' title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter (but does not have a page number on it).\autocite[385--386, 388]{turabian_manual_2018} \marginnote{\textbackslash maketitle} The \textcmd{maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}. @@ -331,7 +330,7 @@ The \textcmd{maketitle} command will create a separate title page if the documen For research paper title pages, footnotes (as well as the \textcmd{thanks} command) can also be used. \marginnote{\textbackslash submissioninfo\{\}} -For a research paper, \textcmd{submissioninfo} is used for typesetting ``any information requested by your instructor," between the course title and the date.\autocite[388]{turabian_manual_2018} For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department. +For a research paper, \textcmd{submissioninfo} is used for typesetting ``any information requested by your instructor,'' between the course title and the date.\autocite[388]{turabian_manual_2018} For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department. \marginnote{\textbackslash course\{\}} \texttt{turabian-researchpaper} provides the optional \textcmd{course} command for typesetting course information (such as the course title). @@ -346,7 +345,7 @@ To create a custom title page, use the \texttt{titlepage} environment. \label{subsec:toc} \marginnote{\textcmd{tableofcontents}} -The \textcmd{tableofcontents} command creates a table of contents with the first page labelled \emph{Contents}. Items within the table of contents are single-spaced with ``a blank line after each item." By default, subheadings are not included in the table of contents.\footnote{% +The \textcmd{tableofcontents} command creates a table of contents with the first page labelled \emph{Contents}. Items within the table of contents are single-spaced with ``a blank line after each item.'' By default, subheadings are not included in the table of contents.\footnote{% \autocite[390]{turabian_manual_2018}. To add subheadings to the table of contents, increase the \texttt{tocdepth} counter.} More so, in the table of contents, the front matter and back matter are each separated from the main matter by two blank lines.\autocite[390]{turabian_manual_2018} @@ -356,9 +355,9 @@ More so, in the table of contents, the front matter and back matter are each sep The \texttt{figure} and \texttt{table} environments are both supported. Figures are numbered separately from tables and, both, in the order in which they are mentioned in the text.\autocite[375, 381]{turabian_manual_2018} -With \texttt{turabian-researchpaper}, figures and tables are numbered consecutively, throughout the paper (e.g. ``Figure 6"). +With \texttt{turabian-researchpaper}, figures and tables are numbered consecutively throughout the paper (e.g. ``Figure 6''). -The \texttt{turabian-thesis} document class, however, uses double numeration for both figures and tables: the chapter number followed by a period and a figure/table number that restarts with each chapter (e.g. ``Figure 3.2"). Within the \texttt{appendixes} environment, figures and tables are numbered with an ``A" prefix followed by a period and a figure/table number that does \emph{not} restart with each appendix (e.g. ``Table A.4"). Figures and tables not placed within a chapter do not use double numeration and are, instead, numbered consecutively throughout the thesis/dissertation. +The \texttt{turabian-thesis} document class, however, uses double numeration for both figures and tables: the chapter number followed by a period and a figure/table number that restarts with each chapter (e.g. ``Figure 3.2''). Within the \texttt{appendixes} environment, figures and tables are numbered with an ``A'' prefix followed by a period and a figure/table number that does \emph{not} restart with each appendix (e.g. ``Table A.4''). Figures and tables not placed within a chapter do not use double numeration and are, instead, numbered consecutively throughout the thesis/dissertation. \marginnote{\textbackslash listoffigures} The \textcmd{listoffigures} command creates a list of figures with a \emph{Figures} label on the top of the first page. @@ -387,15 +386,24 @@ Block quotations are typeset using the \texttt{quotation} environment. Each bloc \end{quotation} \end{lstlisting} -The entire quotation is indented as far as the indentation of the first line of a paragraph---by default, an indentation of \texttt{0.5in}.\autocite[361]{turabian_manual_2018} The block quotation is also indented by the same amount on the right side. When using the \texttt{raggedright} option (or the \textcmd{raggedright} command), however, the block quotation is not indented on the right side (refer to subsection~\ref{subsec:raggedright}). +The entire quotation is indented as far as the indentation of the first line of a paragraph---by default, an indentation of \texttt{0.5in}.\footnote{\autocite[361]{turabian_manual_2018}. When using the \texttt{noraggedright} option, the block quotation is also indented by the same amount on the right side (refer to subsection~\ref{subsec:noraggedright}).} \subsection{Appendixes} \label{subsec:appendixes} -When ``supporting material cannot be easily worked into the body of your paper," the manual recommends placing it ``in one or more appendixes in the back matter."\autocite[410]{turabian_manual_2018} +When ``supporting material cannot be easily worked into the body of your paper,'' the manual recommends placing it ``in one or more appendixes in the back matter.''\autocite[410]{turabian_manual_2018} + +\subsubsection*{One Appendix} + +If only one appendix is needed, the manual recommends placing a heading title labelled \emph{Appendix} at the start with ``two blank lines between the title and the first line of text or other material''.\autocite[410]{turabian_manual_2018} -If only one appendix is needed, the first page is to be labelled \emph{Appendix} with ``two blank lines between the title and the first line of text or other material."\autocite[410]{turabian_manual_2018} With the \texttt{turabian-thesis} document class, the material is preceded by a chapter heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{chapter}\{Appendix\}}) and is placed in the back matter. For \texttt{turabian-researchpaper}, the material is preceded by a section heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{section*}\{Appendix\}}). +For the \texttt{turabian-researchpaper} document class, use a section heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{section*}\{Appendix\}}) before material intended for the appendix. + +With \texttt{turabian-thesis}, place the appendix material in the back matter with a preceding chapter heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{chapter}\{Appendix\}}). + +\clearpage +\subsubsection*{Multiple Appendixes} \marginnote{appendixes} To divide material of different types among two or more appendixes,\autocite[410]{turabian_manual_2018} place the material inside the \texttt{appendixes} environment. The requisite code for this environment: @@ -406,11 +414,10 @@ To divide material of different types among two or more appendixes,\autocite[410 \end{appendixes} \end{lstlisting} -The headings of each appendix, within the \texttt{appendixes} environment, use an \emph{Appendix} prefix accompanied by a single, capitalized letter from the alphabet (in sequential order, starting with A). +For \texttt{turabian-researchpaper}, the heading of each appendix is typeset using the \textcmd{section} command. Each \textcmd{section} command, inside the \texttt{appendixes} environment, provides a heading with an \emph{Appendix} prefix accompanied by a single capitalized letter from the alphabet (in sequential order, starting with A). Any optional, descriptive title is placed on the next line. -For the \texttt{turabian-thesis} document class, the heading of each appendix is typeset using the \textcmd{chapter} command. The \textcmd{chapter} command, inside the \texttt{appendixes} environment, provides a heading with an \emph{Appendix} prefix and capitalized letter from the alphabet, followed by an optional descriptive title. +With \texttt{turabian-thesis}, the heading of each appendix is typeset using the \textcmd{chapter} command. Each \textcmd{chapter} command, inside the \texttt{appendixes} environment, provides a heading with an \emph{Appendix} prefix and accompanying capitalized letter from the alphabet (in sequential order, starting with A), followed by an optional, descriptive title. -With the \texttt{turabian-researchpaper} document class, the heading of each appendix is typeset using the \textcmd{section} command. The \textcmd{section} command, inside the \texttt{appendixes} environment, provides a heading with an \emph{Appendix} prefix and capitalized letter from the alphabet followed, on the next line, by an optional descriptive title. \clearpage @@ -427,6 +434,17 @@ The following packages are highly recommended: \texttt{biblatex-chicago}, \textt \section{Updates} \label{sec:updates} +\marginnote{\rmfamily{2021/03/20}}% + +Text alignment is now ragged right (left aligned) by default. The \texttt{raggedright} formatting option has been deprecated. + +A \texttt{noraggedright} option has been added, allowing the package's implementation of ragged right formatting to be disabled. + +Block quotations, by default, no longer indent the first line of the first paragraph. + +Fixed a bug that prevented typesetting documents with \texttt{turabian-thesis} that have chapter headings where the \texttt{endnotes} formatting option is not used. + +Improved formatting of part headings included in the table of contents. \marginnote{\rmfamily{2020/03/19}}% @@ -530,7 +548,7 @@ Both \texttt{turabian-researchpaper} and \texttt{turabian-thesis} can use the \t Significant adjustments made to the \textcmd{maketitle} command, including support for footnotes. -Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \textcmd{setstretch} command provided by the \texttt{setspace} package (instead of \textcmd{doublespacing}). This is different than previous versions of \texttt{turabian-formatting} and should be more-consistent with expectations for ``double spaced" work. +Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \textcmd{setstretch} command provided by the \texttt{setspace} package (instead of \textcmd{doublespacing}). This is different than previous versions of \texttt{turabian-formatting} and should be more-consistent with expectations for ``double spaced'' work. Packages no longer required: \texttt{xifthen}, \texttt{fancyhdr}, \texttt{titlesec}, \texttt{quoting}, \texttt{caption}, \texttt{flafter}, \texttt{url}, and \texttt{chngcntr}. @@ -563,7 +581,7 @@ Deprecated commands: \textcmd{setwordcount}, \textcmd{setpageidentifier}, and \t Removed commands: \textcmd{mytitlepage} and \textcmd{setdraftindicator}. \marginnote{\rmfamily{2014/12/27}}% -Formatting changes to both subsection titles and title page for both research papers and theses/dissertations. +Formatting changes to subsection titles and title page for both research papers and theses/dissertations. \marginnote{\rmfamily{2014/12/10}}% Adjustments to formatting that more-accurately reflect the 8th edition of Turabian's \emph{A Manual for Writers}. @@ -602,7 +620,7 @@ Adjustments to formatting that more-accurately reflect the 8th edition of Turabi \maketitle \section{Introduction} -Amazing, introductory ideas that provide unique insight into your field of interest and ``wows" your professor. +Amazing, introductory ideas that provide unique insight into your field of interest and ``wows'' your professor. \section{An Interesting Section} Great thoughts that further your argument. This includes lots of strong evidence presented throughout several paragraphs, each accompanied by necessary citations.\autocite[8]{authortitle2013} 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 -- cgit v1.2.3