diff options
Diffstat (limited to 'Master')
6 files changed, 589 insertions, 497 deletions
diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README index 219653d4086..772797f0286 100644 --- a/Master/texmf-dist/doc/latex/turabian-formatting/README +++ b/Master/texmf-dist/doc/latex/turabian-formatting/README @@ -1,11 +1,14 @@ -Turabian Formatting for LaTeX (2014/12/27) +Turabian Formatting for LaTeX (2015/11/14) + + +INTRODUCTION This package provides Chicago-style formatting based on Kate L. Turabian's "A Manual for Writers of Research Papers, Theses, and -Dissertations: Chicago Style for Students and Researchers" (8th -edition). In doing, so, this package adheres closely to the formatting +Dissertations: Chicago Style for Students and Researchers," 8th +edition. In doing, so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily -adaptable to additional formatting requirements (ie. formatting +adaptable to additional formatting requirements (e.g. formatting requirements specific to an institution and/or department). It is hoped that authors will find this package relatively easy to @@ -15,36 +18,24 @@ As such, formatting research papers, theses, and dissertations should require a minimum amount of changes to a standard LaTeX source file (your .tex file). -For citations, this package provides optional support for David +For citations, this package is designed to work well with David Fussner's outstanding (and highly-recommended) biblatex-chicago. -For more information on using the package, refer to the accompanying -manual, turabian-formatting-doc.pdf, included in this package. - INSTALLATION -To install this package, place the turabian-formatting directory (with -its files) in the appropriate subdirectory of your local texmf -directory. This is usually the texmf/tex/latex/ directory. +To install this package (if not already installed), place the +turabian-formatting directory (with its files) in the appropriate +subdirectory of your local texmf directory. This is usually the +texmf/tex/latex/ directory. -UPDATES +LAST UPDATED: 2015/11/14 -2014/12/27 -- Improved documentation as well as adjustments to both subsection -titles and title page formatting for both research papers and -theses/dissertations. - - -2014/12/10 - -- Updated formatting and documentation to better-conform with the 8th -edition of Turabian's "A Manual for Writers of Research Papers, Theses, -and Dissertations." +For more information on using the package, refer to the accompanying +manual, turabian-formatting-doc.pdf, included in this package. -- Changes to wording, formatting, and organization of README. ============================== 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 Binary files differindex 8a1ac6af76b..9ad6380c922 100644 --- a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf +++ b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf 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 3becfb3fdb0..db7adccc20e 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 @@ -15,25 +15,36 @@ % LPPL Maintenance Status: maintained (by Omar Abdool) % % This work consists of the files: turabian-formatting.sty, -% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). +% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, +% and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== -% Last updated: 2014/12/27 +% Last updated: 2015/11/14 % -% Corresponding package items: -% 2014/12/27 Turabian Formatting -% 2014/12/27 Turabian Research Paper -% 2014/12/27 Turabian Theses and Dissertations % \documentclass{article} -\usepackage{polyglossia, fontspec} +\usepackage{polyglossia, fontspec, csquotes, ellipsis} \setmainlanguage{english} \defaultfontfeatures{Ligatures=TeX} -\usepackage{csquotes, units, metalogo} +\usepackage{filecontents} +\begin{filecontents}{references.bib} + @book{turabian_manual_2013, + author = {Turabian, Kate L.}, + edition = {8th edition}, + title = {A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, + shorttitle = {A Manual for Writers of Research Papers, Theses, and Dissertations}, + publisher = {University of Chicago Press}, + year = {2013}} +\end{filecontents} + +\usepackage[authordate,backend=biber]{biblatex-chicago} +\addbibresource{references.bib} + +\usepackage{units, metalogo, setspace} \usepackage{marginnote} \renewcommand*{\raggedleftmarginnote}{} @@ -43,12 +54,16 @@ \usepackage{geometry} \geometry{top=1.5in, bottom=1.75in, left=1.75in, right=1.75in} -\usepackage[bottom,marginal]{footmisc} +\usepackage[bottom, marginal]{footmisc} + +\interfootnotelinepenalty=10000 -\usepackage{setspace} +\RequirePackage[defaultlines=2, all]{nowidow} + +\usepackage[hidelinks]{hyperref} \usepackage{listings} -\lstset{ +\lstset{% language=TeX, aboveskip=10pt, belowskip=0pt, @@ -56,11 +71,11 @@ columns=flexible, basicstyle={\normalsize\ttfamily}, numbers=none, - breaklines=false, - breakatwhitespace=true - tabsize=0.5in -} + breaklines=true, + breakatwhitespace=true, + breakindent=0pt} +\newcommand{\versionDateText}{2015/11/14} \title{Turabian Formatting for \LaTeX{}} \author{Omar Abdool} @@ -81,7 +96,6 @@ \tableofcontents - % Formatting for document content \newgeometry{top=1.75in, bottom=1.75in, left=2.25in, right=1.25in, marginparsep=0.25in, marginparwidth=1.25in} @@ -92,35 +106,39 @@ -\section{Introduction} +\section*{Introduction} \label{sec:introduction} -This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th edition. In doing so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily adaptable to additional formatting requirements (ie. formatting requirements specific to an institution and/or department). +This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th edition. In doing so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily adaptable to additional formatting requirements (e.g. formatting requirements specific to an institution and/or department). It is hoped that authors will find this package relatively easy to implement. There are few (if any) new commands to learn, as the package builds upon (and makes adjustments to) already-existing \LaTeX{} commands. As such, formatting research papers, theses, and dissertations should require a minimum amount of changes to a standard \LaTeX{} source file (your \texttt{.tex} file). -For citations, this package provides optional support for David Fussner's outstanding (and highly-recommended) \texttt{biblatex-chicago}. +For citations, this package is designed to work well with David Fussner's outstanding (and highly-recommended) \texttt{biblatex-chicago}. \section{Using the Package and Document Classes} \label{sec:implementation} -To format a document with this package, one can load the \texttt{turabian-formatting} package in the \LaTeX{} source file preamble. Alternatively, the document class can be specified as either a research paper (\texttt{turabian-researchpaper}) or a thesis/dissertation (\texttt{turabian-thesis}). +A document may be formatted using \texttt{turabian-formatting} in one of three ways: either (1) loading the package in the \LaTeX{} source-file preamble, (2) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), or (3) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}). \subsection{Package for Turabian-Style Formatting} \marginnote{turabian-\newline formatting}% -The \texttt{turabian-formatting} package is loaded in the preamble of the source file:\footnote{ - The \texttt{turabian-formatting} package has been tested with the standard \texttt{article}, \texttt{report}, and \texttt{book} \LaTeX{} document classes.} +The \texttt{turabian-formatting} package is loaded in the preamble of the source file: + \begin{lstlisting} \usepackage{turabian-formatting} \end{lstlisting} -\underline{Important note}: The \texttt{turabian-formatting} package should always be loaded \emph{before} loading the \texttt{biblatex-chicago} package. +Do not use this approach if the document class is either \texttt{turabian-researchpaper} or \texttt{turabian-thesis}.\footnote{% + The \texttt{turabian-formatting} package has been tested with the standard \texttt{article}, \texttt{report}, and \texttt{book} \LaTeX{} document classes.} + +This package should, also, always be loaded \emph{before} loading the \texttt{biblatex-chicago} package. + -\newpage +\clearpage \subsection{Document Class for Research Papers} \marginnote{turabian-\newline researchpaper}% @@ -140,141 +158,172 @@ The \texttt{turabian-thesis} document class offers formatting specific to theses \documentclass{turabian-thesis} \end{lstlisting} -This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{book} document class. +This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{book} document class. As such, support for chapter headings (\texttt{\textbackslash chapter} and \texttt{\textbackslash chapter*}), title pages specific to theses/dissertations (refer to subsection~\ref{subsec:titlepage}), table of contents, and formatting commands to structure the document into front matter, main matter, and back matter (refer to subsection~\ref{subsec:td_structure}), are also included. + \section{Formatting Options} \label{sec:formatting_options} +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}. Paragraph indentation is set to 0.5 inches. + + \subsection{Standard Options for Document Classes} -Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support many of the standard document class options.\footnote{ - Neither the \texttt{notitlepage} nor the \texttt{twocolumn} options are available for either document class.} +Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support most of the standard document class options.\footnote{% + Neither the \texttt{notitlepage} nor the \texttt{twocolumn} options, however, are supported by either document class.} -The default page size, for both document classes, is 8\nicefrac{1}{2} × 11 inches (US Letter size). The normal font size is 12pt. +The default \texttt{normal} font size is twelve-point type (\texttt{12pt})---the preferred font type size for the body of the text \autocite[373]{turabian_manual_2013}. This package also supports \texttt{normal} font type sizes of \texttt{10pt} and \texttt{11pt}. -As with other standard \LaTeX{} document classes, different paper sizes and font sizes can be specified as class options. For example: -\begin{lstlisting} - \documentclass[11pt,a4paper]{turabian-researchpaper} -\end{lstlisting} +The default page size, for both document classes, is 8\nicefrac{1}{2} × 11 inches (US Letter size). And as with other standard \LaTeX{} document classes, different paper sizes and can be specified as class options, including \texttt{letterpaper} (the default), \texttt{a4paper}, and \texttt{legalpaper}. -\marginnote{draft}% -The standard \texttt{draft} mode is also available as an option. As part of this mode, text indicating the work is draft is also placed in the header (refer to subsection~\ref{subsec:draft_indicator}). +Both documents classes, by default, are set to \texttt{oneside}. \subsection{Page Layout and Empty Margins} \label{subsec:pagelayout_emptymargins} Page margins, by default, are 1 inch from the edges of the paper.\footnote{ - The \texttt{turabian-thesis} document class also has an additional binding offset of 0.5 inches on the left, effectively creating a left margin of 1\nicefrac{1}{2} inches.} + The \texttt{turabian-thesis} document class has an additional binding offset of 0.5 inches, effectively creating a left/inside margin of 1\nicefrac{1}{2} inches. The binding offset can be adjusted through the \texttt{geometry} package by using the \texttt{bindingoffset} option of the \texttt{\textbackslash geometry} command.} To make changes to the page layout, use of the \texttt{geometry} package is recommended. -Headers and footers, by default, are placed inside the margins. The top of the header is 0.5 inches from the top of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page. Headers and footers are typset with the \texttt{fancyhdr} package (refer to section~\ref{sec:page_styles}). +Headers and footers, by default, are placed inside the margins. The top of the header is 0.5 inches from the top of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page. (Refer to section~\ref{sec:page_styles} for typesetting headers and footers.) \marginnote{emptymargins}% The \texttt{emptymargins} option removes headers and footers from within the margin and, instead, places them within the space normally used for the body text. As such, the page margins are empty of all text. -\underline{Important Note}: Using the \texttt{emptymargins} option, however, reduces the height of the text (\texttt{textheight}) by 0.5 inches when a header or footer is placed on the page. Because some pages within a document will have headers, and others footers, the \texttt{emptymargins} option allows for pages to have either a header or a footer on a page---not both on the same page. Empty pages have neither a header nor a footer (refer to section~\ref{sec:page_styles}). +Using the \texttt{emptymargins} option, however, reduces the text height (\texttt{textheight}) by 0.5 inches when a header or footer is placed on the page. Because some pages within a document will have headers, and others footers, the \texttt{emptymargins} option allows for pages to have either a header or a footer on a page---although not both on the same page. Empty pages have neither a header nor a footer (refer to section~\ref{sec:page_styles}). \subsection{Ragged Right (Left Align) Text} \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."\footnote{Kate L. Turabian, \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th ed. (University of Chicago Press, 2013), 404.} For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option. +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[404]{turabian_manual_2013}. For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option. + + +\subsection{Support for Endnotes} + +Endnotes can be used instead of footnotes by loading the \texttt{endnotes} package in the \LaTeX{} document source preamble.\footnote{% + When using the \texttt{endnotes} package, cite keys must not contain an underscore character, ``\texttt{\_}".} + +\marginnote{endnotes}% +Formatting support for the \texttt{endnotes} package can be enabled using the \texttt{endnotes} option. With the \texttt{endnotes} option, footnotes are restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ \autocite[156]{turabian_manual_2013}. More so, each endnote is single-spaced with a ``blank line between notes." The list of endnotes is labelled \emph{Notes}.\footnote{% + The \emph{Notes} heading is typeset using either \texttt{\textbackslash chapter*} or \texttt{\textbackslash section*}, depending upon the document class.} +Numbering of endnotes is also restarted for each chapter with subheadings dividing the list by each chapter \autocite[157]{turabian_manual_2013}. + +To place the \emph{Notes} list, use the \texttt{\textbackslash theendnotes} command provided by the \texttt{endnotes} package. -\subsection{Adjustments to \texttt{biblatex-chicago} Formatting} +\subsection{Adjusting Bibliography Formatting} + +For citations, this package is designed to work well with the \texttt{biblatex-chicago} package. This includes support for both the Notes-Bibliography and Author-Date styles (the former being the default style).\footnote{% + To maintain this support if \texttt{turabian-formatting} is loaded as a package, the package should always be loaded \emph{before} loading the \texttt{biblatex-chicago} package. If \texttt{biblatex-chicago} is loaded, the following options are passed to it: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}. If the \texttt{endnotes} option is enabled for \texttt{turabian-formatting}, then \texttt{notetype=endonly} is also passed to the \texttt{biblatex-chicago} package.} \marginnote{noadjustbib}% -Reformatting support for \texttt{biblatex-chicago} can be disabled using the \texttt{nodajustbib} formatting option. This affects adjustments to the formatting of footnotes and endnotes, as well as changes to both the headings and spacing in the bibliography. +Formatting support that adjusts the Bibliography, generated by \texttt{biblatex-chicago}, can be disabled using the \texttt{nodajustbib} formatting option. This option is only available when loading \texttt{turabian-formatting} as a package. The following code is affected by this option: -\newpage -\subsection{Using Endnotes with Research Papers} +\begin{lstlisting} + \AtBeginBibliography{\vspace*{-0.333\baselineskip}} + \renewcommand{\bibsetup}{\singlespacing} + \renewcommand{\bibitemsep}{1\baselineskip} + \renewcommand{\bibhang}{0.5in} +\end{lstlisting} -\marginnote{endnotesonly}% -For research papers, endnotes can be used instead of footnotes. The \texttt{endnotesonly} option is only available for the \texttt{turabian-researchpaper} document class.\footnote{% - Cite keys must not contain an underscore character, ``\texttt{\_}". Refer to section~\ref{sec:bugs}.} \section{Formatting Commands} \label{sec:formatting_commands} -\subsection{Page Identifier} -\label{subsec:page_identifier} -\marginnote{\textbackslash setpageidentifier}% -Optional text (a page identifier) can be placed in the header.\footnote{% - Turabian, 374.} -This text is specified using the \texttt{\textbackslash setpageidentifier} command in the preamble of the \LaTeX{} source file. +\subsection{Headings: Chapters, Sections, and Subsections} -\begin{lstlisting} - \setpageidentifier[<horizontal space length>]{<Text>} -\end{lstlisting} +The \texttt{turabian-formatting} package provides support for document classes that allow text to be divided into sections and subsections. This package also provides support for document classes that define \texttt{\textbackslash chapter} and \texttt{\textbackslash chapter*}, including the \texttt{report}, \texttt{book}, and \texttt{turabian-thesis} document classes. -The default horizontal space, before the page number, is 3ex. This command applies to pages that use either the default \texttt{fancy} page style or the \texttt{headings} page style (refer to section~\ref{sec:page_styles}). +\subsubsection*{Chapters} +\marginnote{\textbackslash chapter} +The \texttt{\textbackslash chapter} command starts a new page and creates a \emph{Chapter} label ``followed by the chapter number at the top of the page" in arabic numerals. The ``descriptive title" of the chapter is placed ``two lines down, following a blank line" and is separated from the first line of following text by ``two blank lines" \autocite[391]{turabian_manual_2013}. -\subsection{Draft Indicator} -\label{subsec:draft_indicator} +\marginnote{\textbackslash chapter*} +\texttt{\textbackslash chapter*}, unlike \texttt{\textbackslash 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 \texttt{\textbackslash addcontentsline} command immediately following the \texttt{\textbackslash chapter*} command. For the \emph{Bibliography} or \emph{References} heading from \texttt{\textbackslash printbibliography} (from the \texttt{biblatex-chicago} package), place this command immediately \emph{after} the use of the \texttt{\textbackslash clearpage} and \texttt{\textbackslash addcontentsline} commands. The same applies to the \texttt{\textbackslash theendnotes} command from the \texttt{endnotes} package.} +This is useful for the titles/headings of specific elements, including the \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Abstract} \autocite[389]{turabian_manual_2013}, \emph{Conclusion} \autocite[398]{turabian_manual_2013}, \emph{Appendixes} \autocite[398]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}. -\marginnote{\textbackslash setdraftindicator}% -When the \texttt{draft} option has been specified, text indicating the draft status is placed on pages throughout document. This text can be changed in the preamble of the \LaTeX{} source file when using the \texttt{\textbackslash setdraftindicator} command: +\subsubsection*{Sections and Subsections} -\begin{lstlisting} - \setdraftindicator{<Text>} -\end{lstlisting} +\marginnote{\textbackslash section\newline \textbackslash subsection\newline \textbackslash subsubsection} +This package provides support for three levels of sections and subsections: \texttt{\textbackslash section}, \texttt{\textbackslash subsection}, and \texttt{\textbackslash subsubsection} (including their asterisked versions). These section and subsection commands do not provide any label or numbering. -Default text example: +\texttt{\textbackslash section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)" \autocite[393]{turabian_manual_2013}. -\hspace{0.5in}Draft (\today) +\marginnote{\textbackslash section*} +If the document class does not define chapter headings, \texttt{\textbackslash section*} will instead provide two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including the \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}. -Text indicating the draft status of the document is only found on pages that use either the default \texttt{fancy} page style or the \texttt{headings} page style (refer to section~\ref{sec:page_styles}). +\subsection{Page Styles: Headers and Footers} +\label{sec:page_styles} -\newpage -\subsection{Title Page} +\marginnote{\textbackslash pagestyle\newline \textbackslash thispagestyle} +Headers and footers are determined by the specific page styles. They are used with the \texttt{\textbackslash pagestyle} and \texttt{\textbackslash thispagestyle} commands. -\marginnote{\textbackslash maketitle}% -To create a title page, you can use the standard \texttt{\textbackslash maketitle} command along with \texttt{\textbackslash title}, \texttt{\textbackslash author}, and \texttt{\textbackslash date}.\footnote{% - By default, a separate title page is created with the \texttt{\textbackslash maketitle} command. This default behaviour can be disabled when a \texttt{notitlepage} option is specified when loading \texttt{turabian-formatting} as a package. This option, however, is not available for either the \texttt{turabian-researchpaper} or \texttt{turabian-thesis} document classes.} +\textbf{\texttt{empty}}: An empty page style with no header or footer. -Both \texttt{formatting-turabian} and \texttt{turabian-researchpaper}, by default, produce a title page intended for research papers. Page numbering begins immediately following the title page. +\textbf{\texttt{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}). -The following optional commands are also available for use with the title page (each of which are self-evident): \texttt{\textbackslash subtitle}, \texttt{\textbackslash course}, and \texttt{\textbackslash institution}. +\textbf{\texttt{headings}}: The default page style places a page number in the right-hand corner of the header. +The \texttt{fancyhdr} package can be used to typset (and adjust) these page styles. This includes placing optional text (such as a page identifier) in the header and/or footer \autocite[374]{turabian_manual_2013}. -\marginnote{\textbackslash setwordcount}% -The optional \texttt{\textbackslash setwordcount} command inserts text at the bottom right of the title page---text intended for an optional word count sometimes required in the submission of research papers. -\marginnote{\textbackslash mytitlepage}% -To implement a custom title page, renew the optional \texttt{\textbackslash mytitlepage} command with your text written with \LaTeX{}. This can include reference to another \texttt{.tex} file. For example: +\subsection{Document Structure for Thesis/Dissertation} +\label{subsec:td_structure} +A thesis/dissertation is divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter \autocite[375]{turabian_manual_2013}. As such, this package provides support for document classes that use the \texttt{\textbackslash frontmatter}, \texttt{\textbackslash mainmatter}, and \texttt{\textbackslash backmatter} commands (such as the \texttt{book} and \texttt{turabian-thesis} document classes). -\begin{lstlisting} - \renewcommand{\mytitlepage}{% - Custom title page content - } -\end{lstlisting} +\subsubsection*{Front Matter} + +\marginnote{\textbackslash frontmatter} +The front matter is declared with the \texttt{\textbackslash frontmatter} command. By default, the \texttt{\textbackslash pagestyle} is set to \texttt{empty} (refer to section~\ref{sec:page_styles}). The numbering of pages in the front matter begins with the title page, although page numbers are not placed on pages until the Table of Contents \autocite[373--374, 376, 380]{turabian_manual_2013}. +Placing the \texttt{\textbackslash tableofcontents} command in the front matter will cause page numbers to appear on pages with the Table of Contents and subsequent pages of the front matter. These page numbers use roman numerals and are placed in centre of the footer \autocite[373--374]{turabian_manual_2013} using the \texttt{plain} page style (refer to section~\ref{sec:page_styles}). -\subsubsection{Thesis/Dissertation Title Page} -\label{subsubsec:td_titlepage} -The \texttt{turabian-thesis} document class provides a title page intended for a thesis or dissertation. In addition to the commands noted above, this document class provides commands that can be placed in the header. This includes: \texttt{\textbackslash faculty}, \texttt{\textbackslash mydegree}, \texttt{\textbackslash department}, and \texttt{\textbackslash location}. +\subsubsection*{Main Matter} -Unlike research papers, the title page of a thesis or dissertation is included in the front matter, as page i (although the page number is not placed on the page itself).\footnote{Turabian, 376.} +\marginnote{\textbackslash mainmatter} +The main matter (or text of the paper) begins with the \texttt{\textbackslash mainmatter} command. Page numbering restarts with arabic numerals, starting with page 1. Page numbers are placed on the right-side of the header, using the \texttt{headings} page style (with the exception of the first page of each chapter, which instead use the \texttt{plain} page style) \autocite[373--374]{turabian_manual_2013}. +\subsubsection*{Back Matter} -\subsection{Captions and Table Footnotes} +\marginnote{\textbackslash backmatter} +The back matter is declared using the \texttt{\textbackslash backmatter} command. Page numbering and page styles are continued from the main matter \autocite[373--374]{turabian_manual_2013}. + + +\subsection{Title Page} +\label{subsec:titlepage} + +\marginnote{\textbackslash maketitle}% +The \texttt{\textbackslash maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default document class option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}. -Captions, for both figures and tables, are implemented using (and can be altered through) the \texttt{caption} package. +The \texttt{turabian-researchpaper} document class produces a title page intended for research papers. Page numbering begins immediately following the title page. -A table, Turabian describes, can also have four kinds of footnotes: ``(1) source lines \dots, (2) general footnotes that apply to the whole table, (3) footnotes that apply to specific parts of the table, and (4) notes on levels of statistical significance."\footnote{Turabian, 366.} +\marginnote{\textbackslash title\newline \textbackslash subtitle\newline \textbackslash author\newline \textbackslash date\newline \textbackslash course\newline \textbackslash institution} +\texttt{\textbackslash maketitle} uses information specified in the source document preamble, through the following commands (each of which is self-evident): \texttt{\textbackslash title}, \texttt{\textbackslash author}, \texttt{\textbackslash date}, \texttt{\textbackslash subtitle}, \texttt{\textbackslash course}, and \texttt{\textbackslash institution}. -\marginnote{\textbackslash tablesource}% -The optional \texttt{\textbackslash tablesource} command creates a source line to cite the source material of the table.\footnote{Ibid., 360--361.} +The \texttt{turabian-thesis} document class provides a ``model" title page intended for a thesis or dissertation---a title page different than one intended for a research paper. The title page of a thesis/dissertation is included in the page numbering of the front matter \autocite[376, 378]{turabian_manual_2013}.\footnote{% + When \texttt{turabian-formatting} is loaded as a package, the default title page created is for that of a research paper. The ``model" title page for theses/dissertations is only available to the \texttt{turabian-thesis} document class.} + +\marginnote{\textbackslash faculty\newline \textbackslash mydegree\newline \textbackslash department\newline \textbackslash location} +The following commands are available only with a title page for \texttt{turabian-thesis}: \texttt{\textbackslash faculty}, \texttt{\textbackslash mydegree}, \texttt{\textbackslash department}, and \texttt{\textbackslash location}. + +To create a custom title page, however, use the \texttt{titlepage} environment. + + +\subsection{Table Footnotes} + +A table is described as having four kinds of footnotes: ``(1) source lines \dots, (2) general footnotes that apply to the whole table, (3) footnotes that apply to specific parts of the table, and (4) notes on levels of statistical significance" \autocite[366]{turabian_manual_2013}. \marginnote{\textbackslash tablenote}% -The optional \texttt{\textbackslash tablenote} command allows the inclusion of a footnote belonging to the table. It can be repeatedly used for each footnote accompanying the table.\footnote{A footnote mark, however, is \underline{not} generated by the \texttt{\textbackslash tablenote} command. This must either be done manually or through the use of another package.} +The optional \texttt{\textbackslash tablenote} command provides formatting for each table footnote. It can be repeatedly used for each footnote accompanying a table.\footnote{A footnote mark for specific parts, however, is \emph{not} generated by the \texttt{\textbackslash tablenote} command. This must either be done manually or through the use of another package.} -For each table, both \texttt{\textbackslash tablesource} and \texttt{\textbackslash tablenote} must be located inside the \texttt{table} environment, after the table itself. +For each table, \texttt{\textbackslash tablenote} must be located inside the \texttt{table} environment, after the table itself. The following is an example accompanying the use of the \texttt{tabular} environment: \begin{lstlisting} @@ -282,170 +331,120 @@ The following is an example accompanying the use of the \texttt{tabular} environ ... \end{tabular} \footnotesize - \tablesource{\emph{Source:} Citation for the table.} - \tablenote{Note related to the table.} - \tablenote{Another note.} + \tablenote{\emph{Source:} Citation for the table.} + \tablenote{\emph{Note:} A note related to the table.} ... \end{table} \end{lstlisting} -\subsection{Document Structure for Thesis/Dissertation} -\label{subsec:td_structure} -A thesis/dissertation is divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter.\footnote{Turabian, 375.} - -\marginnote{\textbackslash frontmatter}% -The front matter is declared with the \texttt{\textbackslash frontmatter} command. Page headers and footers are empty using the \texttt{empty} page style (refer to section~\ref{sec:page_styles}). The numbering of pages in the front matter begins with the title page, although page numbers are not placed on pages until the table of contents.\footnote{Turabian, 373--374, 376, 380.} -\marginnote{\textbackslash tableofcontents}% -The \texttt{\textbackslash tableofcontents} command is used to place the table of contents in the front matter. With the use of this command, page numbering appears on pages with the table of contents and subsequent pages of the front matter. Page numbers use roman numerals and are placed in centre of the footer using the \texttt{plain} page style (refer to section~\ref{sec:page_styles}).\footnote{Ibid., 373--374.} +\section{Required and Recommended Packages} +\label{sec:required_packages} -\marginnote{\textbackslash mainmatter}% -The main matter (or text of the paper) begins with the \texttt{\textbackslash mainmatter} command. Page numbering restarts with arabic numerals, beginning with page 1. Page numbers are placed on the right-side of the header, using the \texttt{headings} page style (with the exception of the first page of each chapter, instead using the \texttt{plain} page style).\footnote{Ibid.} +This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{setspace}, \texttt{xifthen}, \texttt{etoolbox}, \texttt{geometry}, \texttt{nowidow}, \texttt{footmisc}, \texttt{fancyhdr}, \texttt{titlesec}, \texttt{quoting}, \texttt{flafter}, \texttt{caption}, \texttt{endnotes}, \texttt{url}, \texttt{chngcntr}, and \texttt{xparse}. -\marginnote{\textbackslash backmatter}% -The back matter is declared using the \texttt{\textbackslash backmatter} command. Page numbering and page styles are continued from the main matter.\footnote{Ibid.} +The following packages are highly recommended: \texttt{biblatex-chicago} and \texttt{ellipsis}. +The \texttt{emptypage} package is also helpful in making empty pages without header and footers when using the \texttt{twoside} document class option. -\section{Page Styles: Headers and Footers} -\label{sec:page_styles} -Headers and footers are typset (and can be adjusted) using the page styles produced by the \texttt{fancyhdr} package. The following are used with both \texttt{\textbackslash pagestyle} and \texttt{\textbackslash thispagestyle} commands. +\section{Updates} +\label{sec:updates} -\textbf{\texttt{fancy}}: The default page style places a page number in the right-hand corner of the header. A page identifier and/or draft indicator can also be added to the header (refer to subsections~\ref{subsec:page_identifier} and~\ref{subsec:draft_indicator}). +\marginnote{\rmfamily{\versionDateText}}% -\textbf{\texttt{empty}}: An empty page style with no headers or footers. Neither a page identifier nor draft indicator is placed in either the header or footer. +Added support for the \texttt{endnotes} package. An \texttt{endnotes} option has been added, removing the need for an \texttt{endnotesonly} option for \texttt{turabian-researchpaper}. -\textbf{\texttt{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}). Neither a page identifier nor draft indicator is placed in either the header or footer. +Improved support for the \texttt{biblatex-chicago} package, including added support for the Author-Date citation style. -\textbf{\texttt{headings}}: Places a page number in the right corner of the header (the default style is identical to \texttt{fancy}). And as with \texttt{fancy}, a page identifier and/or draft indicator can also be added to the header. +Footnote lines are no longer forced together, allowing a footnote to run over to the next page. +Adjustments to the spacing that follow the \texttt{\textbackslash chapter*} and \texttt{\textbackslash section*} commands. +Updated use of page style options, removing the \texttt{fancy} page style. -\section{Required Packages} -\label{sec:required_packages} +\texttt{\textbackslash frontmatter} and \texttt{\textbackslash tableofcontents} no longer ignore the \texttt{bindingoffset} value and margin sizes specified in the source document preamble, through the \texttt{geometry} package. -This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{setspace}, \texttt{xifthen}, \texttt{etoolbox}, \texttt{geometry}, \texttt{nowidow}, \texttt{url}, \texttt{footmisc}, \texttt{fancyhdr}, \texttt{titlesec}, \texttt{quoting}, \texttt{flafter}, and \texttt{caption}. +Improved implementation of the \texttt{raggedright} formatting option with: (1) table and figure captions; and (2) the \texttt{\textbackslash tablenote} command. +Adjustments to the behaviour of table and figure positioning. +Deprecated commands: \texttt{\textbackslash setwordcount}, \texttt{\textbackslash setpageidentifier}, and \texttt{\textbackslash tablesource}. -\section{Updates} -\label{sec:updates} +Removed commands: +\texttt{\textbackslash mytitlepage}, and \texttt{\textbackslash setdraftindicator}. \marginnote{\rmfamily{2014/12/27}}% -Improved documentation as well as adjustments to both subsection titles and title page formatting for both research papers and theses/dissertations. +Formatting changes to both subsection titles and title page for both research papers and theses/dissertations. \marginnote{\rmfamily{2014/12/10}}% -Update to formatting and documentation based on the 8th edition of Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations}. +Adjustments to formatting that more-accurately reflect the 8th edition of Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations}. \section{Known Bugs} \label{sec:bugs} -\marginnote{\rmfamily{2014/12/07}}% -Using the \texttt{geometry} package's \texttt{showframe} formatting option with the \texttt{emptymargins} formatting option, when making adjustments to the header and/or footer of the \texttt{plain} page style, will not render properly. - -\marginnote{\rmfamily{2014/12/07}}% -The \texttt{endnotesonly} option generates an error if a cite key contains an underscore character, ``\texttt{\_}", when used with the \texttt{biblatex-chicago} package. - - - -\newpage +The \texttt{endnotes} option generates an error if a cite key contains an underscore character (\texttt{\_}) when used with the \texttt{biblatex-chicago} package. -\section{Sample Code} -\label{sec:sample_code} +Table captions, when the table is positioned at the top of a page, will have an additional vertical space of \texttt{0.5\textbackslash baselineskip} between the caption text and the top margin. -\subsection*{Sample 1: A Research Paper with \LaTeX{}} -Creating a research paper using \LaTeX{} and the \texttt{turabian-researchpaper} document class. +Using the \texttt{geometry} package's \texttt{showframe} formatting option with the \texttt{emptymargins} formatting option, when making adjustments to the header and/or footer of the \texttt{plain} page style, will not render properly. -\LaTeX{} code: -\begin{lstlisting} - \documentclass{turabian-researchpaper} - \usepackage[english]{babel} - \usepackage[utf8]{inputenc} - \usepackage{csquotes} +\printbibliography - \usepackage{biblatex-chicago} - \addbibresource{my_bibliography.bib} - \title{An Interesting Work} - \author{Author's Name} - \date{\today} - \begin{document} - \maketitle - ... - \printbibliography - \end{document} -\end{lstlisting} +\clearpage -\newpage -\subsection*{Sample 2: A Research Paper with \XeLaTeX} -Creating a research paper using \XeLaTeX{} and the \texttt{turabian-researchpaper} document class. +\section*{Appendix: Sample Code for a Research Paper} +\label{sec:sample_code} +\addcontentsline{toc}{section}{Appendix: Sample Code for a Research Paper} -\XeLaTeX{} code: +The following is for a research paper using the \LaTeX{} markup language. +\vspace{1.3\baselineskip} \begin{lstlisting} - \documentclass{turabian-researchpaper} - - \usepackage{polyglossia, fontspec} - \setmainlanguage{english} - \defaultfontfeatures{Ligatures=TeX} - \usepackage{csquotes} - - \usepackage{biblatex-chicago} - \addbibresource{my_bibliography.bib} +\documentclass{turabian-researchpaper} - \title{An Interesting Work} - \author{Author's Name} - \date{\today} +\usepackage[english]{babel} +\usepackage[utf8]{inputenc} +\usepackage{csquotes, ellipsis} - \begin{document} - \maketitle - ... - \printbibliography - \end{document} -\end{lstlisting} - -\newpage -\subsection*{Sample 3: A Research Paper with \XeLaTeX{}} -An alternative way to create a research paper using \XeLaTeX{}, the \texttt{article} document class, and the \texttt{turabian-formatting} package. +\usepackage{biblatex-chicago} +\addbibresource{mybibfile.bib} -The \texttt{emptymargins} formatting option, from the \texttt{turabian-formatting} package, is specified (refer to subsection~\ref{subsec:pagelayout_emptymargins}). +\title{An Interesting Work} +\author{Author's Name} +\date{\today} -The main font, using the \texttt{fontspec} package, is set to Times New Roman. -\XeLaTeX{} code: +\begin{document} -\begin{lstlisting} - \documentclass[12pt]{article} +\maketitle - \usepackage{polyglossia, fontspec} - \setmainlanguage{english} - \defaultfontfeatures{Ligatures=TeX} - \usepackage{csquotes} +\section{Introduction} +Amazing, introductory ideas that provide unique insight into your field of interest and ``wows" your professor. - \usepackage[emptymargins]{turabian-formatting} +\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} - \setmainfont{Times New Roman} +\section{Another Insightful Section} +More ideas that really make this a great paper. Maybe a footnote or two.\footnote{Some peripheral thoughts.} - \usepackage{biblatex-chicago} - \addbibresource{my_bibliography.bib} +\section{Conclusions} +At this point, you've changed everything (including your marks!). Time to wrap up! - \title{An Interesting Work} - \author{Author's Name} - \date{\today} +\clearpage +\printbibliography[title=Bibliography] - \begin{document} - \maketitle - ... - \printbibliography - \end{document} +\end{document} \end{lstlisting} + \end{document}
\ No newline at end of file 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 786475d0935..4721c0e9db4 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty @@ -1,6 +1,7 @@ % 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 the Chicago Manual of Style (16th edition) and Kate Turabian's A +% Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== % Copyright 2013 Omar Abdool @@ -17,49 +18,38 @@ % LPPL Maintenance Status: maintained (by Omar Abdool) % % This work consists of the files: turabian-formatting.sty, -% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). +% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, +% and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== % -% Documented errors from required packages (ignore): -% - LaTeX warning: "xparse/redefine-command" -% Redefining document command \oldstylenums with arg. spec. 'm' on line 128. -% -% Implementation notes: -% - package must be loaded before biblatex-chicago to work properly; -% - known bug: use of geometry showframe option and plain page style with emptymargins option -% % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{turabian-formatting}[2014/12/27 Turabian Formatting] +\ProvidesPackage{turabian-formatting}[2015/11/14 Turabian Formatting] % Flags adjusted with package options -\newif\if@draftwork\@draftworkfalse - \newif\if@optraggedright\@optraggedrightfalse \newif\if@optemptymargins\@optemptymarginsfalse -\newif\if@maketitlepage\@maketitlepagetrue +\newif\if@appendbibformat\@appendbibformattrue -\newif\if@appendrefformat\@appendrefformattrue +\newif\if@endnotesformat\@endnotesformatfalse % Options for package -\DeclareOption{draft}{\@draftworktrue} - \DeclareOption{raggedright}{\@optraggedrighttrue} \DeclareOption{emptymargins}{\@optemptymarginstrue} -\DeclareOption{notitlepage}{\@maketitlepagefalse} +\DeclareOption{endnotes}{\@endnotesformattrue} -\DeclareOption{noadjustbib}{\@appendrefformatfalse} +\DeclareOption{noadjustbib}{\@appendbibformatfalse} \ProcessOptions\relax @@ -100,42 +90,38 @@ \urlstyle{same} -% Footnote layout and formatting +% Notes layout and formatting + +\if@endnotesformat + \PassOptionsToPackage{perpage}{footmisc} +\fi -\RequirePackage[bottom,marginal]{footmisc} +\RequirePackage[bottom, marginal]{footmisc} \setlength{\skip\footins}{12pt} -\setlength{\footnotesep}{1\baselineskip} +\setlength{\footnotesep}{0.833\baselineskip} \renewcommand{\footnoterule}{% \vspace*{-3pt} \hrule width 2in height 0.4pt - \vspace*{-10.4pt} -} + \vspace*{-10.4pt}} -% Footnote marker indent +% Footnote marker formatting: adjust \parindent and raggedright option \setlength{\footnotemargin}{0.5in} -% footnotemark -\newcommand{\@turabianfnmarkformat}{% - \renewcommand{\@makefntext}[1]{% - \if@optraggedright - \raggedright% - \fi - \setlength{\parindent}{\footnotemargin}% - \@thefnmark.\,\,##1% - } -} - -% keep footnote lines together -\interfootnotelinepenalty=10000 +\renewcommand{\@makefntext}[1]{% + \if@optraggedright + \raggedright% + \fi + \setlength{\parindent}{\footnotemargin}% + \@thefnmark.\,\,#1} % Header and footer style layouts \RequirePackage{fancyhdr} -% Page identifier (author name, title, etc.) +% Other identifier accompanying page number (deprecated formatting command) \newcommand{\pageidentifier}{} \newlength{\@pageidentifierspace} @@ -144,94 +130,105 @@ \newcommand{\setpageidentifier}[2][3ex]{% \setlength{\@pageidentifierspace}{#1} \renewcommand{\pageidentifier}{% - #2\hspace*{\@pageidentifierspace}} -} -\setpageidentifier{} + #2\hspace*{\@pageidentifierspace}}} -% draft option: draft indicator text -\newcommand{\draftindicator}{} +\setpageidentifier{} -\newcommand{\setdraftindicator}[1]{% - \if@draftwork - \renewcommand{\draftindicator}{#1} - \fi -} -\setdraftindicator{Draft (\today)} +% Draft indicator text (deprecated command not functional) +\newcommand{\setdraftindicator}[1]{} % fancyhdr: page styles \fancyhf{} -\fancyhead[R]{\normalfont\singlespace \pageidentifier\thepage} -\fancyhead[L]{\normalfont\singlespace \small\draftindicator} + \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} \fancypagestyle{plain}{% \fancyhf{} \fancyfoot[C]{\normalfont\singlespace \thepage} - \fancyfoot[R]{\normalfont\singlespace \small\draftindicator} \if@optemptymargins \setlength{\headheight}{0pt} \setlength{\headsep}{0pt} - \fi -} + \fi} + \renewcommand{\plainheadrulewidth}{0pt} \renewcommand{\plainfootrulewidth}{0pt} \fancypagestyle{headings}{% \fancyhf{} - \fancyhead[R]{\normalfont\singlespace \pageidentifier\thepage} - \fancyhead[L]{\normalfont\singlespace \small\draftindicator} -} + \fancyhead[R]{\normalfont\singlespace \pageidentifier\thepage}} % fancy page style: allow customization of geometry first \AtEndPreamble{% - \pagestyle{fancy} -} + \pagestyle{headings}} % Thesis-related front and main matter formatting \newlength{\@bindingoffsetfm} \setlength{\@bindingoffsetfm}{0in} +\newlength{\@lmarginfm} +\newlength{\@rmarginfm} +\newlength{\@tmarginfm} +\newlength{\@bmarginfm} + +% \frontmatter and \tableofcontents preserves geometry specified in preamble +\AtEndPreamble{% + \setlength{\@bindingoffsetfm}{\Gm@bindingoffset} + \setlength{\@lmarginfm}{\Gm@lmargin} + \setlength{\@rmarginfm}{\Gm@rmargin} + \setlength{\@tmarginfm}{\Gm@tmargin} + \setlength{\@bmarginfm}{\Gm@bmargin}} + \appto{\frontmatter}{% \singlespacing - \newgeometry{margin=1in, bindingoffset=\@bindingoffsetfm, ignoreall, noheadfoot} - \pagestyle{empty} -} + \newgeometry{left=\@lmarginfm, right=\@rmarginfm, top=\@tmarginfm, bottom=\@bmarginfm, bindingoffset=\@bindingoffsetfm, ignoreall, noheadfoot} + \pagestyle{empty}} + \if@optemptymargins \preto{\tableofcontents}{% \renewcommand{\contentsname}{Table of Contents} - \newgeometry{margin=1in, bindingoffset=\@bindingoffsetfm, ignoreall, nohead, includefoot, bottom=1in+\headheight} - \pagestyle{plain} - } + \newgeometry{left=\@lmarginfm, right=\@rmarginfm, top=\@tmarginfm, bottom=\@bmarginfm, bindingoffset=\@bindingoffsetfm, ignoreall, nohead, includefoot, bottom=1in+\headheight} + \pagestyle{plain}} \else \preto{\tableofcontents}{% \renewcommand{\contentsname}{Table of Contents} \restoregeometry - \pagestyle{plain} - } + \pagestyle{plain}} \fi + \appto{\mainmatter}{% \doublespacing \restoregeometry - \pagestyle{headings} -} + \pagestyle{headings}} -% Title section formatting (including chapter) +% Test if \chapter is defined by document class +% Note: Important to test before titlesec defines \chapter -\PassOptionsToPackage{compact}{titlesec} +\newif\if@nochapter\@nochaptertrue + +\ifcsdef{chapter}% + {\@nochapterfalse}% + {} -\RequirePackage{titlesec} + +% Title section formatting (including chapter) + +\RequirePackage[compact]{titlesec} \titleformat{\chapter}[display]% {\normalfont\bfseries\normalsize\singlespacing\centering}% {Chapter \thechapter}% - {1\baselineskip}% + {0.833\baselineskip}% {} \titlespacing*{\chapter}% {0em}% {-1.2\baselineskip}% - {1\baselineskip} + {0.833\baselineskip} +\titlespacing*{name=\chapter,numberless}% + {0em}% + {-1.2\baselineskip}% + {0.833\baselineskip} \titleformat{\section}[block]% {\normalfont\bfseries\normalsize\singlespacing\centering}% @@ -242,9 +239,16 @@ {0em}% {0.5\baselineskip}% {0pt} +% Two lines separating \section* heading from text if \chapter not defined +\if@nochapter + \titlespacing*{name=\section,numberless}% + {0em}% + {0.5\baselineskip}% + {0.833\baselineskip} +\fi \titleformat{\subsection}[block]% - {\normalfont\mdseries\itshape\normalsize\singlespacing\centering}% + {\normalfont\mdseries\normalsize\singlespacing\centering}% {}% {0pt}% {} @@ -254,7 +258,7 @@ {0pt} \titleformat{\subsubsection}[block]% - {\normalfont\mdseries\normalsize\singlespacing\raggedright}% + {\normalfont\bfseries\normalsize\singlespacing\raggedright}% {}% {0pt}% {} @@ -266,8 +270,6 @@ % Title Page: optional text -\newcommand{\mytitlepage}{} - \newcommand{\subtitle}[1]{\def\@subtitle{#1}} \subtitle{} @@ -277,57 +279,76 @@ \newcommand{\institution}[1]{\def\@institution{#1}} \institution{} +% Custom title page command (deprecated command not functional) +\newcommand{\mytitlepage}{} + +% Word-count text on title page (deprecated command) \newcommand{\setwordcount}[1]{\def\@wordcount{#1}} \setwordcount{} - -% Title Page default: reformat \maketitle (Research Paper) - \newcommand{\@makewordcount}{% \ifthenelse{\equal{\@wordcount}{}}% {} - {\hspace*{\fill}\@wordcount} -} + {\hspace*{\fill}\@wordcount}} -\if@maketitlepage - \renewcommand{\thanks}[1]{\def\@thanks{#1}} - \thanks{} +% Renew \maketitle command if “titlepage” option (based on Research Paper title page). - \renewcommand{\mytitlepage}{% - \vspace*{-1.2\baselineskip} - \vspace*{0.333\paperheight} - \vspace*{-1in} - \ifthenelse{\equal{\@subtitle}{}}% - {% - {\bfseries\@title}\par% - }% - {% - {\bfseries\@title :}\par - \vspace*{0.833\baselineskip} - {\bfseries\@subtitle}\par% - } - \vspace*{\stretch{1}} - \parskip=0.833\baselineskip - \@author\par - \@thanks\par - \@course\par - \@institution\par - \@date\par - \parskip=0pt - \vspace*{\stretch{1}} - \@makewordcount% - } +\if@titlepage \renewcommand{\maketitle}{% - \clearpage - \newgeometry{margin=1in, ignoreall, noheadfoot} - \thispagestyle{empty} - {\normalfont\normalsize\centering\singlespacing - \mytitlepage} - \clearpage - \restoregeometry - \setcounter{page}{1} - } + \begin{titlepage}% + \newgeometry{margin=1in, ignoreall, noheadfoot} + \let\footnotesize\small + \let\footnoterule\relax + \let\footnote\thanks + \normalfont\normalsize\centering\singlespacing + \vspace*{-1.2\baselineskip} + \vspace*{0.333\paperheight} + \vspace*{-1in} + \ifthenelse{\equal{\@subtitle}{}}% + {% + {\bfseries\@title}\par% + }% + {% + {\bfseries\@title :}\par + \vspace*{0.833\baselineskip} + {\bfseries\@subtitle}\par% + } + \vspace*{\stretch{1}} + \parskip=0.833\baselineskip + \@author\par + \@course\par + \@institution\par + \@date\par + \parskip=0pt + \vspace*{\stretch{1} + \@makewordcount} + \end{titlepage}% + + \setcounter{footnote}{0}% + + \global\let\thanks\relax + \global\let\maketitle\relax + + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@course\@empty + \global\let\@institution\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\@subtitle\@empty + \global\let\@wordcount\@empty + + \global\let\title\relax + \global\let\subtitle\relax + \global\let\author\relax + \global\let\date\relax + \global\let\course\relax + \global\let\institution\relax + \global\let\and\relax + \global\let\setwordcount\relax + + \restoregeometry} \fi @@ -337,7 +358,7 @@ \renewcommand*{\quotingfont}{\singlespace} \quotingsetup{% - vskip=0pt, + vskip=0\baselineskip, leftmargin=0.5in, rightmargin=0.5in} @@ -354,17 +375,18 @@ \renewcommand\fps@table{!htp} \renewcommand\fps@figure{!htp} -\setlength{\textfloatsep}{1\baselineskip} -\setlength{\intextsep}{0.5\baselineskip} +\setlength{\textfloatsep}{1\baselineskip plus0.5\baselineskip minus0.5\baselineskip} +\setlength{\intextsep}{1\baselineskip plus0.5\baselineskip minus0.5\baselineskip} \RequirePackage{flafter} -% Tables and Figures: caption formatting - \setlength{\abovecaptionskip}{0pt} \setlength{\belowcaptionskip}{0pt} + +% Tables and Figures: caption formatting + \RequirePackage{caption} \captionsetup{% @@ -375,92 +397,117 @@ labelsep=period, skip=0.167\baselineskip} -\captionsetup[table]{% - position=top} - -\captionsetup[figure]{% - position=bottom} - - -% Tables: source and note formatting commands - -\newcommand{\tablesource}[1]{\vspace{1\baselineskip}#1\par} - -\newcommand{\tablenote}[1]{\vspace{1\baselineskip}#1\par} - - -% endnotes: formatting support -% Note: Error when cite keys contain “_” - -\newcommand{\@turabianendnoteformat}{% - \@ifpackageloaded{endnotes}% - {% - \renewcommand{\enoteformat}{% - \if@optraggedright - \raggedright% - \fi - \setlength{\parindent}{\footnotemargin} - \vspace*{1\baselineskip} - \theenmark.\,\,% - } - \preto{\theendnotes}{% - \clearpage - \begingroup - \singlespacing - \def\enotesize{\normalsize} - \setlength{\parskip}{0pt} - } - \appto{\theendnotes}{% - \endgroup - } - }% - {} -} +\if@optraggedright + \captionsetup{justification=raggedright} +\fi + +\captionsetup[table]{position=top} + +\captionsetup[figure]{position=bottom} + + +% Tables: table footnote formatting command + +\newcommand{\tablenote}[1]{% + \if@optraggedright + \raggedright% + \fi + \vspace{1\baselineskip} + #1\par} + +% Table footnote source line (deprecated command made same as \tablenote) +\newcommand{\tablesource}{\tablenote} + +% endnotes package support: formatting +% Note: endnotes package causes error when cite keys contain “_”. -% biblatex-chicago: references formatting +\if@endnotesformat -\PassOptionsToPackage{% - notes, isbn=false, autolang=other, backend=biber}{biblatex-chicago} + \RequirePackage{endnotes, chngcntr, xparse} -\newcommand{\@turabianbibformat}{% - \@ifpackageloaded{biblatex-chicago}% - {% - \@ifclassloaded{article}% + % Changes footnote marker type and formatting + \setfnsymbol{chicago} + \renewcommand*{\thefootnote}{\fnsymbol{footnote}} + \renewcommand{\@makefntext}[1]{% + \if@optraggedright + \raggedright% + \fi + \setlength{\parindent}{\footnotemargin}% + \@thefnmark\,\,#1} + + \PassOptionsToPackage{notetype=endonly}{biblatex-chicago} + + % Endnotes layout and formatting + \if@nochapter + \renewcommand{\enoteheading}{% + \section*{\notesname}% + \@mkboth{\notesname}{\notesname}% + \mbox{}\par% + \vspace*{-1.833\baselineskip}% + \let\@afterindentfalse\@afterindenttrue + \singlespacing}% + \else + \let\latexchapter\chapter + + \counterwithin*{endnote}{chapter} + \renewcommand{\enoteheading}{% + \latexchapter*{\notesname}% + \@mkboth{\notesname}{\notesname}% + \mbox{}\par% + \vspace*{-1.833\baselineskip}% + \let\@afterindentfalse\@afterindenttrue + \singlespacing}% + + % Insert chapter subheadings in \theendnotes + \RenewDocumentCommand{\chapter}{som}{% + \IfBooleanTF{#1}% {% - \defbibheading{bibliography}[\bibname]{% - \clearpage - \section*{##1} - \singlespacing} - - \defbibheading{subbibliography}[\bibname]{% - \subsection*{##1} - \singlespacing} + \latexchapter*{#3}% + \setcounter{endnote}{0}% + \addtoendnotes{% + \noexpand\enotedivision{\noexpand\section*}% + {\unexpanded{#3}}}% }% {% - \defbibheading{bibliography}[\bibname]{% - \chapter{##1} - \singlespacing} - - \defbibheading{subbibliography}[\bibname]{% - \section{##1} - \singlespacing} - } - \renewcommand{\bibitemsep}{1\baselineskip} - \renewcommand{\bibhang}{0.5in} - }% - {} -} + \IfNoValueTF{#2}% + {\latexchapter{#3}}% + {\latexchapter[#2]{#3}}% + \addtoendnotes{% + \noexpand\enotedivision% + {\noexpand\section*}% + {\chaptername\ \thechapter}}% + }} + \def\enotedivision#1#2{\@ifnextchar\enotedivision{}{#1{#2}}} + \fi + \renewcommand{\enotesize}{\normalsize} + \renewcommand{\enoteformat}{% + \if@optraggedright + \raggedright% + \fi + \setlength{\parindent}{\footnotemargin} + \vspace*{1\baselineskip} + \theenmark.\,\,} +\fi -% Append references reformatting at end of preamble (noappends option) -\AtEndPreamble{% - \if@appendrefformat - \@turabianfnmarkformat - \@turabianbibformat - \@turabianendnoteformat - \fi -} +% biblatex-chicago: citation formatting defaults + +\PassOptionsToPackage% + {isbn=false, autolang=other, footmarkoff, backend=biber}% + {biblatex-chicago} + +\if@appendbibformat + \AtEndPreamble{% + \@ifpackageloaded{biblatex}% + {% + \AtBeginBibliography{\vspace*{-0.333\baselineskip}} + \renewcommand{\bibsetup}{\singlespacing} + \renewcommand{\bibitemsep}{1\baselineskip} + \renewcommand{\bibhang}{0.5in} + }% + {}} +\fi 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 eb54ecea50d..03e71de5223 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls @@ -1,6 +1,7 @@ -% Turabian Formatting for LaTeX -- Research Papers +% 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 the Chicago Manual of Style (16th edition) and Kate Turabian's A +% Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== % Copyright 2013 Omar Abdool @@ -17,7 +18,8 @@ % LPPL Maintenance Status: maintained (by Omar Abdool) % % This work consists of the files: turabian-formatting.sty, -% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). +% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, +% and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== % @@ -25,51 +27,52 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-researchpaper}[2014/12/27 Turabian Research Paper] +\ProvidesClass{turabian-researchpaper}[2015/11/14 Turabian Research Paper] -% Flags adjusted with class options - -\newif\if@endnotesonly\@endnotesonlyfalse +% Default point size +\def\@@ptsize{12pt} % Options for document class, some passed to article class -\DeclareOption{draft}{% - \PassOptionsToPackage{\CurrentOption}{turabian-formatting} - \PassOptionsToClass{\CurrentOption}{article}} - \DeclareOption{raggedright}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} \DeclareOption{emptymargins}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} -\DeclareOption{endnotesonly}{\@endnotesonlytrue} +\DeclareOption{endnotes}{% + \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} + +% Option for Endnotes (deprecated option not functional) +\DeclareOption{endnotesonly}{% + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider the 'endnotes' option instead.} + \OptionNotUsed} + +\DeclareOption{twocolumn}{% + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.} + \OptionNotUsed} -\DeclareOption{twocolumn}{\OptionNotUsed} +\DeclareOption{notitlepage}{% + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.} + \OptionNotUsed} -\DeclareOption{notitlepage}{\OptionNotUsed} +\DeclareOption{10pt}{\def\@@ptsize{10pt}} + +\DeclareOption{11pt}{\def\@@ptsize{11pt}} + +\DeclareOption{12pt}{\def\@@ptsize{12pt}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \ProcessOptions\relax -\LoadClass[titlepage]{article} +\LoadClass[titlepage,oneside,onecolumn,\@@ptsize]{article} -\RequirePackage{turabian-formatting} -\if@endnotesonly - \PassOptionsToPackage{notetype=endonly}{biblatex-chicago} - \RequirePackage{endnotes} -\fi - -\AtEndPreamble{% - \if@endnotesonly - \let\footnote=\endnote - \fi -} +\RequirePackage{turabian-formatting} 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 e60759532c1..ae4bbeb6775 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls @@ -1,6 +1,7 @@ -% Turabian Formatting for LaTeX -- Theses and Dissertations +% 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 the Chicago Manual of Style (16th edition) and Kate Turabian's A +% Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== % Copyright 2013 Omar Abdool @@ -17,7 +18,8 @@ % LPPL Maintenance Status: maintained (by Omar Abdool) % % This work consists of the files: turabian-formatting.sty, -% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). +% turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, +% and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== % @@ -25,15 +27,14 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-thesis}[2014/12/27 Turabian Theses and Dissertations] +\ProvidesClass{turabian-thesis}[2015/11/14 Turabian Theses and Dissertations] +% Default point size +\def\@@ptsize{12pt} -% Options for document class, some passed to book class -\DeclareOption{draft}{% - \PassOptionsToPackage{\CurrentOption}{turabian-formatting} - \PassOptionsToClass{\CurrentOption}{book}} +% Options for document class, some passed to book class \DeclareOption{raggedright}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} @@ -41,27 +42,42 @@ \DeclareOption{emptymargins}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} -\DeclareOption{twocolumn}{\OptionNotUsed} +\DeclareOption{endnotes}{% + \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} + +\DeclareOption{twocolumn}{% + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.} + \OptionNotUsed} + +\DeclareOption{notitlepage}{% + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.} + \OptionNotUsed} -\DeclareOption{notitlepage}{\OptionNotUsed} +\DeclareOption{10pt}{\def\@@ptsize{10pt}} + +\DeclareOption{11pt}{\def\@@ptsize{11pt}} + +\DeclareOption{12pt}{\def\@@ptsize{12pt}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} \ProcessOptions\relax -\LoadClass[titlepage,oneside]{book} - +\LoadClass[titlepage,oneside,onecolumn,\@@ptsize]{book} \RequirePackage{geometry} - \RequirePackage{turabian-formatting} + +% Margin adjustment by increasing the binding off-set + \geometry{bindingoffset=0.5in} -\setlength{\@bindingoffsetfm}{0.5in} - + + +% Renew \maketitle command Thesis/Dissertation title page. \institution{[Institution]} @@ -77,42 +93,78 @@ \newcommand{\location}[1]{\def\@location{#1}} \location{[City], [State/Province]} - \renewcommand{\maketitle}{% - \normalfont\normalsize - \begin{center} - \vspace*{-1.2\baselineskip} - \parskip=0.833\baselineskip - \@institution\par - \vspace*{\stretch{1}} - \ifthenelse{\equal{\@subtitle}{}}% - {% - {\bfseries\@title}\par% - }% - {% - {\bfseries\@title :}\par - {\bfseries\@subtitle}\par% - } - \vspace*{\stretch{1}} - A Dissertation Submitted to\par - \@faculty\par - in Candidacy for the Degree of\par - \@mydegree\par - \vspace*{1\baselineskip} - \@department\par - \vspace*{\stretch{1}} - by\par - {\bfseries\@author}\par - \vspace*{\stretch{1}} - \@location\par - \@date - \parskip=0pt - \end{center} - \clearpage + \begin{titlepage}% + \let\footnotesize\small + \let\footnoterule\relax + \renewcommand{\thanks}[1]{\def\@thanks{##1}} + \thanks{} + \normalfont\normalsize + \begin{center} + \vspace*{-1.2\baselineskip} + \parskip=0.833\baselineskip + \@institution\par + \vspace*{\stretch{1}} + \ifthenelse{\equal{\@subtitle}{}}% + {% + {\bfseries\@title}\par% + }% + {% + {\bfseries\@title :}\par + {\bfseries\@subtitle}\par% + } + \vspace*{\stretch{1}} + A Dissertation Submitted to\par + \@faculty\par + in Candidacy for the Degree of\par + \@mydegree\par + \vspace*{1\baselineskip} + \@department\par + \vspace*{\stretch{1}} + by\par + {\bfseries\@author}\par + \vspace*{\stretch{1}} + \@location\par + \@date + \parskip=0pt + \end{center}% + \end{titlepage}% + + % Copyright page + \setcounter{page}{2} \singlespacing \vspace*{\stretch{1}} \noindent Copyright \copyright\ \the\year\ by \@author \\*\noindent All rights reserved - \newpage + \clearpage + + \setcounter{footnote}{0} + + \global\let\thanks\relax + \global\let\maketitle\relax + + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@course\@empty + \global\let\@institution\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\@subtitle\@empty + \global\let\@location\@empty + \global\let\@mydegree\@empty + \global\let\@department\@empty + \global\let\@faculty\@empty + + \global\let\title\relax + \global\let\subtitle\relax + \global\let\author\relax + \global\let\date\relax + \global\let\course\relax + \global\let\institution\relax + \global\let\location\relax + \global\let\mydegree\relax + \global\let\department\relax + \global\let\faculty\relax + \global\let\and\relax } |