texlive[47796] Master/texmf-dist: turabian-formatting (22may18)
commits+karl at tug.org
commits+karl at tug.org
Tue May 22 23:06:02 CEST 2018
Revision: 47796
http://tug.org/svn/texlive?view=revision&revision=47796
Author: karl
Date: 2018-05-22 23:06:01 +0200 (Tue, 22 May 2018)
Log Message:
-----------
turabian-formatting (22may18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/turabian-formatting/README
trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf
trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex
trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
Modified: trunk/Master/texmf-dist/doc/latex/turabian-formatting/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/turabian-formatting/README 2018-05-22 21:04:12 UTC (rev 47795)
+++ trunk/Master/texmf-dist/doc/latex/turabian-formatting/README 2018-05-22 21:06:01 UTC (rev 47796)
@@ -1,4 +1,4 @@
-Turabian Formatting for LaTeX (2017/11/04)
+Turabian Formatting for LaTeX (2018/05/21)
INTRODUCTION
@@ -5,7 +5,7 @@
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
+Dissertations: Chicago Style for Students and Researchers," 9th
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
@@ -37,7 +37,7 @@
==============================
-Copyright 2013-2017 Omar Abdool
+Copyright 2013-2018 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
Modified: trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2018-05-22 21:04:12 UTC (rev 47795)
+++ trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2018-05-22 21:06:01 UTC (rev 47796)
@@ -1,7 +1,7 @@
% Turabian Formatting for LaTeX -- Package Documentation
%
% ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 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: 2017/11/04
+% Last updated: 2018/05/21
%
%
@@ -32,16 +32,17 @@
\usepackage{filecontents}
\begin{filecontents}{\jobname.bib}
- at book{turabian_manual_2013,
+ at book{turabian_manual_2018,
author = {Turabian, Kate L.},
- edition = {8th edition},
+ edition = {9th 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},
+ editor = {Booth, Wayne C. and Colomb, Gregory G. and Williams, Joseph M. and Bizup, Joseph and FitzGerald, William T. and {University of Chicago Press Staff}},
+ shorttitle = {A Manual for Writers},
publisher = {University of Chicago Press},
- year = {2013}}
+ year = {2018}}
\end{filecontents}
-\usepackage[authordate,backend=biber]{biblatex-chicago}
+\usepackage[noibid,backend=biber]{biblatex-chicago}
\addbibresource{\jobname.bib}
\usepackage{units, metalogo, setspace}
@@ -113,7 +114,7 @@
\begin{abstract}
\vspace{-\baselineskip}
-\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).
+\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} (9th edition).
\end{abstract}
@@ -133,7 +134,7 @@
\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 (e.g. 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}, 9th 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).
@@ -176,8 +177,8 @@
\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}.\footnote{%
- Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \texttt{setspace} package's \textcmd{setstretch} command.}
+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.\footnote{%
+ \autocite[385]{turabian_manual_2018}. Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \texttt{setspace} package's \textcmd{setstretch} command.}
Paragraph indentation is set to 0.5 inches.
Page margins, by default, are 1 inch from the edges of the paper.
@@ -189,7 +190,7 @@
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 sizes of \texttt{10pt} and \texttt{11pt}.
+The default \texttt{normal} font size is twelve-point type (\texttt{12pt})---the recommended font type size for the body of the text.\autocite[385]{turabian_manual_2018} This package also supports \texttt{normal} font 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, specified as \texttt{letterpaper}). Other paper size options can be specified instead, including \texttt{a4paper} and \texttt{legalpaper}.
@@ -202,15 +203,16 @@
\label{subsec:raggedright}
\marginnote{raggedright}%
-By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature" \autocite[404]{turabian_manual_2013}. For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option.\footnote{%
- Alternatively, placing the \textcmd{raggedright} command in the document preamble will have the same effect as using the \texttt{raggedright} option. The \textcmd{raggedright} command, however, does not pass a \texttt{raggedright} option to other loaded packages.}
+By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature."\autocite[416]{turabian_manual_2018} For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option.
+Alternatively, placing the \textcmd{raggedright} command in the document preamble will have the same effect as using the \texttt{raggedright} option. The \textcmd{raggedright} command, however, does not pass a \texttt{raggedright} option to other loaded packages.
+
\subsection{Notes-Bibliography and Author-Date Styles}
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).
-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 \textcmd{printbibliography} command will provide a bibliography with \emph{Bibliography} as the default heading, irrespective of the document class.
+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}, \texttt{noibid}, and \texttt{backend=biber}. The \textcmd{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 \textcmd{printbibliography} command) to that of \emph{References}.
@@ -223,12 +225,12 @@
\marginnote{endnotes}%
Although footnotes are used by default, endnotes can also be used by specifying the \texttt{endnotes} formatting option. Through this option, the \texttt{endnotes} package is loaded.
-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}. The \texttt{notetype=endonly} option is also passed to the \texttt{biblatex-chicago} package.
+With the \texttt{endnotes} option, footnotes are restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ .\autocite[161]{turabian_manual_2018} The \texttt{notetype=endonly} option is also passed to the \texttt{biblatex-chicago} package.
To produce a list of endnotes, use the \textcmd{theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes." The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{%
The \emph{Notes} heading, when using the \texttt{turabian-researchpaper} document class, is typeset with \textcmd{section*}. The \texttt{turabian-thesis} document class, however, typesets the \emph{Notes} heading with \textcmd{chapter*}. If there are no endnotes preceding \textcmd{theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.}
-When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter. In this case, the endnotes list then uses subheadings that divide endnotes by each chapter \autocite[157]{turabian_manual_2013}.
+When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter. In this case, the endnotes list then uses subheadings that divide endnotes by each chapter.\autocite[162]{turabian_manual_2018}
\clearpage
@@ -242,10 +244,10 @@
\marginnote{\textbackslash part\{\}}
A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be separated into parts using the \textcmd{part} command.
-The \textcmd{part} command creates a new part-title page. If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the page is labelled \emph{Part} and is ``followed by the part number [in capitalized roman numerals] at the top of the page." If a descriptive title is provided, it is separated from the label and number by a blank line. Although the part-title page is counted in pagination, no page number is placed on the page \autocite[390]{turabian_manual_2013}.
+The \textcmd{part} command creates a new part-title page. If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the page is labelled \emph{Part} and is ``followed by the part number [in capitalized roman numerals] at the top of the page." If a descriptive title is provided, it is separated from the label and number by a blank line. Although the part-title page is counted in pagination, no page number is placed on the page.\autocite[402]{turabian_manual_2018}
\marginnote{\textbackslash part*\{\}}
-The \textcmd{part*} command also starts a new part-title page. If in the main matter, this command provides the same \emph{Part} label and part number as \textcmd{part}. Unlike \textcmd{part}, however, \textcmd{part*} allows for ``text introducing the contents of the part on the part-tile page" to follow a descriptive title, separated by two blank lines. A page number, using the \texttt{plain} page style (refer to subsection~\ref{subsec:page_styles}), is placed on the page \autocite[390]{turabian_manual_2013}.
+The \textcmd{part*} command also starts a new part-title page. If in the main matter, this command provides the same \emph{Part} label and part number as \textcmd{part}. Unlike \textcmd{part}, however, \textcmd{part*} allows for ``text introducing the contents of the part on the part-tile page" to follow a descriptive title, separated by two blank lines. A page number, using the \texttt{plain} page style (refer to subsection~\ref{subsec:page_styles}), is placed on the page.\autocite[402]{turabian_manual_2018}
\subsection{Chapters}
@@ -254,7 +256,7 @@
\marginnote{\textbackslash chapter\{\}}
A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be divided into chapters using the \textcmd{chapter} command.
-The \textcmd{chapter} command starts a new page with a descriptive title of the chapter, separated from the first line of following text by ``two blank lines." If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title---separated by a blank line---is preceded by a \emph{Chapter} label and chapter number (in arabic numerals) at the top of the page \autocite[391]{turabian_manual_2013}.
+The \textcmd{chapter} command starts a new page with a descriptive title of the chapter, separated from the first line of following text by ``two blank lines." If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title---separated by a blank line---is preceded by a \emph{Chapter} label and chapter number (in arabic numerals) at the top of the page.\autocite[402]{turabian_manual_2018}
\marginnote{\textbackslash chapter*\{\}}
\textcmd{chapter*}, unlike \textcmd{chapter}, does not provide a line with a \emph{Chapter} label and numbering nor is it included in the table of contents.\footnote{%
@@ -267,20 +269,20 @@
\marginnote{\textbackslash section\{\}\newline \textbackslash subsection\{\}\newline \textbackslash subsubsection\{\}}
Three levels of sections and subsections are supported: \textcmd{section}, \textcmd{subsection}, and \textcmd{subsubsection} (including their asterisked versions). These section and subsection commands do not provide any label or numbering.
-\textcmd{section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)" \autocite[393]{turabian_manual_2013}.
+\textcmd{section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)."\autocite[404]{turabian_manual_2018}
\marginnote{\textbackslash section*\{\}\newline \textbackslash noadjustssect}
-When used with \texttt{turabian-researchpaper}, the \textcmd{section*} command places two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including \emph{Introduction}, \emph{Notes}, and \emph{Bibliography} \autocite[390--401]{turabian_manual_2013}. Inserting the \textcmd{noadjustssect} command in the document preamble will disable this behaviour.
+When used with \texttt{turabian-researchpaper}, the \textcmd{section*} command places two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including \emph{Introduction}, \emph{Notes}, and \emph{Bibliography}.\autocite[400--411]{turabian_manual_2018} Inserting the \textcmd{noadjustssect} command in the document preamble will disable this behaviour.
\subsection{Page Styles: Headers and Footers}
\label{subsec:page_styles}
-Headers and footers are placed within the margins. The top of the header is 0.5 inches from the top edge of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page \autocite[372, 374]{turabian_manual_2013}.
+Headers and footers are placed within the margins. The top of the header is 0.5 inches from the top edge of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page.\autocite[384, 386]{turabian_manual_2018}
\marginnote{\textbackslash pagestyle\{\}\newline \textbackslash thispagestyle\{\}}
The layout of the headers and footers are determined by the page styles specified using the \textcmd{pagestyle} and \textcmd{thispagestyle} commands.\footnote{%
- The \texttt{fancyhdr} package can be used to typeset (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}.}
+ The \texttt{fancyhdr} package can be used to typeset (and adjust) these page styles. This includes placing optional text (such as a page identifier) in the header and/or footer (\autocite[386]{turabian_manual_2018}).}
This package provides the following page styles:
\begin{pagestyleoptions}
@@ -295,32 +297,29 @@
\subsection{Front Matter, Main Matter, and Back Matter}
\label{subsec:td_structure}
-A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be 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}.
+A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter.\autocite[387--388]{turabian_manual_2018}
\subsubsection*{Front Matter}
\marginnote{\textbackslash frontmatter}
-The front matter begins with the \textcmd{frontmatter} command. Page numbering starts with the title page. Page numbers do not appear in the headers or footers of pages in the front matter, as the \textcmd{frontmatter} command sets \textcmd{pagestyle} to \texttt{empty} \autocite[373--374, 376]{turabian_manual_2013}.
+The front matter begins with the \textcmd{frontmatter} command. Page numbering starts with the title page and are numbered consecutively using lowercase roman numerals). Page numbers are centred in the footer using the \texttt{plain} page style.\autocite[386]{turabian_manual_2018}
-Page numbers, however, do appear on pages that follow the \textcmd{tableofcontents} command when typesetting the table of contents (refer to subsection~\ref{subsec:toc}).
-
\subsubsection*{Main Matter}
\marginnote{\textbackslash mainmatter}
-The main matter (or text of the paper) begins with the \textcmd{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}.
+The main matter (or text of the paper) begins with the \textcmd{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[386, 400]{turabian_manual_2018}
\subsubsection*{Back Matter}
\marginnote{\textbackslash backmatter}
-The back matter is declared using the \textcmd{backmatter} command. Page numbering and page styles are continued from the main matter \autocite[373--374]{turabian_manual_2013}.
+The back matter is declared using the \textcmd{backmatter} command. Page numbering and page styles are continued from the main matter.\autocite[405]{turabian_manual_2018}
\subsection{Title Page}
\label{subsec:titlepage}
-The \texttt{turabian-researchpaper} document class provides a title page intended for research papers. Page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model" title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter \autocite[376, 378]{turabian_manual_2013}.
+The \texttt{turabian-researchpaper} document class provides a title page intended for research papers in which page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model" title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter (but does not have a page number on it).\autocite[385--386, 388]{turabian_manual_2018}
-\clearpage
\marginnote{\textbackslash maketitle}
The \textcmd{maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}.
@@ -330,10 +329,10 @@
For research paper title pages, footnotes (as well as the \textcmd{thanks} command) can also be used.
\marginnote{\textbackslash submissioninfo\{\}}
-For a research paper, \textcmd{submissioninfo} is used for typesetting ``any information requested by your instructor," between the name of the course and the date \autocite[376]{turabian_manual_2013}. For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department.
+For a research paper, \textcmd{submissioninfo} is used for typesetting ``any information requested by your instructor," between the course title and the date.\autocite[388]{turabian_manual_2018} For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department.
\marginnote{\textbackslash course\{\}}
-\texttt{turabian-researchpaper} provides the optional \textcmd{course} command for typesetting course information (such as the name of the course).
+\texttt{turabian-researchpaper} provides the optional \textcmd{course} command for typesetting course information (such as the course title).
\marginnote{\textbackslash institution\{\}\newline \textbackslash department\{\}\newline \textbackslash location\{\}}
\texttt{turabian-thesis} also provides: (1) \textcmd{institution} for typesetting the institution at the top of the page, (2) for typesetting the name of the department, and (3) \textcmd{location} for typesetting a location just above the date.
@@ -345,16 +344,15 @@
\label{subsec:toc}
\marginnote{\textcmd{tableofcontents}}
-The \textcmd{tableofcontents} command creates a table of contents with the first page labelled \emph{Contents}. Items within the table of contents are single-spaced with ``a blank line after each item." By default, subheadings are not included in the table of contents \autocite[380]{turabian_manual_2013}.\footnote{%
- To add subheadings to the table of contents, increase the \texttt{tocdepth} counter.}
-
-For the \texttt{turabian-thesis} document class, the \textcmd{tableofcontents} command causes subsequent pages in the front matter to be typeset using the \texttt{plain} page style. Page numbers in the front matter use roman numerals and are placed in the centre of the footer \autocite[373--374; refer to subsection~\ref{subsec:page_styles}]{turabian_manual_2013}. More so, in the table of contents, the front matter and back matter are each separated from the main matter by two blank lines \autocite[380]{turabian_manual_2013}.
+The \textcmd{tableofcontents} command creates a table of contents with the first page labelled \emph{Contents}. Items within the table of contents are single-spaced with ``a blank line after each item." By default, subheadings are not included in the table of contents.\footnote{%
+ \autocite[390]{turabian_manual_2018}. To add subheadings to the table of contents, increase the \texttt{tocdepth} counter.}
+More so, in the table of contents, the front matter and back matter are each separated from the main matter by two blank lines.\autocite[390]{turabian_manual_2018}
\subsection{List of Figures, Tables, or Illustrations}
\label{subsec:toft}
-The \texttt{figure} and \texttt{table} environments are both supported. Figures are numbered separately from tables and, both, in the order in which they are mentioned in the text \autocite[363, 369]{turabian_manual_2013}.
+The \texttt{figure} and \texttt{table} environments are both supported. Figures are numbered separately from tables and, both, in the order in which they are mentioned in the text.\autocite[375, 381]{turabian_manual_2018}
With \texttt{turabian-researchpaper}, figures and tables are numbered consecutively, throughout the paper (e.g. ``Figure 6").
@@ -367,9 +365,9 @@
The \textcmd{listoftables} command creates a list of tables with a \emph{Tables} label on the top of the first page.
\marginnote{\textcmd{listofillustrations}}
-The \textcmd{listofillustrations} command creates a combined list of figures and tables with the first page labelled \emph{Illustrations}. This list, however, is divided into two sections labelled \emph{Figures} and \emph{Tables} \autocite[383]{turabian_manual_2013}.
+The \textcmd{listofillustrations} command creates a combined list of figures and tables with the first page labelled \emph{Illustrations}. This list, however, is divided into two sections labelled \emph{Figures} and \emph{Tables}.\autocite[393]{turabian_manual_2018}
-Individual items in a list of figures, tables, or illustrations are single-spaced with a blank line between each item \autocite[383]{turabian_manual_2013}.
+Individual items in a list of figures, tables, or illustrations are single-spaced with a blank line between each item.\autocite[393]{turabian_manual_2018}
\clearpage
@@ -387,18 +385,18 @@
\end{quotation}
\end{lstlisting}
-The entire quotation is indented as far as the indentation of the first line of a paragraph---by default, an indentation of \texttt{0.5in} \autocite[349]{turabian_manual_2013}. The block quotation is also indented by the same amount on the right side. When using the \texttt{raggedright} option (or the \textcmd{raggedright} command), however, the block quotation is not indented on the right side (refer to subsection~\ref{subsec:raggedright}).
+The entire quotation is indented as far as the indentation of the first line of a paragraph---by default, an indentation of \texttt{0.5in}.\autocite[361]{turabian_manual_2018} The block quotation is also indented by the same amount on the right side. When using the \texttt{raggedright} option (or the \textcmd{raggedright} command), however, the block quotation is not indented on the right side (refer to subsection~\ref{subsec:raggedright}).
\subsection{Appendixes}
\label{subsec:appendixes}
-When ``supporting material cannot be easily worked into the body of your paper," the manual recommends placing it ``in one or more appendixes in the back matter" \autocite[398]{turabian_manual_2013}.
+When ``supporting material cannot be easily worked into the body of your paper," the manual recommends placing it ``in one or more appendixes in the back matter."\autocite[410]{turabian_manual_2018}
-If only one appendix is needed, the first page is to be labelled \emph{Appendix} with ``two blank lines between the title and the first line of text or other material" \autocite[398]{turabian_manual_2013}. With the \texttt{turabian-thesis} document class, the material is preceded by a chapter heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{chapter}\{Appendix\}}) and is placed in the back matter. For \texttt{turabian-researchpaper}, the material is preceded by a section heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{section*}\{Appendix\}}).
+If only one appendix is needed, the first page is to be labelled \emph{Appendix} with ``two blank lines between the title and the first line of text or other material."\autocite[410]{turabian_manual_2018} With the \texttt{turabian-thesis} document class, the material is preceded by a chapter heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{chapter}\{Appendix\}}) and is placed in the back matter. For \texttt{turabian-researchpaper}, the material is preceded by a section heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{section*}\{Appendix\}}).
\marginnote{appendixes}
-To divide material of different types among more than one appendix \autocite[398]{turabian_manual_2013}, place the material inside the \texttt{appendixes} environment. The requisite code for this environment:
+To divide material of different types among two or more appendixes,\autocite[410]{turabian_manual_2018} place the material inside the \texttt{appendixes} environment. The requisite code for this environment:
\begin{lstlisting}
\begin{appendixes}
@@ -428,6 +426,22 @@
\label{sec:updates}
+\marginnote{\rmfamily{2018/05/21}}%
+
+Updated support for the 9th edition of Turabian's \emph{A Manual for Writers}.
+
+The default page style for pages in the front matter has been changed to \texttt{plain}.
+
+The \textcmd{tableofcontents} command no longer causes subsequent pages to be typeset using the \texttt{plain} page style.
+
+Paragraphs immediately following chapter, section, and subsection headings now have an indentation of 0.5 inches.
+
+The lists of figures, tables, and illustrations each appear as entries in the table of contents.
+
+Adjustments to the formatting of the table of contents as well as the lists of figures, tables, and illustrations.
+
+If the \texttt{biblatex-chicago} package is loaded by the user, the \texttt{noibid} option is passed to the package.
+
\marginnote{\rmfamily{2017/11/04}}%
Improved support for the \texttt{setspace} package's \textcmd{setstretch} command.
@@ -458,6 +472,7 @@
Loading \texttt{turabian-formatting} as a package is no longer supported.
+\clearpage
\marginnote{\rmfamily{2016/07/12}}%
Re-implementation of the \textcmd{raggedright} command as an alternative to using the \texttt{raggedright} option.
@@ -528,7 +543,7 @@
Formatting changes to both subsection titles and title page for both research papers and theses/dissertations.
\marginnote{\rmfamily{2014/12/10}}%
-Adjustments to formatting that more-accurately reflect the 8th edition of Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations}.
+Adjustments to formatting that more-accurately reflect the 8th edition of Turabian's \emph{A Manual for Writers}.
Modified: trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty 2018-05-22 21:04:12 UTC (rev 47795)
+++ trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty 2018-05-22 21:06:01 UTC (rev 47796)
@@ -1,10 +1,10 @@
% 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 Kate L. Turabian's "A Manual for Writers of Research Papers, Theses,
+% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 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,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2017/11/04 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2018/05/21 Turabian Formatting]
-% Package options: flags
+% Package options: flags and variables
\newif\if at optraggedright\@optraggedrightfalse
@@ -192,11 +192,9 @@
% Set top section command name to "section" (default)
\def\tf at topsecname{section}
-
% Set adjustment for baselineskip after \section and \section* headings
\def\tf at adjaftersec{\dimexpr \baselineskip -\tf at singlelineskip -\p@ \relax}
-
% Headings formatting: \section, \subsection, and \subsubsection
\setcounter{secnumdepth}{0}
@@ -221,13 +219,10 @@
{\tf at singlelineskip}%
{\normalfont\bfseries\normalsize\singlespacing\raggedright}}
+% Headings formatting: following paragraphs start with an indent
+\def\tf at afterindent{\@afterindenttrue}
-% Table of Contents, List of Figures, and List of Tables: section number alignment
-\def\tflist at beforesecnum{}
-\def\tflist at aftersecnum{\hfil}
-\def\numberline#1{\hb at xt@\@tempdima{\tflist at beforesecnum #1\tflist at aftersecnum}}
-
% Table of Contents: renew formatting
\def\tf at tocpagestyle{\@empty}
@@ -235,7 +230,7 @@
\renewcommand{\tableofcontents}{%
\tf at tocpagestyle
\expandafter\csname \tf at topsecname\endcsname*{\contentsname}%
- \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
+ \@mkboth{\contentsname}{\contentsname}%
\if at optraggedright
\let\tf at tocrmarg\@tocrmarg
\def\@tocrmarg{\tf at tocrmarg plus1fil}
@@ -244,12 +239,9 @@
\singlespacing
\@starttoc{toc}}}%
-% Table of Contents: right margin and number width formatting
-\def\@tocrmarg{5em}
-\def\@pnumwidth{2.5em}
+% List of Figures and List of Tables: adjust titles
-% List of Figures and List of Tables: adjust titles
\renewcommand{\listfigurename}{Figures}
\renewcommand{\listtablename}{Tables}
@@ -270,7 +262,8 @@
% List of Figures
\renewcommand{\listoffigures}{%
\expandafter\csname \tf at topsecname\endcsname*{\listfigurename}%
- \@mkboth{\MakeUppercase\listfigurename}{\MakeUppercase\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
+ \addcontentsline{toc}{\tf at topsecname}{\listfigurename}%
{ \vspace{\dimexpr -3\tf at singlelineskip +1\baselineskip \relax}%
\singlespacing
\@starttoc{lof}}}
@@ -278,7 +271,8 @@
% List of Tables
\renewcommand{\listoftables}{%
\expandafter\csname \tf at topsecname\endcsname*{\listtablename}%
- \@mkboth{\MakeUppercase\listtablename}{\MakeUppercase\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
+ \addcontentsline{toc}{\tf at topsecname}{\listtablename}%
{ \vspace{\dimexpr -3\tf at singlelineskip +1\baselineskip \relax}%
\singlespacing
\@starttoc{lot}}}
@@ -289,7 +283,8 @@
\newcommand{\listofillustrations}{%
\expandafter\csname \tf at topsecname\endcsname*{\listillustrationname}%
- \@mkboth{\MakeUppercase\listillustrationname}{\MakeUppercase\listillustrationname}%
+ \@mkboth{\listillustrationname}{\listillustrationname}%
+ \addcontentsline{toc}{\tf at topsecname}{\listillustrationname}%
{ \vspace{\dimexpr -3\tf at singlelineskip +1\baselineskip \relax}%
\singlespacing
{\tf at illustrsection Figures}\par\nopagebreak
@@ -409,7 +404,7 @@
% biblatex-chicago: set formatting defaults and pass options
\PassOptionsToPackage%
- {isbn=false, autolang=other, footmarkoff, backend=biber}%
+ {isbn=false, autolang=other, footmarkoff, noibid, backend=biber}%
{biblatex-chicago}
\if at authordateformat
\PassOptionsToPackage{authordate}{biblatex-chicago}
Modified: trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls 2018-05-22 21:04:12 UTC (rev 47795)
+++ trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls 2018-05-22 21:06:01 UTC (rev 47796)
@@ -1,10 +1,10 @@
% 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 Kate L. Turabian's "A Manual for Writers of Research Papers, Theses,
+% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 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}[2017/11/04 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2018/05/21 Turabian Research Paper]
% Default point size
@@ -49,7 +49,7 @@
\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
\DeclareOption{twocolumn}{%
- \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported.}
+ \ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is not supported}
\OptionNotUsed}
\DeclareOption{10pt}{\def\@@ptsize{10pt}}
@@ -80,13 +80,13 @@
% Part: formatting
-\def\tf at partformat{\normalfont\bfseries\normalsize\singlespacing\centering}
+\def\tf at partformat{\normalfont\bfseries\singlespacing\centering}
\def\@part[#1]#2{%
\ifnum \c at secnumdepth >-2\relax
\refstepcounter{part}%
\addcontentsline{toc}{part}%
- {\protect\numberline{\thepart.}#1}%
+ {\protect{\partname\space\thepart}}%
\else
\addcontentsline{toc}{part}{#1}%
\fi
@@ -130,7 +130,7 @@
\@tempskipa #4\relax
\@afterindenttrue
\ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \@afterindentfalse
+ \@tempskipa -\@tempskipa \tf at afterindent
\fi
\if at nobreak \everypar{} \else
\addpenalty\@secpenalty\addvspace\@tempskipa
@@ -157,7 +157,7 @@
\protected at edef\tf at secsep#1#2{\@empty}
% Sections: formatting of TOC \addcontentsline
-\def\tf at tocline#1{\protect\numberline{\csname the#1\endcsname\quad}}
+\def\tf at tocline#1{\protect{\csname the#1\endcsname\quad}}
% Sections: redefine \@sect to support optional two-line formatting
\def\@sect#1#2#3#4#5#6[#7]#8{%
@@ -186,7 +186,7 @@
\csname #1mark\endcsname{#7}%
\addcontentsline{toc}{#1}{%
\ifnum #2>\c at secnumdepth \else
- \protect\numberline{\csname the#1\endcsname\quad}%
+ \tf at tocline{#1}%
\fi
#7}}%
\fi
@@ -275,8 +275,14 @@
\fi
+% Table of Contents, List of Figures, and List of Tables: item number alignment
+%\def\numberline#1{\hb at xt@\@tempdima{\hfil #1\hspace{1em}}}
+
+\def\@tocrmarg{0.75in}
+\def\@pnumwidth{3.5ex}
+
+
% Table of Contents: formatting
-
\setcounter{tocdepth}{1}
\renewcommand*{\l at part}[2]{%
@@ -283,8 +289,8 @@
\ifnum \c at tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
\addvspace{1\baselineskip}%
- \setlength\@tempdima{3em}%
- \vskip 1\baselineskip
+ \setlength\@tempdima{0.5in}%
+ \vskip \tf at singlelineskip
{ \parindent \z@
\rightskip \z@
\parfillskip -\@rightskip
@@ -291,7 +297,7 @@
\leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- \bfseries #1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par}
+ \bfseries #1\nobreak\hfil \nobreak\par}
\fi}
\renewcommand*{\l at section}[2]{%
@@ -298,12 +304,11 @@
\ifnum \c at tocdepth >\z@
\addpenalty\@secpenalty
\setlength\@tempdima{\z@}%
- \vskip 1\baselineskip
+ \vskip \tf at singlelineskip
{ \parindent \z@
\rightskip \@tocrmarg
\parfillskip -\rightskip
\leavevmode
- \ifnum \c at tocdepth >\@ne \bfseries \fi
\advance\leftskip\@tempdima
\hskip -\leftskip
#1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par}
@@ -310,28 +315,18 @@
\fi}
\renewcommand*{\l at subsection}{%
- \ifnum \c at tocdepth >1 \vskip 1\baselineskip \fi
+ \ifnum \c at tocdepth >1 \vskip \tf at singlelineskip \fi
\@dottedtocline{2}{0.5in}{\z@}}
\renewcommand*{\l at subsubsection}{%
- \ifnum \c at tocdepth >2 \vskip 1\baselineskip \fi
+ \ifnum \c at tocdepth >2 \vskip \tf at singlelineskip \fi
\@dottedtocline{3}{1.0in}{\z@}}
% List of Figures: formatting
-\renewcommand*{\l at figure}[2]{%
- \def\tflist at beforesecnum{\hfil}
- \def\tflist at aftersecnum{\hspace{3.5em}}
- \setlength\@tempdima{5em}
- \vskip 1\baselineskip
- { \leftskip \z@ \relax
- \rightskip \@tocrmarg
- \parfillskip -\rightskip
- \parindent \z@ \relax\@afterindenttrue
- \interlinepenalty\@M
- \leavevmode
- \advance\leftskip\@tempdima \null\nobreak\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par}}
+\renewcommand*\l at figure{
+ \vskip \tf at singlelineskip
+ \@dottedtocline{1}{1em}{0.5in}}
% List of Tables: formatting
@@ -389,7 +384,7 @@
\vspace{\dimexpr -4\tf at singlelineskip +1\baselineskip \relax}
\singlespacing\mbox{}%
\def\tf at adjaftersec{\dimexpr \tf at singlelineskip -\p@ \relax}
- \let\@afterindentfalse\@afterindenttrue}%
+ \let\tf at afterindent\@afterindenttrue}%
\fi
Modified: trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls 2018-05-22 21:04:12 UTC (rev 47795)
+++ trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls 2018-05-22 21:06:01 UTC (rev 47796)
@@ -1,10 +1,10 @@
% 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 Kate L. Turabian's "A Manual for Writers of Research Papers, Theses,
+% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2017 Omar Abdool
+% Copyright 2013-2018 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}[2017/11/04 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2018/05/21 Turabian Theses and Dissertations]
% Default point size
@@ -90,22 +90,25 @@
% Figures: number formatting
+\def\tf at figuredblnumprefix{\thechapter}
\newif\if at figuredblnum\@figuredblnumfalse
-\renewcommand{\thefigure}{\if at figuredblnum \thechapter.\fi \@arabic\c at figure}
+\renewcommand{\thefigure}{\if at figuredblnum \tf at figuredblnumprefix.\fi \@arabic\c at figure}
+
% Tables: number formatting
+\def\tf at tabledblnumprefix{\thechapter}
\newif\if at tabledblnum\@tabledblnumfalse
-\renewcommand{\thetable}{\if at tabledblnum \thechapter.\fi \@arabic\c at table}
+\renewcommand{\thetable}{\if at tabledblnum \tf at tabledblnumprefix.\fi \@arabic\c at table}
+
% Document structure: formatting
\def\frontmatter{%
\if at openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse
\pagenumbering{roman}
- \pagestyle{empty}
- \def\tf at tocpagestyle{\pagestyle{plain}}}
+ \pagestyle{plain}}
\def\mainmatter{%
\if at openright \cleardoublepage \else \clearpage \fi
@@ -133,9 +136,9 @@
\if at mainmatter
\refstepcounter{part}%
\addcontentsline{toc}{part}%
- {\protect\numberline{\partname\space\thepart.}#1}%
+ {\protect\numberline{\partname\space\thepart}#1}%
\else
- \addcontentsline{toc}{part}{#1}%
+ \addcontentsline{toc}{part}{#1}%
\fi
\else
\addcontentsline{toc}{part}{#1}%
@@ -160,7 +163,7 @@
\if at mainmatter
\refstepcounter{part}%
\addcontentsline{toc}{part}%
- {\protect\numberline{\partname\space\thepart.}#1}%
+ {\protect\numberline{\partname\space\thepart}#1}%
\fi
\fi
\markboth{}{}%
@@ -230,12 +233,13 @@
\def\@chapter[#1]#2{%
\@figuredblnumfalse
\@tabledblnumfalse
+ \tf at afterindent
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\tf at chapcounter
\typeout{\@chapapp\space\thechapter.}%
\addcontentsline{toc}{chapter}%
- {\protect\numberline{\@chapapp\space\thechapter.}#1}%
+ {\protect\numberline{\@chapapp\space\thechapter}#1}%
\else
\tf at restoreftcounters
\addcontentsline{toc}{chapter}{#1}%
@@ -251,6 +255,7 @@
\@figuredblnumfalse
\@tabledblnumfalse
\tf at restoreftcounters
+ \tf at afterindent
\@makeschapterhead{#1}%
\@afterheading}
@@ -282,7 +287,7 @@
\@tempskipa #4\relax
\@afterindenttrue
\ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \@afterindentfalse
+ \@tempskipa -\@tempskipa \tf at afterindent
\fi
\if at nobreak
\everypar{}%
@@ -375,6 +380,7 @@
\@date
\parskip=0pt
\end{center}%
+ \thispagestyle{empty}
\end{titlepage}%
\setcounter{page}{2}
% if not endnotes, reset footnote counter
@@ -383,8 +389,16 @@
\cleardoublepage}
+% Table of Contents, List of Figures, and List of Tables: section number alignment
+\def\tflist at beforesecnum{}
+\def\tflist at aftersecnum{\hfil}
+\def\numberline#1{\hb at xt@\@tempdima{\tflist at beforesecnum #1\tflist at aftersecnum}}
+
+\def\@tocrmarg{0.75in}
+\def\@pnumwidth{3.5ex}
+
+
% Table of Contents: formatting
-
\setcounter{tocdepth}{0}
\renewcommand*{\l at part}[2]{%
@@ -391,7 +405,7 @@
\ifnum \c at tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
\addvspace{1\baselineskip}%
- \setlength\@tempdima{7.5em}%
+ \setlength\@tempdima{1.25in}%
\vskip 1\baselineskip
{ \parindent \z@
\rightskip \z@
@@ -399,19 +413,18 @@
\leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- \bfseries #1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par}
+ {\bfseries #1}\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par}
\fi}
\renewcommand*{\l at chapter}[2]{%
\ifnum \c at tocdepth >\m at ne
\addpenalty{-\@highpenalty}%
- \setlength\@tempdima{7.5em}%
+ \setlength\@tempdima{1.25in}%
\vskip 1\baselineskip
{ \parindent \z@
\rightskip \@tocrmarg
\parfillskip -\rightskip
\leavevmode
- \ifnum \c at tocdepth >\z@ \bfseries \fi
\advance\leftskip\@tempdima
\hskip -\leftskip
#1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par
@@ -419,16 +432,16 @@
\fi}
\renewcommand*{\l at section}{%
- \ifnum \c at tocdepth >\z@ \vskip 1\baselineskip \fi
+ \ifnum \c at tocdepth >\z@ \vskip \tf at singlelineskip \fi
\@dottedtocline{1}{1.5in}{\z@}}
\renewcommand*{\l at subsection}{%
- \ifnum \c at tocdepth >1 \vskip 1\baselineskip \fi
- \@dottedtocline{2}{2.0in}{\z@}}
+ \ifnum \c at tocdepth >1 \vskip \tf at singlelineskip \fi
+ \@dottedtocline{2}{1.75in}{\z@}}
\renewcommand*{\l at subsubsection}{%
- \ifnum \c at tocdepth >2 \vskip 1\baselineskip \fi
- \@dottedtocline{3}{2.5in}{\z@}}
+ \ifnum \c at tocdepth >2 \vskip \tf at singlelineskip \fi
+ \@dottedtocline{3}{2in}{\z@}}
% Table of Contents: added lineskip
\def\@addcontentslineskip{%
@@ -435,28 +448,14 @@
\begingroup
\let\tf at write\write
\def\write{\immediate\tf at write}
- \addtocontents{toc}{\protect\addvspace{1\baselineskip}}
+ \addtocontents{toc}{\protect\addvspace{\tf at singlelineskip}}
\endgroup}
% List of Figures: formatting
-\renewcommand*{\l at figure}[2]{%
- \def\tflist at beforesecnum{\hfil}
- \if at doublenumerate
- \def\tflist at aftersecnum{\hspace{3em}}
- \else
- \def\tflist at aftersecnum{\hspace{3.5em}}
- \fi
- \setlength\@tempdima{5em}
- \vskip 1\baselineskip
- { \leftskip \z@ \relax
- \rightskip \@tocrmarg
- \parfillskip -\rightskip
- \parindent \z@ \relax\@afterindenttrue
- \interlinepenalty\@M
- \leavevmode
- \advance\leftskip\@tempdima \null\nobreak\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par}}
+\renewcommand*\l at figure{%
+ \vskip \tf at singlelineskip
+ \@dottedtocline{0}{\z@}{4em}}
% List of Tables: formatting
@@ -463,6 +462,32 @@
\def\l at table{\l at figure}
+% Figures and Tables: caption formatting
+\def\tf at numberlinedbl#1#2{\hb at xt@0.3\@tempdima{\hfil #1}\hb at xt@0.7\@tempdima{#2 \hfil}}
+
+\long\def\@caption#1[#2]#3{%
+ \par
+ \csname if@#1dblnum\endcsname
+ \addcontentsline{\csname ext@#1\endcsname}{#1}{%
+ \protect\tf at numberlinedbl{\csname tf@#1dblnumprefix\endcsname}%
+ {.\@arabic{\csname c@#1\endcsname}}%
+ {\ignorespaces #2}}%
+ \else
+ \addcontentsline{\csname ext@#1\endcsname}{#1}{%
+ \protect\tf at numberlinedbl{\csname the#1\endcsname}%
+ {\@empty}%
+ {\ignorespaces #2}}%
+ \fi
+ \begingroup
+ \@parboxrestore
+ \if at minipage
+ \@setminipage
+ \fi
+ \normalsize
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
+ \endgroup}
+
+
% Appendixes: formatting
% appendixes environment resets figure and tables counts with "A." prefix
@@ -480,11 +505,15 @@
\setcounter{tf at tempchapfcnt}{\value{figure}}
\setcounter{tf at tempchaptcnt}{\value{table}}
\fi
+ \def\tf at chapcounter{%
+ \refstepcounter{appendix}
+ \@figuredblnumtrue
+ \@tabledblnumtrue}
\setcounter{figure}{0}
\setcounter{table}{0}
+ \def\tf at figuredblnumprefix{A}
+ \def\tf at tabledblnumprefix{A}
\fi
- \renewcommand{\thefigure}{\if at doublenumerate A.\fi \@arabic\c at figure}
- \renewcommand{\thetable}{\if at doublenumerate A.\fi \@arabic\c at table}
}%
{%
\if at doublenumerate
@@ -508,12 +537,12 @@
% Renew Notes heading formatted as \chapter* (also added to Table of Content)
\renewcommand{\enoteheading}{%
\tf at chapter*{\notesname}%
- \@mkboth{\MakeUppercase\notesname}{\MakeUppercase\notesname}%
+ \@mkboth{\notesname}{\notesname}%
\addcontentsline{toc}{chapter}{\notesname}%
\vspace{\dimexpr -5\tf at singlelineskip +1\baselineskip \relax}%
\singlespacing\mbox{}%
\def\tf at adjaftersec{\dimexpr \tf at singlelineskip -\p@ \relax}
- \let\@afterindentfalse\@afterindenttrue}%
+ \let\tf at afterindent\@afterindenttrue}%
% Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
\RenewDocumentCommand{\chapter}{som}{%
More information about the tex-live-commits
mailing list