texlive[41734] Master/texmf-dist: turabian-formatting (19jul16)
commits+karl at tug.org
commits+karl at tug.org
Wed Jul 20 00:27:06 CEST 2016
Revision: 41734
http://tug.org/svn/texlive?view=revision&revision=41734
Author: karl
Date: 2016-07-20 00:27:06 +0200 (Wed, 20 Jul 2016)
Log Message:
-----------
turabian-formatting (19jul16)
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 2016-07-19 22:26:51 UTC (rev 41733)
+++ trunk/Master/texmf-dist/doc/latex/turabian-formatting/README 2016-07-19 22:27:06 UTC (rev 41734)
@@ -1,4 +1,4 @@
-Turabian Formatting for LaTeX (2016/07/12)
+Turabian Formatting for LaTeX (2016/07/18)
INTRODUCTION
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 2016-07-19 22:26:51 UTC (rev 41733)
+++ trunk/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2016-07-19 22:27:06 UTC (rev 41734)
@@ -19,7 +19,7 @@
% and turabian-formatting-doc.pdf (in addition to the README file).
%
% ==============================
-% Last updated: 2016/07/12
+% Last updated: 2016/07/18
%
%
@@ -127,11 +127,10 @@
\clearpage
-\section{Getting Started: Document Classes}
+\section{Document Classes (Getting Started)}
\label{sec:implementation}
-A document may be formatted using \texttt{turabian-formatting} in one of two ways: either (1) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), or (2) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}).\footnote{%
- The \texttt{turabian-formatting} package can be used with different document classes by loading it through the \textcmd{usepackage} command. This method is not recommended and has only been tested with the standard \texttt{article}, \texttt{report}, and \texttt{book} \LaTeX{} document classes. If the document class is either \texttt{turabian-researchpaper} or \texttt{turabian-thesis}, do not load the \texttt{turabian-formatting} package again. Loading \texttt{turabian-formatting} as a package should always be done \emph{before} using the \texttt{biblatex-chicago} package.}
+A document may be formatted using \texttt{turabian-formatting} in one of two ways: either (1) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), or (2) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}).
\subsection{Research Papers}
@@ -169,8 +168,7 @@
Page margins, by default, are 1 inch from the edges of the paper.
-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.\footnote{%
- This is accomplished by \texttt{turabian-thesis} making changes to the following lengths: (1) setting \textcmd{oddsidemargin} to \texttt{0.5in}; (2) setting \textcmd{evensidemargin} to \texttt{0}; and (3) adding \texttt{-0.5in} to \textcmd{textwidth}.}
+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.
\subsection{Standard Options for Document Classes}
@@ -227,7 +225,7 @@
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.
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 is typeset using either \textcmd{section*} or, if \textcmd{chapter} has been defined by the document class (i.e. \texttt{turabian-thesis}), \textcmd{chapter*}. If there are no endnotes preceding \textcmd{theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.}
+ The \emph{Notes} heading, when using the \texttt{turabian-researchpaper} document class, is typeset with \textcmd{section*}. The \texttt{turabian-thesis} document class, however, typsets 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}.
@@ -406,6 +404,12 @@
\label{sec:updates}
+\marginnote{\rmfamily{2016/07/18}}%
+
+Improvements to \texttt{figure} and \texttt{table} counters and number formatting.
+
+Loading \texttt{turabian-formatting} as a package is no longer supported.
+
\marginnote{\rmfamily{2016/07/12}}%
Re-implementation of the \textcmd{raggedright} command as an alternative to using the \texttt{raggedright} option.
@@ -416,8 +420,6 @@
Added an \texttt{appendixes} environment to support formatting of appendixes.
-Formatting improvements when \textcmd{chapter} is empty.
-
Support for changes made to the \texttt{biblatex-chicago} package.
Removed commands: \textcmd{tablenote}, \textcmd{tablesource}, \textcmd{faculty}, and \textcmd{mydegree}.
Modified: trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty 2016-07-19 22:26:51 UTC (rev 41733)
+++ trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty 2016-07-19 22:27:06 UTC (rev 41734)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2016/07/12 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2016/07/18 Turabian Formatting]
-% Flags adjusted with package options
+% Package options: flags
\newif\if at optraggedright\@optraggedrightfalse
@@ -41,7 +41,7 @@
\newif\if at endnotesformat\@endnotesformatfalse
-% Declare package options
+% Package options: handling
\DeclareOption{raggedright}{\@optraggedrighttrue}
@@ -51,7 +51,6 @@
\DeclareOption{endnotes}{\@endnotesformattrue}
-
\ProcessOptions\relax
@@ -58,19 +57,19 @@
\RequirePackage{etoolbox}
-% Default margin size of 1 inch on all sides
+% Margin size: 1 inch on all sides
\setlength\textwidth{\paperwidth}
- \addtolength\textwidth{-2in}
+\addtolength\textwidth{-2in}
\setlength\hoffset{\z@}
\setlength\textheight{\paperheight}
- \addtolength\textheight{-2in}
+\addtolength\textheight{-2in}
\setlength\voffset{\z@}
\setlength\oddsidemargin{\z@}
\setlength\evensidemargin{\z@}
-% Default header height set to height of 1 line of text
+% Header height: set to 1 line of text
\ifcase \@ptsize
\setlength\headheight{10pt}
\or
@@ -79,15 +78,14 @@
\setlength\headheight{12pt}
\fi
-% Set header top and footer baseline to 0.5in from page edges
+% Header top and footer baseline: set to 0.5in from page edges
\setlength\topmargin{-0.5in}
\setlength\headsep{0.5in}
- \addtolength\headsep{-\headheight}
+\addtolength\headsep{-\headheight}
\setlength\footskip{0.5in}
-
-% Set default text spacing as double spaced
+% Text spacing is double spaced
\RequirePackage{setspace}
\setstretch{2}
@@ -95,7 +93,7 @@
\newlength\tf at singlelineskip
\setlength\tf at singlelineskip{0.5\baselineskip}
-% Set default paragraph indent
+% Paragraph indent
\setlength\parindent{0.5in}
% Renew \raggedright to preserve paragraph indent and set \@optraggedright to true
@@ -104,10 +102,8 @@
\leftskip\z at skip
\@optraggedrighttrue}
-% Set \raggedright if raggedright option true
-\if at optraggedright
- \raggedright
-\fi
+% Use \raggedright if raggedright option true
+\if at optraggedright \raggedright \fi
% Prevent widowed text with 2 line default
\PassOptionsToPackage{defaultlines=2, all}{nowidow}
@@ -117,7 +113,7 @@
{\RequirePackage{nowidow}}}
-% Footnote layout and formatting
+% Footnotes: layout and formatting
\PassOptionsToPackage{bottom, marginal}{footmisc}
\if at endnotesformat
@@ -128,10 +124,10 @@
\setlength\footnotemargin{\parindent}
-% Chicago symbols used when needed
+% Footnotes: Chicago symbols used when needed
\setfnsymbol{chicago}
-% Separation between footnotes based on text size
+% Footnotes: separation between footnotes based on text size
\ifcase \@ptsize
\setlength\footnotesep{16.65pt}
\or
@@ -142,26 +138,24 @@
\setlength{\skip\footins}{\footnotesep}
-% Readjust default footnote rule size and placement
+% Footnotes: readjust footnote rule size and placement
\renewcommand{\footnoterule}{%
\vspace*{-3pt}
\hrule width 2in height 0.4pt
\vspace*{-4pt}}
-% Command to set footnote punctuation
+% Footnotes: make command to set footnote punctuation
\newcommand{\tf at setfnpunct}[1]{\def\tf at thefnpunct{#1\,\,}}
\tf at setfnpunct{.}
-% Renew command for typesetting footnotes
+% Footnotes: Renew command for typesetting footnotes
\renewcommand{\@makefntext}[1]{%
- \if at optraggedright
- \raggedright%
- \fi
+ \if at optraggedright \raggedright \fi
\setlength\parindent{\footnotemargin}%
\@thefnmark\tf at thefnpunct#1}
-% Redefine headings page style (places page number in header)
+% Page style (headings): place page number in header, top right
\def\ps at headings{%
\let\@oddfoot\@empty
\let\@evenfoot\@empty
@@ -172,19 +166,18 @@
\let\chaptermark\@gobble
\let\sectionmark\@gobble}
-% Set myheadings page style to be the same as the headings page style
+% Page style (myheadings): make same as headings page style
\let\ps at myheadings\ps at headings
-% Set default page style and page numbering
+% Page style (headings): set default page style and page numbering
\pagestyle{headings}
\pagenumbering{arabic}
-% Adjust empty page style if twoside option used
+% Page style (empty): adjust if twoside option used
\if at twoside
\def\cleardoublepage{%
\clearpage
- \ifodd\c at page
- \else
+ \ifodd \c at page \else
\hbox{}
\thispagestyle{empty}
\newpage
@@ -192,186 +185,14 @@
\fi
-% Thesis-related document structure formatting
+% Set top section command name to "section" (default)
+\def\tf at topsecname{section}
-\ifcsdef{chapter}%
- {%
- \providebool{@mainmatter}
- \@mainmattertrue
-
- \def\frontmatter{%
- \cleardoublepage
- \@mainmatterfalse
- \pagenumbering{roman}
- \pagestyle{empty}}
- \def\mainmatter{%
- \cleardoublepage
- \@mainmattertrue
- \pagenumbering{arabic}
- \pagestyle{headings}
- \addtocontents{toc}{\protect\addvspace{1\baselineskip}}}
+% Headings formatting: \section, \subsection, and \subsubsection
- \def\backmatter{%
- \if at openright
- \cleardoublepage
- \else
- \clearpage
- \fi
- \@mainmatterfalse
- \setcounter{chapter}{0}%
- \setcounter{figure}{0}%
- \setcounter{table}{0}%
- \addtocontents{toc}{\protect\addvspace{1\baselineskip}}}
- }%
- {}
-
-
-% Headings formatting of \chapter, \section, \subsection, and \subsubsection
-
-% Top section command name (chapter or section?)
-\ifcsdef{chapter}%
- {\def\tf at topsecname{chapter}}%
- {\def\tf at topsecname{section}}
-
\setcounter{secnumdepth}{0}
-% \section and \chapter formatting
-
-\ifcsdef{chapter}%
- {% If \chapter defined...
- % \chapter formatting
- \def\tf at chapformat{\normalfont\bfseries\normalsize\singlespacing\centering}
- \def\tf at chapcounter{\refstepcounter{chapter}}
- \def\@chapter[#1]#2{%
- \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}%
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \@makechapterhead{#2}%
- \@afterheading}
- \def\@makechapterhead#1{%
- { \tf at chapformat
- \ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
- \@chapapp\space \thechapter
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
- \interlinepenalty\@M
- \ifstrempty{#1}%
- {}%
- {%
- #1\par\nobreak
- \vspace{1\baselineskip}%
- }}}
- % \chapter* formatting
- \def\@makeschapterhead#1{%
- { \tf at chapformat
- \interlinepenalty\@M
- #1\par\nobreak
- \vspace{1\baselineskip}}}
- }%
- {% If \chapter not defined, differentiate and reformat \section*
-
- % \section* adjustment to space after heading
- \newif\if at adjustssection\@adjustssectiontrue
-
- \newlength\tf at ssectafterskip
- \setlength\tf at ssectafterskip{1\p@}
-
- % Command to disable differentiate and reformat \section*
- \gdef\noadjustssect{\@adjustssectionfalse}
-
- % \section adjustment to space after heading
- \newif\if at tf@adjustsection\@tf at adjustsectionfalse
-
- \newlength\tf at sectafterskip
- \setlength\tf at sectafterskip{1\p@}
-
- % Redefine \@startsection to differentiate starred version
- \def\@startsection#1#2#3#4#5#6{%
- \if at noskipsec \leavevmode \fi
- \par
- \@tempskipa #4\relax
- \@afterindenttrue
- \ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \@afterindentfalse
- \fi
- \if at nobreak
- \everypar{}%
- \else
- \addpenalty\@secpenalty\addvspace\@tempskipa
- \fi
- \setlength\tf at ssectafterskip{#5}
- \if at adjustssection
- \ifstrequal{#1}{section}%
- {\setlength\tf at ssectafterskip{\tf at singlelineskip}}%
- {}%
- \fi
- \setlength\tf at sectafterskip{#5}
- \if at tf@adjustsection
- \ifstrequal{#1}{section}%
- {\setlength\tf at sectafterskip{\tf at singlelineskip}}%
- {}%
- \fi
- \@ifstar
- {\@ssect{#3}{#4}{\tf at ssectafterskip}{#6}}%
- {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\tf at sectafterskip}{#6}}}}
-
- % Default formatting between \@svsec and heading
- \protected at edef\tf at secsep#1#2{\@empty}
-
- % Default formatting of TOC \addcontentsline
- \def\tf at tocline#1{%
- \protect\numberline{\csname the#1\endcsname\quad}}
-
- % Redefine \@sect to support variable formatting (i.e. appendixes)
- \def\@sect#1#2#3#4#5#6[#7]#8{%
- \ifnum #2>\c at secnumdepth
- \let\@svsec\@empty
- \else
- \refstepcounter{#1}%
- \protected at edef\@svsec{\@seccntformat{#1}\relax}%
- \fi
- \@tempskipa #5\relax
- \ifdim \@tempskipa>\z@
- \begingroup
- #6{%
- \@hangfrom{\hskip #3\relax\@svsec}%
- \interlinepenalty \@M \tf at secsep{#1}{#8}#8\@@par}%
- \endgroup
- \csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \ifnum #2>\c at secnumdepth \else
- \tf at tocline{#1}%
- \fi
- #7}%
- \else
- \def\@svsechd{%
- #6{\hskip #3\relax\@svsec #8}%
- \csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \ifnum #2>\c at secnumdepth \else
- \protect\numberline{\csname the#1\endcsname\quad}%
- \fi
- #7}}%
- \fi
- \@xsect{#5}}
- }
-
-% \subsection and \subsubsection formatting
-
\renewcommand{\section}{%
\@startsection{section}{1}%
{\z@}%
@@ -394,7 +215,7 @@
{\normalfont\bfseries\normalsize\singlespacing\raggedright}}
-% Title page commands for use with \maketitle
+% Title page: commands for use with \maketitle
\newcommand{\subtitle}[1]{\gdef\tf at subtitle{#1}}
\subtitle{\@empty}
@@ -402,70 +223,10 @@
\newcommand{\submissioninfo}[1]{\gdef\tf at submissioninfo{#1}}
\submissioninfo{\@empty}
-\newcommand{\course}[1]{\gdef\tf at course{#1}}
-\course{\@empty}
-
-\newcommand{\institution}[1]{\gdef\tf at institution{#1}}
-\institution{\@empty}
-
-\newcommand{\department}[1]{\gdef\tf at department{#1}}
-\department{\@empty}
-
-\newcommand{\location}[1]{\gdef\tf at location{#1}}
-\location{\@empty}
-
-% Renew \maketitle (for research papers default)
-\if at titlepage
- % Formatting for titlepage option
- \renewcommand{\maketitle}{%
- \begin{titlepage}%
- \tf at setfnpunct{}
- \renewcommand*{\thefootnote}{\fnsymbol{footnote}}
- \let\footnoterule\relax
- \normalfont\normalsize\centering\singlespacing
- \parskip=1\baselineskip
- \vspace*{-2\baselineskip}
- \vspace*{0.333\paperheight}
- \vspace*{-1in}
- { \bfseries\@title\par%
- \tf at subtitle\par}%
- \vspace*{2.35in}
- \@author\@thanks\par
- \tf at course\par
- \tf at submissioninfo\par
- \@date\par
- \parskip=\z@
- \end{titlepage}%
- \tf at emptymaketitle
- \cleardoublepage}
-\else
- % Formatting for notitlepage option
- \renewcommand{\maketitle}{%
- \thispagestyle{plain}
- { \renewcommand*{\thefootnote}{\fnsymbol{footnote}}
- \normalfont\normalsize\centering\singlespacing
- \parskip=1\baselineskip
- \vspace*{0.5in}
- \vspace*{-1.5\baselineskip}
- { \bfseries\@title\par%
- \tf at subtitle\par}%
- \vspace*{1\baselineskip}
- \@author\@thanks\par
- \tf at course\par
- \tf at submissioninfo\par
- \@date\par
- \vspace*{0.5in}
- \vspace*{-1\baselineskip}}
- \tf at emptymaketitle}
-\fi
-
-% Command for emptying/completing \maketitle
+% Title page: command for emptying/completing \maketitle
\newcommand{\tf at emptymaketitle}{%
% if not endnotes, reset footnote counter
- \if at endnotesformat
- \else
- \setcounter{footnote}{0}
- \fi
+ \if at endnotesformat \else \setcounter{footnote}{0} \fi
% Clear command content at end of \maketitle
\global\let\thanks\relax
@@ -476,10 +237,6 @@
\global\let\@date\@empty
\global\let\@title\@empty
\global\let\tf at subtitle\@empty
- \global\let\tf at course\@empty
- \global\let\tf at institution\@empty
- \global\let\tf at department\@empty
- \global\let\tf at location\@empty
\global\let\tf at submissioninfo\@empty
\global\let\title\relax
@@ -486,17 +243,16 @@
\global\let\author\relax
\global\let\date\relax
\global\let\subtitle\relax
- \global\let\course\relax
- \global\let\institution\relax
- \global\let\department\relax
- \global\let\location\relax
\global\let\submissioninfo\relax}
-% Table of Contents formatting
+% Table of Contents, Figures, and Tables: section number alignment adjustments
+\def\tflist at beforesecnum{}
+\def\tflist at aftersecnum{\hfil}
+\def\numberline#1{\hb at xt@\@tempdima{\tflist at beforesecnum #1\tflist at aftersecnum}}
-% Renew \tableofcontents with single spacing support
+% Table of Contents: renew \tableofcontents with single spacing support
\renewcommand{\tableofcontents}{%
\ifstrequal{\tf at topsecname}{chapter}%
{\pagestyle{plain}}%
@@ -512,73 +268,14 @@
\@starttoc{toc}%
\setstretch{2}}%
-% Right margin and number width formatting
-\def\@tocrmarg{0.5in}
-\def\@pnumwidth{0.2in}
+% Table of Contents: right margin and number width formatting
+\def\@tocrmarg{5em}
+\def\@pnumwidth{2.5em}
-\ifcsdef{chapter}%
- {% If \chapter defined...
- \setcounter{tocdepth}{0}
- \renewcommand*{\l at chapter}[2]{%
- \ifnum \c at tocdepth >\m at ne
- \addpenalty{-\@highpenalty}%
- \setlength\@tempdima{7.5em}%
- \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
- \penalty\@highpenalty}
- \fi}
+% Figures, Tables, and Illustrations
- \renewcommand*{\l at section}{%
- \ifnum \c at tocdepth >\z@ \vskip 1\baselineskip \fi
- \@dottedtocline{1}{1.5in}{\z@}}
-
- \renewcommand*{\l at subsection}{%
- \ifnum \c at tocdepth >1 \vskip 1\baselineskip \fi
- \@dottedtocline{2}{2.0in}{\z@}}
-
- \renewcommand*{\l at subsubsection}{%
- \ifnum \c at tocdepth >2 \vskip 1\baselineskip \fi
- \@dottedtocline{3}{2.5in}{\z@}}
- }%
- {% If \chapter not defined, \section used instead
- \setcounter{tocdepth}{1}
-
- \renewcommand*{\l at section}[2]{%
- \ifnum \c at tocdepth >\z@
- \addpenalty\@secpenalty
- \addvspace{1\baselineskip}%
- \setlength\@tempdima{\z@}%
- { \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}
- \fi}
-
- \renewcommand*{\l at subsection}{%
- \ifnum \c at tocdepth >1 \vskip 1\baselineskip \fi
- \@dottedtocline{2}{0.5in}{\z@}}
-
- \renewcommand*{\l at subsubsection}{%
- \ifnum \c at tocdepth >2 \vskip 1\baselineskip \fi
- \@dottedtocline{3}{1.0in}{\z@}}
- }
-
-
-% Figures, Tables, and Illustrations formatting
-
-% List label names of Figures and Tables
+% Figures and Tables: adjust list titles
\renewcommand{\listfigurename}{Figures}
\renewcommand{\listtablename}{Tables}
@@ -605,19 +302,6 @@
\@starttoc{lof}
\setstretch{2}}
-\renewcommand*{\l at figure}[2]{%
- \addpenalty{-\@highpenalty}%
- \setlength\@tempdima{0.5in}%
- \vskip 1\baselineskip
- { \parindent \z@
- \rightskip \@tocrmarg
- \parfillskip -\rightskip
- \leavevmode
- \advance\leftskip\@tempdima
- \hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb at xt@\@pnumwidth{\hss #2}\par
- \penalty\@highpenalty}}
-
% List of Tables
\renewcommand{\listoftables}{%
\expandafter\csname \tf at topsecname\endcsname*{\listtablename}%
@@ -627,8 +311,6 @@
\@starttoc{lot}
\setstretch{2}}
-\def\l at table{\l at figure}
-
% List of Illustrations
\newcommand{\listillustrationname}{Illustrations}
\def\tf at illustrsection{\normalfont\bfseries\normalsize\singlespacing\noindent}
@@ -655,7 +337,6 @@
\def\fps at table{!htb}
\def\fps at figure{!htb}
-
% Figures and Tables: caption formatting
\setlength\abovecaptionskip{\z@}
@@ -663,14 +344,12 @@
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
- \if at optraggedright
- \raggedright%
- \fi
+ \if at optraggedright \raggedright \fi
\small#1. #2\par
\vskip\belowcaptionskip}
-% Lists: enumerate and itemize
+% Lists: enumerate and itemize formatting
\setlength\leftmargini{1.5\parindent}
\setlength\leftmargin{\leftmargini}
@@ -681,7 +360,7 @@
\setlength\labelwidth{\parindent}
\addtolength\labelwidth{-\labelsep}
-% Formatting command for both enumerate and itemize
+% Lists: formatting command for both enumerate and itemize
\def\tf at listformat{%
\setlength\topsep{\z@}
\setlength\itemsep{\z@}
@@ -688,18 +367,16 @@
\setlength\parsep{\z@}
\setlength\listparindent{\parindent}}
-% Format of enumerate list labels
+% Lists (enumerate): 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
+% Lists (enumerate): redefine enumerate to include formatting command hook
\def\tf at enumerateformat{\tf at listformat}
\def\enumerate{%
- \ifnum
- \@enumdepth >\thr@@\@toodeep
- \else
+ \ifnum \@enumdepth >\thr@@\@toodeep \else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
\expandafter
@@ -710,12 +387,10 @@
\tf at enumerateformat}%
\fi}
-% Redefine itemize to include formatting command hook
+% Lists (itemize): redefine itemize to include formatting command hook
\def\tf at itemizeformat{\tf at listformat}
\def\itemize{%
- \ifnum
- \@itemdepth >\thr@@\@toodeep
- \else
+ \ifnum \@itemdepth >\thr@@\@toodeep \else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
\expandafter
@@ -726,10 +401,10 @@
\fi}
-% Block quotation formatting
-
+% Block quotation: formatting
\renewenvironment{quotation}
- { \list{}{%
+ {%
+ \list{}{%
\setlength\listparindent{\parindent}
\setlength\itemindent{\listparindent}
\setlength\leftmargin{\parindent}
@@ -745,14 +420,13 @@
{\setlength\topsep{\baselineskip}}%
{\setlength\topsep{\z@}}}%
\singlespacing%
- \item\relax}
+ \item\relax%
+ }
{\endlist}
-
-% Set quote environment to be the same as the quotation environment
\def\quote{\quotation}
-% Appendixes formatting
+% Appendixes: formatting
\AtEndPreamble{%
\let\tf at appendix\appendix
@@ -760,66 +434,9 @@
\newif\if at appendixes\@appendixesfalse
-% New appendixes environment
-\ifcsdef{chapter}%
- {% If \chapter defined...
- \newcounter{appendix}
-
- % appendixes environment resets figure and tables counts with "A." prefix
- \newenvironment{appendixes}%
- {%
- \@appendixestrue
- \@mainmattertrue
- \tf at appendix
- \def\tf at chapcounter{%
- \refstepcounter{appendix}
- \gdef\thechapter{\@Alph\c at appendix}}
- \setcounter{figure}{0}
- \setcounter{table}{0}
- \renewcommand{\thefigure}{A.\@arabic\c at figure}
- \renewcommand{\thetable}{A.\@arabic\c at table}
- }%
- {}%
- }%
- {% If \chapter not defined, using \section...
- % Adjust formatting of section headings for appendixes environment
- \def\tf at appendixsecfrmt{%
- \DeclareRobustCommand{\@seccntformat}[1]{%
- \ifstrequal{##1}{section}%
- {\appendixname\space \csname the##1\endcsname}%
- {\csname the##1\endcsname\quad}}
- \DeclareRobustCommand{\tf at secsep}[2]{%
- \ifstrequal{##1}{section}%
- {%
- \ifstrempty{##2}%
- {}%
- {%
- \par\nobreak
- \vspace{1\baselineskip}%
- }%
- }%
- {\@empty}}
- \def\tf at tocline##1{\appendixname\space \csname the##1\endcsname.\quad}
- \@tf at adjustsectiontrue}
- % Make appendixes environment
- \newenvironment{appendixes}%
- {%
- \@appendixestrue
- \setcounter{secnumdepth}{1}
- \tf at appendixsecfrmt
- \tf at appendix
- }%
- {%
- \setcounter{secnumdepth}{0}%
- \setcounter{section}{0}%
- \gdef\thesection{\@arabic\c at section}%
- }%
- }
+% thebibliography environment: formatting (adjust \@openbib at code hook default)
-
-% thebibliography environment formatting (adjust \@openbib at code hook default)
-
\setlength\bibindent{\parindent}
\renewcommand\@openbib at code{%
@@ -834,22 +451,21 @@
% biblatex-chicago: set formatting defaults
-% Provide warning if biblatex-chicago loaded before turabian-formatting
+% biblatex-chicago: provide warning if loaded before turabian-formatting
\@ifpackageloaded{biblatex-chicago}%
{%
\PackageWarningNoLine{turabian-formatting}{Loading the 'biblatex-chicago' package after the 'turabian-formatting' package is recommended. See documentation for more information}%
- }%
- {}
+ }{}
+% biblatex-chicago: pass options
\PassOptionsToPackage%
{isbn=false, autolang=other, footmarkoff, backend=biber}%
{biblatex-chicago}
-
\if at authordateformat
\PassOptionsToPackage{authordate}{biblatex-chicago}
\fi
-% Adjustments to \printbibliography formatting
+% biblatex-chicago: adjustments to \printbibliography formatting
\if at appendbibformat
\AtEndPreamble{%
\@ifpackageloaded{biblatex}%
@@ -864,12 +480,11 @@
\renewcommand{\bibsetup}{\singlespacing}
\renewcommand{\bibitemsep}{1\baselineskip}
\renewcommand{\bibhang}{0.5in}
- }%
- {}}
+ }{}}
\fi
-% endnotes package support: formatting
+% Endnotes: support and formatting
\if at endnotesformat
@@ -881,88 +496,27 @@
\PassOptionsToPackage{notetype=endonly}{biblatex-chicago}
- % Endnotes layout and formatting (based on if chapter is defined)
- \ifcsdef{chapter}%
- {% If \chapter defined...
- \let\tf at chapter\chapter
+ \AtEndPreamble{%
+ % Make endnotes use of "_" not a special character when in text mode
+ \appto{\enoteheading}{%
+ \catcode`_=12
+ \begingroup\lccode`~=`_
+ \lowercase{\endgroup\let~}\sb
+ \mathcode`_="8000}
- \@addtoreset{endnote}{chapter}
+ % 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{}%
+ }}}
- % Renew Notes heading formatted as \chapter* (also added to Table of Content)
- \renewcommand{\enoteheading}{%
- \tf at chapter*{\notesname}%
- \@mkboth{\MakeUppercase\notesname}{\MakeUppercase\notesname}%
- \addcontentsline{toc}{chapter}{\notesname}%
- \mbox{}\par%
- \vspace{-1.5\baselineskip}%
- \let\@afterindentfalse\@afterindenttrue
- \singlespacing}%
-
- % Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
- \RenewDocumentCommand{\chapter}{som}{%
- \IfBooleanTF{#1}%
- {% if \chapter*
- \tf at chapter*{#3}%
- \setcounter{endnote}{0}%
- \addtoendnotes{%
- \noexpand\tf at enotedivider%
- {\noexpand\section*}{\unexpanded{#3}}}%
- }%
- {% if \chapter
- \IfNoValueTF{#2}%
- {\tf at chapter{#3}}%
- {\tf at chapter[#2]{#3}}%
- \if at mainmatter
- \addtoendnotes{%
- \noexpand\tf at enotedivider%
- {\noexpand\section*}{\@chapapp\space \thechapter}}%
- \else
- \addtoendnotes{%
- \noexpand\tf at enotedivider%
- {\noexpand\section*}{\unexpanded{#3}}}%
- \fi
- }}
-
- % Empty subheading divider before \theendnotes for use with \tf at enotedivider
- \preto{\theendnotes}{%
- \addtoendnotes{\noexpand\tf at enotedivider{}{}}}
-
- % Make endnote divider if not followed by another endnote divider
- \def\tf at enotedivider#1#2{\@ifnextchar\tf at enotedivider{}{#1{#2}}}%
- }%
- {% If \chapter not defined, Notes heading formatted as \section*
- \renewcommand{\enoteheading}{%
- \section*{\notesname}%
- \markboth{\notesname}{\notesname}%
- \addcontentsline{toc}{section}{\notesname}%
- \mbox{}\par%
- \vspace{-1.5\baselineskip}%
- \let\@afterindentfalse\@afterindenttrue
- \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}{%
- \if at optraggedright
- \raggedright%
- \fi
+ \if at optraggedright \raggedright \fi
\setlength\parindent{\footnotemargin}
\vspace{1\baselineskip}
\theenmark.\,\,}
Modified: trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls 2016-07-19 22:26:51 UTC (rev 41733)
+++ trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls 2016-07-19 22:27:06 UTC (rev 41734)
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-researchpaper}[2016/07/12 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2016/07/18 Turabian Research Paper]
% Default point size
@@ -34,7 +34,7 @@
\def\@@ptsize{12pt}
-% Options for document class
+% Document class options: handling
\DeclareOption{raggedright}{%
\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
@@ -58,24 +58,20 @@
\DeclareOption{12pt}{\def\@@ptsize{12pt}}
-
-% Deprecated/removed options
\DeclareOption{emptymargins}{%
\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is no longer available}
- \PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
+ \OptionNotUsed}
\DeclareOption{endnotesonly}{%
\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option has been deprecated. Consider using the 'endnotes' option instead}
\OptionNotUsed}
-
-% Pass other options to article document class
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
-% Build upon article document class
+% Load "article" document class with options
\LoadClass[titlepage,oneside,onecolumn,\@@ptsize]{article}
@@ -83,3 +79,233 @@
\RequirePackage{turabian-formatting}
+% Sections: \section* adjustment to space after heading
+\newif\if at adjustssection\@adjustssectiontrue
+\newlength\tf at ssectafterskip
+\setlength\tf at ssectafterskip{1\p@}
+
+% Sections: command to disable differentiate and reformat \section*
+\gdef\noadjustssect{\@adjustssectionfalse}
+
+% Sections: adjustment to space after \section heading
+\newif\if at tf@adjustsection\@tf at adjustsectionfalse
+\newlength\tf at sectafterskip
+\setlength\tf at sectafterskip{1\p@}
+
+% Sections: redefine \@startsection to differentiate starred version
+\def\@startsection#1#2#3#4#5#6{%
+ \if at noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if at nobreak \everypar{} \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \setlength\tf at ssectafterskip{#5}
+ \if at adjustssection
+ \ifstrequal{#1}{section}%
+ {\setlength\tf at ssectafterskip{\tf at singlelineskip}}%
+ {}
+ \fi
+ \setlength\tf at sectafterskip{#5}
+ \if at tf@adjustsection
+ \ifstrequal{#1}{section}%
+ {\setlength\tf at sectafterskip{\tf at singlelineskip}}%
+ {}
+ \fi
+ \@ifstar
+ {\@ssect{#3}{#4}{\tf at ssectafterskip}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\tf at sectafterskip}{#6}}}}
+
+% Sections: formatting between \@svsec and heading
+\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}}
+
+% Sections: redefine \@sect to support optional two-line formatting
+\def\@sect#1#2#3#4#5#6[#7]#8{%
+ \ifnum #2>\c at secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected at edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \begingroup
+ #6{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M \tf at secsep{#1}{#8}#8\@@par}%
+ \endgroup
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c at secnumdepth \else
+ \tf at tocline{#1}%
+ \fi
+ #7}%
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax\@svsec #8}%
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c at secnumdepth \else
+ \protect\numberline{\csname the#1\endcsname\quad}%
+ \fi
+ #7}}%
+ \fi
+ \@xsect{#5}}
+
+
+% Title page: commands for use with \maketitle
+\newcommand{\course}[1]{\gdef\tf at course{#1}}
+\course{\@empty}
+
+% Title page: renew \maketitle command research paper
+\if at titlepage
+ % Formatting for titlepage option
+ \renewcommand{\maketitle}{%
+ \begin{titlepage}%
+ \tf at setfnpunct{}
+ \renewcommand*{\thefootnote}{\fnsymbol{footnote}}
+ \let\footnoterule\relax
+ \normalfont\normalsize\centering\singlespacing
+ \parskip=1\baselineskip
+ \vspace*{-2\baselineskip}
+ \vspace*{0.333\paperheight}
+ \vspace*{-1in}
+ { \bfseries\@title\par%
+ \tf at subtitle\par}%
+ \vspace*{2.35in}
+ \@author\@thanks\par
+ \tf at course\par
+ \tf at submissioninfo\par
+ \@date\par
+ \parskip=\z@
+ \end{titlepage}%
+ \tf at emptymaketitle
+ \global\let\tf at course\@empty
+ \global\let\course\relax
+ \cleardoublepage}
+\else
+ % Formatting for notitlepage option
+ \renewcommand{\maketitle}{%
+ \thispagestyle{plain}
+ { \renewcommand*{\thefootnote}{\fnsymbol{footnote}}
+ \normalfont\normalsize\centering\singlespacing
+ \parskip=1\baselineskip
+ \vspace*{0.5in}
+ \vspace*{-1.5\baselineskip}
+ { \bfseries\@title\par%
+ \tf at subtitle\par}%
+ \vspace*{1\baselineskip}
+ \@author\@thanks\par
+ \tf at course\par
+ \tf at submissioninfo\par
+ \@date\par
+ \vspace*{0.5in}
+ \vspace*{-1\baselineskip}}
+ \tf at emptymaketitle
+ \global\let\tf at course\@empty
+ \global\let\course\relax}
+\fi
+
+
+% Table of Contents: formatting
+
+\setcounter{tocdepth}{1}
+
+\renewcommand*{\l at section}[2]{%
+ \ifnum \c at tocdepth >\z@
+ \addpenalty\@secpenalty
+ \addvspace{1\baselineskip}%
+ \setlength\@tempdima{\z@}%
+ { \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}
+ \fi}
+
+\renewcommand*{\l at subsection}{%
+ \ifnum \c at tocdepth >1 \vskip 1\baselineskip \fi
+ \@dottedtocline{2}{0.5in}{\z@}}
+
+\renewcommand*{\l at subsubsection}{%
+ \ifnum \c at tocdepth >2 \vskip 1\baselineskip \fi
+ \@dottedtocline{3}{1.0in}{\z@}}
+
+
+% Figures and Tables: list 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}}
+\def\l at table{\l at figure}
+
+
+% Abstract: formatting
+\renewenvironment{abstract}%
+ {%
+ \clearpage
+ \section*{\abstractname}
+ }%
+ {\clearpage}
+
+
+% Appendixes: adjust formatting of section headings
+\def\tf at appendixsecfrmt{%
+ \DeclareRobustCommand{\@seccntformat}[1]{%
+ \ifstrequal{##1}{section}%
+ {\appendixname\space \csname the##1\endcsname}%
+ {\csname the##1\endcsname\quad}}
+ \DeclareRobustCommand{\tf at secsep}[2]{%
+ \ifstrequal{##1}{section}%
+ {\ifstrempty{##2}{}{\par\nobreak}}%
+ {\@empty}}
+ \def\tf at tocline##1{\appendixname\space \csname the##1\endcsname.\quad}
+ \@tf at adjustsectiontrue}
+
+% Appendixes: make environment
+\newenvironment{appendixes}%
+ {%
+ \@appendixestrue
+ \setcounter{secnumdepth}{1}
+ \tf at appendixsecfrmt
+ \tf at appendix
+ }%
+ {%
+ \setcounter{secnumdepth}{0}%
+ \setcounter{section}{0}%
+ \gdef\thesection{\@arabic\c at section}%
+ }%
+
+
+% Endnotes: Notes heading formatted as \section*
+\if at endnotesformat
+ \renewcommand{\enoteheading}{%
+ \section*{\notesname}%
+ \markboth{\notesname}{\notesname}%
+ \addcontentsline{toc}{section}{\notesname}%
+ \mbox{}\par%
+ \vspace{-1.5\baselineskip}%
+ \let\@afterindentfalse\@afterindenttrue
+ \singlespacing}%
+\fi
+
+
Modified: trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls 2016-07-19 22:26:51 UTC (rev 41733)
+++ trunk/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls 2016-07-19 22:27:06 UTC (rev 41734)
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-thesis}[2016/07/12 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2016/07/18 Turabian Theses and Dissertations]
% Default point size
@@ -34,7 +34,7 @@
\def\@@ptsize{12pt}
-% Options for document class
+% Document class options: handling
\DeclareOption{raggedright}{%
\PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
@@ -62,20 +62,16 @@
\DeclareOption{12pt}{\def\@@ptsize{12pt}}
-
-% Deprecated/removed options
\DeclareOption{emptymargins}{%
\ClassWarningNoLine{turabian-researchpaper}{The '\CurrentOption' option is no longer available}
- \PassOptionsToPackage{\CurrentOption}{turabian-formatting}}
+ \OptionNotUsed}
-
-% Pass other options to book document class
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
\ProcessOptions\relax
-% Build upon book document class
+% Load "book" document class with options
\LoadClass[titlepage,oneside,onecolumn,\@@ptsize]{book}
@@ -83,14 +79,124 @@
\RequirePackage{turabian-formatting}
-% Create binding offset of 0.5in
+% Binding offset: 0.5in
\setlength\oddsidemargin{0.5in}
-\setlength\evensidemargin{\z@}
-\addtolength\textwidth{-\oddsidemargin}
+\AtEndPreamble{%
+ \addtolength\textwidth{-\oddsidemargin}}
-% Renew \maketitle command for Thesis/Dissertation title page
+% Figures and tables: support for double numeration formatting
+\newif\if at doublenumerate\@doublenumeratetrue
+
+% Document structure: formatting
+
+\def\frontmatter{%
+ \cleardoublepage
+ \@mainmatterfalse
+ \pagenumbering{roman}
+ \pagestyle{empty}}
+
+\def\mainmatter{%
+ \cleardoublepage
+ \@mainmattertrue
+ \pagenumbering{arabic}
+ \pagestyle{headings}
+ \if at doublenumerate
+ \setcounter{tf at tempchapfcnt}{\value{figure}}
+ \setcounter{tf at tempchaptcnt}{\value{table}}
+ \fi
+ \addtocontents{toc}{\protect\addvspace{1\baselineskip}}}
+
+\def\backmatter{%
+ \if at openright \cleardoublepage \else \clearpage \fi
+ \@mainmatterfalse
+ \if at doublenumerate
+ \setcounter{chapter}{0}
+ \setcounter{figure}{\value{tf at tempchapfcnt}}
+ \setcounter{table}{\value{tf at tempchaptcnt}}
+ \fi
+ \addtocontents{toc}{\protect\addvspace{1\baselineskip}}}
+
+
+% Set top section command name to "chapter"
+\def\tf at topsecname{chapter}
+
+
+% Figures and tables: adjust counters based on @doublenumerate
+\newcounter{tf at tempchapfcnt}
+\newcounter{tf at tempchaptcnt}
+\def\tf at chapcounter{%
+ \if at doublenumerate
+ \if at mainmatter
+ \ifnum \c at chapter >\z@ \else
+ \setcounter{tf at tempchapfcnt}{\value{figure}}
+ \setcounter{tf at tempchaptcnt}{\value{table}}
+ \fi
+ \fi
+ \refstepcounter{chapter}
+ \else
+ \setcounter{tf at tempchapfcnt}{\value{figure}}
+ \setcounter{tf at tempchaptcnt}{\value{table}}
+ \refstepcounter{chapter}
+ \setcounter{figure}{\value{tf at tempchapfcnt}}
+ \setcounter{table}{\value{tf at tempchaptcnt}}
+ \fi}
+
+
+% Chapters: formatting
+\def\tf at chapformat{\normalfont\bfseries\normalsize\singlespacing\centering}
+\def\@chapter[#1]#2{%
+ \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}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \@makechapterhead{#2}%
+ \@afterheading}
+\def\@makechapterhead#1{%
+ { \tf at chapformat
+ \ifnum \c at secnumdepth >\m at ne
+ \if at mainmatter
+ \@chapapp\space \thechapter
+ \par\nobreak
+ \vspace*{1\baselineskip}%
+ \fi
+ \fi
+ \interlinepenalty\@M
+ \ifstrempty{#1}%
+ {}%
+ {#1\par\nobreak \vspace{1\baselineskip}}%
+ }}
+\def\@makeschapterhead#1{%
+ { \tf at chapformat
+ \interlinepenalty\@M
+ #1\par\nobreak
+ \vspace{1\baselineskip}}}
+
+
+% Title page: commands for use with \maketitle
+
+\newcommand{\institution}[1]{\gdef\tf at institution{#1}}
+\institution{\@empty}
+
+\newcommand{\department}[1]{\gdef\tf at department{#1}}
+\department{\@empty}
+
+\newcommand{\location}[1]{\gdef\tf at location{#1}}
+\location{\@empty}
+
+
+% Title page: renew \maketitle for thesis/dissertation
+
\submissioninfo{%
A Dissertation Submitted to\par
[Faculty]\par
@@ -132,6 +238,158 @@
\end{titlepage}%
\setcounter{page}{2}
\tf at emptymaketitle
+ \global\let\tf at institution\@empty
+ \global\let\tf at department\@empty
+ \global\let\tf at location\@empty
+ \global\let\institution\relax
+ \global\let\department\relax
+ \global\let\location\relax
\cleardoublepage}
+% Table of Contents: formatting
+
+\setcounter{tocdepth}{0}
+
+\renewcommand*{\l at chapter}[2]{%
+ \ifnum \c at tocdepth >\m at ne
+ \addpenalty{-\@highpenalty}%
+ \setlength\@tempdima{7.5em}%
+ \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
+ \penalty\@highpenalty}
+ \fi}
+
+\renewcommand*{\l at section}{%
+ \ifnum \c at tocdepth >\z@ \vskip 1\baselineskip \fi
+ \@dottedtocline{1}{1.5in}{\z@}}
+
+\renewcommand*{\l at subsection}{%
+ \ifnum \c at tocdepth >1 \vskip 1\baselineskip \fi
+ \@dottedtocline{2}{2.0in}{\z@}}
+
+\renewcommand*{\l at subsubsection}{%
+ \ifnum \c at tocdepth >2 \vskip 1\baselineskip \fi
+ \@dottedtocline{3}{2.5in}{\z@}}
+
+
+% Figures and Tables: conditional double numeration formatting
+
+\renewcommand{\thefigure}{%
+ \if at doublenumerate \ifnum \c at chapter>\z@ \thechapter.\fi\fi \@arabic\c at figure}
+
+\renewcommand{\thetable}{%
+ \if at doublenumerate \ifnum \c at chapter>\z@ \thechapter.\fi\fi \@arabic\c at table}
+
+% Figures and Tables: list 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}}
+\def\l at table{\l at figure}
+
+
+% Appendixes: formatting
+% appendixes environment resets figure and tables counts with "A." prefix
+
+\newcounter{appendix}
+
+\newenvironment{appendixes}%
+ {%
+ \@appendixestrue
+ \@mainmattertrue
+ \tf at appendix
+ \def\tf at chapcounter{%
+ \refstepcounter{appendix}
+ \gdef\thechapter{\@Alph\c at appendix}}
+ \if at doublenumerate
+ \setcounter{tf at tempchapfcnt}{\value{figure}}
+ \setcounter{tf at tempchaptcnt}{\value{table}}
+ \setcounter{figure}{0}
+ \setcounter{table}{0}
+ \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
+ \setcounter{figure}{\value{tf at tempchapfcnt}}
+ \setcounter{table}{\value{tf at tempchaptcnt}}
+ \fi
+ }%
+
+
+% Endnotes: layout and formatting
+
+\if at endnotesformat
+
+ \let\tf at chapter\chapter
+
+ \@addtoreset{endnote}{chapter}
+
+ % Renew Notes heading formatted as \chapter* (also added to Table of Content)
+ \renewcommand{\enoteheading}{%
+ \tf at chapter*{\notesname}%
+ \@mkboth{\MakeUppercase\notesname}{\MakeUppercase\notesname}%
+ \addcontentsline{toc}{chapter}{\notesname}%
+ \mbox{}\par%
+ \vspace{-1.5\baselineskip}%
+ \let\@afterindentfalse\@afterindenttrue
+ \singlespacing}%
+
+ % Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
+ \RenewDocumentCommand{\chapter}{som}{%
+ \IfBooleanTF{#1}%
+ {% if \chapter*
+ \tf at chapter*{#3}%
+ \setcounter{endnote}{0}%
+ \addtoendnotes{%
+ \noexpand\tf at enotedivider%
+ {\noexpand\section*}{\unexpanded{#3}}}%
+ }%
+ {% if \chapter
+ \IfNoValueTF{#2}%
+ {\tf at chapter{#3}}%
+ {\tf at chapter[#2]{#3}}%
+ \setcounter{endnote}{0}%
+ \if at mainmatter
+ \addtoendnotes{%
+ \noexpand\tf at enotedivider%
+ {\noexpand\section*}{\@chapapp\space \thechapter}}%
+ \else
+ \addtoendnotes{%
+ \noexpand\tf at enotedivider%
+ {\noexpand\section*}{\unexpanded{#3}}}%
+ \fi
+ }}
+
+ % Empty subheading divider before \theendnotes for use with \tf at enotedivider
+ \preto{\theendnotes}{%
+ \addtoendnotes{\noexpand\tf at enotedivider{}{}}}
+
+ % Make endnote divider if not followed by another endnote divider
+ \def\tf at enotedivider#1#2{\@ifnextchar\tf at enotedivider{}{#1{#2}}}%
+
+\fi
+
+
More information about the tex-live-commits
mailing list