diff options
author | Karl Berry <karl@freefriends.org> | 2016-03-15 21:23:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-03-15 21:23:17 +0000 |
commit | 0a991401296aa91b41e4419c60e41af18dea5836 (patch) | |
tree | 5b021f78903f4beaf48bd682d7e505f4c49c94c4 /Master/texmf-dist | |
parent | b5a1533d93bc4d590a53858d3a4fc3b3cd90945c (diff) |
turabian-formatting (15mar16)
git-svn-id: svn://tug.org/texlive/trunk@40033 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
6 files changed, 158 insertions, 42 deletions
diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README index b8862f45161..67285d6dbed 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 (2016/02/27) +Turabian Formatting for LaTeX (2016/03/15) INTRODUCTION @@ -37,7 +37,7 @@ manual, turabian-formatting-doc.pdf, included in this package. ============================== -Copyright 2013 Omar Abdool +Copyright 2013-2016 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 Binary files differindex efbfbc6aa7f..87b5105f564 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 c63c116e1bc..4b16b5806c3 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 Omar Abdool +% Copyright 2013-2016 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: 2016/02/27 +% Last updated: 2016/03/15 % % @@ -77,10 +77,11 @@ breakatwhitespace=true, breakindent=0pt} -\newcommand{\versionDateText}{2016/02/27} +\newcommand{\versionDateText}{2016/03/15} \title{Turabian Formatting for \LaTeX{}} -\author{Omar Abdool \hspace{3ex} \href{mailto:turabian.formatting@gmail.com}{turabian.formatting@gmail.com}} +\author{Omar Abdool \\ +{\normalsize \href{mailto:turabian.formatting@gmail.com}{turabian.formatting@gmail.com}}} \date{\today} @@ -89,7 +90,7 @@ \maketitle -\renewcommand{\abstractname}{\vspace{-1\baselineskip}} +\renewcommand{\abstractname}{} \begin{abstract} \noindent 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). @@ -119,7 +120,7 @@ For citations, this package is designed to work well with David Fussner's outsta -\section{Using the Package and Document Classes} +\section{Using the Document Classes and Package} \label{sec:implementation} A document may be formatted using \texttt{turabian-formatting} in one of three ways: either (1) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), (2) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}), or (3) loading the package in the \LaTeX{} source-file preamble. @@ -175,13 +176,14 @@ The \texttt{turabian-thesis} document class has an additional binding offset of \subsection{Standard Options for Document Classes} -Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support most of the standard document class options.\footnote{% - The \texttt{twocolumn} option is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option either.} +Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support most of the standard document class options. 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}. 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}. +The \texttt{twocolumn} option, however, is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option either. + Both documents classes, by default, are set to \texttt{oneside}. @@ -191,36 +193,41 @@ Both documents classes, by default, are set to \texttt{oneside}. 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{Adjusting Bibliography Formatting} +\subsection{Notes-Bibliography and Author-Date Styles} -For citations, this package is designed to work well with the \texttt{biblatex-chicago} package.\footnote{% - If loaded before the \texttt{biblatex-chicago} package, \texttt{turabian-formatting} will pass the following options to \texttt{biblatex-chicago}: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}.} -This includes support for both the Notes-Bibliography and Author-Date styles (the former being the default style). +This package is designed to work well with the \texttt{biblatex-chicago} package. This includes support for both notes-bibliography and author-date citation styles (the former being the default style). -\marginnote{noadjustbib}% -Formatting support that adjusts the Bibliography generated by \texttt{biblatex-chicago} can be disabled using the \texttt{noadjustbib} formatting option. The following code, loaded at the end of the preamble, is affected by this option: +If the \texttt{biblatex-chicago} package is loaded by the user, the following options are passed to \texttt{biblatex-chicago}: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}. The \texttt{\textbackslash printbibliography} command will provide a bibliography with \emph{Bibliography} as the default heading, irrespective of the document class. +\marginnote{authordate}% +Support for the author-date style is enabled by specifying the \texttt{authordate} formatting option. This option passes an \texttt{authordate} option to \texttt{biblatex-chicago} as well as redefines the default heading for the references list (also typeset using the \texttt{\textbackslash printbibliography} command) to that of \emph{References}. + +\marginnote{noadjustbib}% +Adjustments made to \texttt{\textbackslash printbibliography} can be disabled using the \texttt{noadjustbib} formatting option. The following code, loaded at the end of the preamble, is affected by this option: \begin{lstlisting} + \if@authordateformat + \DefineBibliographyStrings{english}{% + bibliography = {References}} + \else + \DefineBibliographyStrings{english}{% + references = {Bibliography}} + \fi \renewcommand{\bibsetup}{\singlespacing} \renewcommand{\bibitemsep}{1\baselineskip} \renewcommand{\bibhang}{0.5in} \end{lstlisting} -\subsection{Support for Endnotes} +\subsection{Endnotes} -Although citations use footnotes by default, endnotes can be used instead 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{\_}".} +Although footnotes are used by default, endnotes can also be enabled. This is accomplished through the use of the \texttt{endnotes} package. \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 section*} or, if \texttt{\textbackslash chapter} has been defined by the document class, \texttt{\textbackslash chapter*}.} -Numbering of endnotes is also restarted for each chapter with subheadings dividing the list by each chapter \autocite[157]{turabian_manual_2013}. - -If loaded before the \texttt{biblatex-chicago} package, \texttt{turabian-formatting} will also pass the \texttt{notetype=endonly} option to \texttt{biblatex-chicago}. - -To place the list of endnotes, use the \texttt{\textbackslash theendnotes} command provided by the \texttt{endnotes} package. +Endnotes can be used by specifying the \texttt{endnotes} formatting option. Through this option, the \texttt{endnotes} package is loaded. More so, the \texttt{endnotes} option causes footnotes to be restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ \autocite[156]{turabian_manual_2013}. The \texttt{notetype=endonly} option is also passed to the \texttt{biblatex-chicago} package. +To produce a list of endnotes, use the \texttt{\textbackslash 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 is typeset using either \texttt{\textbackslash section*} or, if \texttt{\textbackslash chapter} has been defined by the document class, \texttt{\textbackslash chapter*}. If there are no endnotes preceding \texttt{\textbackslash theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.} +If the document class supports chapters, the numbering of endnotes is also restarted for each chapter. The endnotes list will then have subheadings that divide endnotes by each chapter \autocite[157]{turabian_manual_2013}. \section{Formatting Commands} @@ -236,7 +243,6 @@ The \texttt{turabian-formatting} package provides support for document classes t \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}. -\clearpage \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. Using the \texttt{endnotes} option will place the \emph{Notes} heading in the table of contents.} @@ -278,6 +284,7 @@ A thesis/dissertation is divided into three, distinct components: (1) front matt \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}. +\clearpage \marginnote{\texttt{\textbackslash tableofcontents}} 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}). @@ -331,6 +338,14 @@ The following packages are highly recommended: \texttt{biblatex-chicago}, \textt \marginnote{\rmfamily{\versionDateText}}% +An \texttt{authordate} option has been added, improving support for the author-date citation style. + +Adjustments to the formatting of both enumerated and itemized lists. + +The \texttt{endnotes} option has (1) added support for endnotes that contain an underscore character (\texttt{\_}), and (2) improved the implementation of the \texttt{\textbackslash theendnotes} command. + +\marginnote{\rmfamily{2016/02/27}}% + This update is a significant rewrite of \texttt{turabian-formatting}. It is designed to be faster and require fewer packages. Both \texttt{turabian-researchpaper} and \texttt{turabian-thesis} can use the \texttt{noadjustbib} option. @@ -351,7 +366,7 @@ Removed commands: \texttt{\textbackslash setpageidentifier}, and \texttt{\textba 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}. -Improved support for the \texttt{biblatex-chicago} package, including added support for the Author-Date citation style. +Improved support for the \texttt{biblatex-chicago} package, including added support for the author-date citation style. Footnote lines are no longer forced together, allowing a footnote to run over to the next page. @@ -377,10 +392,9 @@ Adjustments to formatting that more-accurately reflect the 8th edition of Turabi -\section{Known Bugs} -\label{sec:bugs} +%\section{Known Bugs} +%\label{sec:bugs} -The \texttt{endnotes} option generates an error if a cite key contains an underscore character (\texttt{\_}) when used with the \texttt{biblatex-chicago} package. \printbibliography @@ -428,7 +442,7 @@ More ideas that really make this a great paper. Maybe a footnote or two.\footnot At this point, you've changed everything (including your marks!). Time to wrap up! \clearpage -\printbibliography[title=Bibliography] +\printbibliography \end{document} \end{lstlisting} 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 36636109f96..734f70f34d8 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty @@ -4,7 +4,7 @@ % Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== -% Copyright 2013 Omar Abdool +% Copyright 2013-2016 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,13 +27,15 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{turabian-formatting}[2016/02/27 Turabian Formatting] +\ProvidesPackage{turabian-formatting}[2016/03/15 Turabian Formatting] % Flags adjusted with package options \newif\if@optraggedright\@optraggedrightfalse +\newif\if@authordateformat\@authordateformatfalse + \newif\if@appendbibformat\@appendbibformattrue \newif\if@endnotesformat\@endnotesformatfalse @@ -43,6 +45,8 @@ \DeclareOption{raggedright}{\@optraggedrighttrue} +\DeclareOption{authordate}{\@authordateformattrue} + \DeclareOption{noadjustbib}{\@appendbibformatfalse} \DeclareOption{endnotes}{\@endnotesformattrue} @@ -421,6 +425,62 @@ \def\quote{\quotation} +% Lists: enumerate and itemize + +\setlength\leftmargini{1.5\parindent} +\setlength\leftmargin{\leftmargini} +\setlength\leftmarginii{\parindent} +\setlength\leftmarginiii{\parindent} +\setlength\leftmarginiv{\parindent} +\setlength\labelsep{.65em} +\setlength\labelwidth{\parindent} +\addtolength\labelwidth{-\labelsep} + +% Formatting command for both enumerate and itemize +\def\tf@listformat{% + \setlength\topsep{\z@} + \setlength\itemsep{\z@} + \setlength\parsep{\z@} + \setlength\listparindent{\parindent}} + +% Format of enumerate list labels +\renewcommand{\labelenumi}{\arabic{enumi}.} +\renewcommand{\labelenumii}{\alph{enumii})} +\renewcommand{\labelenumiii}{(\arabic{enumiii})} +\renewcommand{\labelenumiv}{(\alph{enumiv})} + +% Redefine enumerate to include formatting command hook +\def\tf@enumerateformat{\tf@listformat} +\def\enumerate{% + \ifnum + \@enumdepth >\thr@@\@toodeep + \else + \advance\@enumdepth\@ne + \edef\@enumctr{enum\romannumeral\the\@enumdepth}% + \expandafter + \list + \csname label\@enumctr\endcsname + {\usecounter\@enumctr% + \def\makelabel##1{\hss\llap{##1}}% + \tf@enumerateformat}% + \fi} + +% Redefine itemize to include formatting command hook +\def\tf@itemizeformat{\tf@listformat} +\def\itemize{% + \ifnum + \@itemdepth >\thr@@\@toodeep + \else + \advance\@itemdepth\@ne + \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% + \expandafter + \list + \csname\@itemitem\endcsname + {\def\makelabel##1{\hss\llap{##1}}% + \tf@itemizeformat}% + \fi} + + % Tables and Figures: float positioning \setlength\textfloatsep{1\baselineskip plus 2pt} @@ -487,10 +547,22 @@ {isbn=false, autolang=other, footmarkoff, backend=biber}% {biblatex-chicago} +\if@authordateformat + \PassOptionsToPackage{authordate}{biblatex-chicago} +\fi + +% Adjustments to \printbibliography formatting \if@appendbibformat \AtEndPreamble{% \@ifpackageloaded{biblatex}% {% + \if@authordateformat + \DefineBibliographyStrings{english}{% + bibliography = {References}} + \else + \DefineBibliographyStrings{english}{% + references = {Bibliography}} + \fi \renewcommand{\bibsetup}{\singlespacing} \renewcommand{\bibitemsep}{1\baselineskip} \renewcommand{\bibhang}{0.5in} @@ -500,7 +572,6 @@ % endnotes package support: formatting -% Note: endnotes package causes error when cite keys contain "_". \if@endnotesformat @@ -511,7 +582,7 @@ \renewcommand*{\thefootnote}{\fnsymbol{footnote}} \PassOptionsToPackage{notetype=endonly}{biblatex-chicago} - + % Endnotes layout and formatting (based on if chapter is defined) \ifcsdef{chapter}% {% If \chapter defined... @@ -561,6 +632,22 @@ \singlespacing}% }% + % Make endnotes use of "_" not a special character when in text mode + \appto{\enoteheading}{% + \catcode`_=12 + \begingroup\lccode`~=`_ + \lowercase{\endgroup\let~}\sb + \mathcode`_="8000} + + % Create \jobname.ent if not already defined to avoid missing file error + \preto{\theendnotes}{% + \IfFileExists{./\jobname.ent}% + {}% + {% + \immediate\openout\@enotes=\jobname.ent\relax + \immediate\write\@enotes{}% + }} + % Set default endnotes formatting \renewcommand{\enotesize}{\normalsize} \renewcommand{\enoteformat}{% @@ -571,6 +658,13 @@ \vspace{1\baselineskip} \theenmark.\,\,} +\else + + % Define \theendnotes if endnotes package not loaded + \@ifpackageloaded{endnotes}% + {}% + {\def\theendnotes{\@empty}} + \fi @@ -578,6 +672,8 @@ \if@optemptymargins + \PackageWarningNoLine{turabian-formatting}{The 'emptymargins' option has been deprecated} + % Adjust top margin height by 0.5in \addtolength\textheight{-0.5in} \addtolength\topmargin{0.5in} 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 8894de03c3e..23595a1d46e 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls @@ -4,7 +4,7 @@ % Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== -% Copyright 2013 Omar Abdool +% Copyright 2013-2016 Omar Abdool % % This work may be distributed and/or modified under the conditions of the LaTeX % Project Public License (LPPL), either version 1.3 of this license or (at your @@ -27,7 +27,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-researchpaper}[2016/02/27 Turabian Research Paper] +\ProvidesClass{turabian-researchpaper}[2016/03/15 Turabian Research Paper] % Default point size @@ -39,6 +39,9 @@ \DeclareOption{raggedright}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} +\DeclareOption{authordate}{% + \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} + \DeclareOption{noadjustbib}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} @@ -58,11 +61,11 @@ % Deprecated options \DeclareOption{emptymargins}{% - \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated.} + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated} \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} \DeclareOption{endnotesonly}{% - \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider using the 'endnotes' option instead.} + \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider using the 'endnotes' option instead} \OptionNotUsed} 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 04ec2bdb1b6..3415f64cc9a 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls @@ -4,7 +4,7 @@ % Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== -% Copyright 2013 Omar Abdool +% Copyright 2013-2016 Omar Abdool % % This work may be distributed and/or modified under the conditions of the LaTeX % Project Public License (LPPL), either version 1.3 of this license or (at your @@ -27,7 +27,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-thesis}[2016/02/27 Turabian Theses and Dissertations] +\ProvidesClass{turabian-thesis}[2016/03/15 Turabian Theses and Dissertations] % Default point size @@ -39,6 +39,9 @@ \DeclareOption{raggedright}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} +\DeclareOption{authordate}{% + \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} + \DeclareOption{noadjustbib}{% \PassOptionsToPackage{\CurrentOption}{turabian-formatting}} |