diff options
6 files changed, 133 insertions, 67 deletions
diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README index 788b67365cf..98843916f52 100644 --- a/Master/texmf-dist/doc/latex/turabian-formatting/README +++ b/Master/texmf-dist/doc/latex/turabian-formatting/README @@ -1,39 +1,61 @@ -The "Turabian Formatting for LaTeX" Package +Turabian Formatting for LaTeX (2014/12/10) +This package provides Chicago-style formatting based on Kate L. +Turabian's "A Manual for Writers of Research Papers, Theses, and +Dissertations: Chicago Style for Students and Researchers" (8th +edition). In doing, so, this package adheres closely to the formatting +guidelines described in Turabian's work while, also, being readily +adaptable to additional formatting requirements (ie. formatting +requirements specific to an institution and/or department). -============================== -Copyright 2013 Omar Abdool +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 .tex file). -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 option) any later version. +For citations, this package provides optional support for David +Fussner's outstanding (and highly-recommended) biblatex-chicago. -The latest version of this license is in: - http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. +For more information on using the package, refer to the accompanying +manual, turabian-formatting-doc.pdf, included in this package. -LPPL Maintenance Status: maintained (by Omar Abdool) -This work consists of the files: turabian-formatting.sty, turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, and turabian-formatting-doc.pdf (in addition to this README file). +INSTALLATION +To install this package, place the turabian-formatting directory (with +its files) in the appropriate subdirectory of your local texmf +directory. This is usually the texmf/tex/latex/ directory. -============================== -Description of Package (an introduction) -This package provides Chicago-style formatting based on Kate L. Turabian's "A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers" (7th edition). In doing, so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily adaptable to additional formatting requirements (ie. formatting requirements specific to an institution and/or department). +UPDATES -More so, 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 .tex file). +2014/12/10 -For citations, this package provides optional support for David Fussner's outstanding (and highly-recommended) biblatex-chicago. +- Updated formatting and documentation to better-conform with the 8th +edition of Turabian's "A Manual for Writers of Research Papers, Theses, +and Dissertations." -For mor information on using the package, refer to the accompanying manual, turabian-formatting-doc.pdf included in this package. +- Changes to wording, formatting, and organization of README. ============================== -Installation +Copyright 2013 Omar Abdool -To install this package, place the turabian-formatting directory (with its files) in the appropriate subdirectory of your local texmf directory. This is usually the texmf/tex/latex/ directory. +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 option) any later version. +The latest version of this license is in: +http://www.latex-project.org/lppl.txt and version 1.3 or later is part +of all distributions of LaTeX version 2005/12/01 or later. -============================== -Last updated: 2014/12/09 +LPPL Maintenance Status: maintained (by Omar Abdool) + +This work consists of the files: turabian-formatting.sty, +turabian-researchpaper.cls, turabian-thesis.cls, +turabian-formatting-doc.tex, and turabian-formatting-doc.pdf (in +addition to this README file). diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf Binary files differindex 6fedd0a72f8..c1ed894a7fd 100644 --- a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf +++ b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex index 2c32f407d96..1964b2f749e 100644 --- a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex +++ b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.tex @@ -18,12 +18,12 @@ % turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). % % ============================== -% Last updated: 2014/12/09 +% Last updated: 2014/12/10 % % Corresponding package items: -% 2014/12/09 Turabian Formatting -% 2014/12/09 Turabian Research Paper -% 2014/12/09 Turabian Theses and Dissertations +% 2014/12/10 Turabian Formatting +% 2014/12/10 Turabian Research Paper +% 2014/12/10 Turabian Theses and Dissertations % @@ -75,7 +75,7 @@ \renewcommand{\abstractname}{\vspace{-\baselineskip}} \begin{abstract} -\noindent This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers} (7th 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} (8th edition). \end{abstract} @@ -95,9 +95,9 @@ \section{Introduction} \label{sec:introduction} -This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 7th edition. In doing so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily adaptable to additional formatting requirements (ie. formatting requirements specific to an institution and/or department). +This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th edition. In doing so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily adaptable to additional formatting requirements (ie. formatting requirements specific to an institution and/or department). -More so, 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). +It is hoped that authors will find this package relatively easy to implement. There are few (if any) new commands to learn, as the package builds upon (and makes adjustments to) already-existing \LaTeX{} commands. As such, formatting research papers, theses, and dissertations should require a minimum amount of changes to a standard \LaTeX{} source file (your \texttt{.tex} file). For citations, this package provides optional support for David Fussner's outstanding (and highly-recommended) \texttt{biblatex-chicago}. @@ -179,7 +179,7 @@ The \texttt{emptymargins} option removes headers and footers from within the mar \subsection{Ragged Right (Left Align) Text} \marginnote{raggedright}% -By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to left justify (with a `ragged' right margin)."\footnote{Kate L. Turabian, \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 7th ed. (University of Chicago Press, 2007), 292, 405.} To use ragged right formatting throughout the work, use the \texttt{raggedright} option. +By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin."\footnote{Kate L. Turabian, \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th ed. (University of Chicago Press, 2013), 404.} To use ragged right formatting throughout the work, use the \texttt{raggedright} option. \subsection{Adjustments to \texttt{biblatex-chicago} formatting} @@ -203,7 +203,7 @@ For research papers, endnotes can be used instead of footnotes. The \texttt{endn \marginnote{\textbackslash setpageidentifier}% Optional text (a page identifier) can be placed in the header.\footnote{% - Turabian, 376.} + Turabian, 374.} This text is specified using the \texttt{\textbackslash setpageidentifier} command in the preamble of the \LaTeX{} source file. \begin{lstlisting} @@ -259,17 +259,17 @@ To implement a custom title page, renew the optional \texttt{\textbackslash myti \label{subsubsec:td_titlepage} The \texttt{turabian-thesis} document class provides a title page intended for a thesis or dissertation. In addition to the commands noted above, this document class provides commands that can be placed in the header. This includes: \texttt{\textbackslash faculty}, \texttt{\textbackslash mydegree}, \texttt{\textbackslash department}, and \texttt{\textbackslash location}. -Unlike research papers, the title page of a thesis or dissertation is included in the front matter, as page i (although the page number is not placed on the page itself).\footnote{Turabian, 386.} +Unlike research papers, the title page of a thesis or dissertation is included in the front matter, as page i (although the page number is not placed on the page itself).\footnote{Turabian, 376.} \subsection{Captions and Table Footnotes} Captions, for both figures and tables, are implemented using (and can be altered through) the \texttt{caption} package. -A table, Turabian describes, can also have four kinds of footnotes: ``(1) source lines \dots, (2) general footnotes that apply to the whole table, (3) footnotes that apply to specific parts of the table, and (4) notes on levels of statistical significance."\footnote{Turabian, 367.} +A table, Turabian describes, can also have four kinds of footnotes: ``(1) source lines \dots, (2) general footnotes that apply to the whole table, (3) footnotes that apply to specific parts of the table, and (4) notes on levels of statistical significance."\footnote{Turabian, 366.} \marginnote{\textbackslash tablesource}% -The optional \texttt{\textbackslash tablesource} command creates a source line to cite the source material of the table.\footnote{Ibid., 361--362.} +The optional \texttt{\textbackslash tablesource} command creates a source line to cite the source material of the table.\footnote{Ibid., 360--361.} \marginnote{\textbackslash tablenote}% The optional \texttt{\textbackslash tablenote} command allows the inclusion of a footnote belonging to the table. It can be repeatedly used for each footnote accompanying the table.\footnote{A footnote mark, however, is \underline{not} generated by the \texttt{\textbackslash tablenote} command. This must either be done manually or through the use of another package.} @@ -292,19 +292,19 @@ The following is an example accompanying the use of the \texttt{tabular} environ \subsection{Document Structure for Thesis/Dissertation} \label{subsec:td_structure} -A thesis/dissertation is divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter.\footnote{Turabian, 377.} +A thesis/dissertation is divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter.\footnote{Turabian, 375.} \marginnote{\textbackslash frontmatter}% -The front matter is declared with the \texttt{\textbackslash frontmatter} command. Page headers and footers are empty using the \texttt{empty} page style (refer to section~\ref{sec:page_styles}). The numbering of pages in the front matter begins with the title page, although page numbers are not placed on pages until the table of contents.\footnote{Turabian, 386--387.} +The front matter is declared with the \texttt{\textbackslash frontmatter} command. Page headers and footers are empty using the \texttt{empty} page style (refer to section~\ref{sec:page_styles}). The numbering of pages in the front matter begins with the title page, although page numbers are not placed on pages until the table of contents.\footnote{Turabian, 373--374, 376, 380.} \marginnote{\textbackslash tableofcontents}% -The \texttt{\textbackslash tableofcontents} command is used to place the table of contents in the front matter. With the use of this command, page numbering appears on pages with the table of contents and subsequent pages of the front matter. Page numbers use roman numerals and are placed in centre of the footer using the \texttt{plain} page style (refer to section~\ref{sec:page_styles}).\footnote{Ibid., 387.} +The \texttt{\textbackslash tableofcontents} command is used to place the table of contents in the front matter. With the use of this command, page numbering appears on pages with the table of contents and subsequent pages of the front matter. Page numbers use roman numerals and are placed in centre of the footer using the \texttt{plain} page style (refer to section~\ref{sec:page_styles}).\footnote{Ibid., 373--374.} \marginnote{\textbackslash mainmatter}% -The main matter (or text of the paper) begins with the \texttt{\textbackslash mainmatter} command. Page numbering restarts with arabic numerals, beginning with page 1. Page numbers are placed on the right-side of the header, using the \texttt{headings} page style (with the exception of the first page of each chapter, instead using the \texttt{plain} page style).\footnote{Ibid., 391.} +The main matter (or text of the paper) begins with the \texttt{\textbackslash mainmatter} command. Page numbering restarts with arabic numerals, beginning with page 1. Page numbers are placed on the right-side of the header, using the \texttt{headings} page style (with the exception of the first page of each chapter, instead using the \texttt{plain} page style).\footnote{Ibid.} \marginnote{\textbackslash backmatter}% -The back matter is declared using the \texttt{\textbackslash backmatter} command. Page numbering and page styles are continued from the main matter.\footnote{Ibid., 399.} +The back matter is declared using the \texttt{\textbackslash backmatter} command. Page numbering and page styles are continued from the main matter.\footnote{Ibid.} @@ -330,6 +330,14 @@ This package requires \LaTeX{}2e and makes use of the following packages install +\section{Updates} +\label{sec:updates} + +\marginnote{\rmfamily{2014/12/10}}% +Update to formatting titles to better-comply with the 8th edition of Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations}. + + + \section{Known Bugs} \label{sec:bugs} diff --git a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty index 8c097d801ab..9f9951c3ab7 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty @@ -1,6 +1,6 @@ -% Provides Turabian-style Chicago formatting for LaTeX +% 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 (7th edition) +% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== % Copyright 2013 Omar Abdool @@ -20,7 +20,6 @@ % turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). % % ============================== -% Last updated: 2014/12/09 % % Documented errors from required packages (ignore): % - LaTeX warning: "xparse/redefine-command" @@ -30,10 +29,11 @@ % - package must be loaded before biblatex-chicago to work properly; % - known bug: use of geometry showframe option and plain page style with emptymargins option % +% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{turabian-formatting}[2014/12/09 Turabian Formatting] +\ProvidesPackage{turabian-formatting}[2014/12/10 Turabian Formatting] % Flags adjusted with package options @@ -224,7 +224,9 @@ \RequirePackage{titlesec} \titleformat{\chapter}[display]% - {\normalfont\mdseries\normalsize\singlespacing\centering}% + % 7th Edition + % {\normalfont\mdseries\normalsize\singlespacing\centering}% + {\normalfont\bfseries\normalsize\singlespacing\centering}% {Chapter \thechapter}% {1\baselineskip}% {} @@ -241,7 +243,7 @@ \titlespacing*{\section}% {0em}% {0.5\baselineskip}% - {0.5\baselineskip} + {0pt} \titleformat{\subsection}[block]% {\normalfont\mdseries\normalsize\singlespacing\centering}% @@ -251,7 +253,7 @@ \titlespacing*{\subsection}% {0em}% {0.5\baselineskip}% - {0.5\baselineskip} + {0pt} \titleformat{\subsubsection}[block]% {\normalfont\mdseries\normalsize\singlespacing\raggedright}% @@ -301,14 +303,21 @@ \vspace*{\stretch{1}} \ifthenelse{\equal{\@subtitle}{}}% {% - \uppercase\expandafter{\@title}\par% + % 7th Edition + % \uppercase\expandafter{\@title}\par% + {\bfseries\@title}% }% {% - \MakeUppercase{\@title}:\par - \MakeUppercase{\@subtitle}\par% + % 7th Edition + % \MakeUppercase{\@title}:\par + % \MakeUppercase{\@subtitle}\par% + {\bfseries\@title}\par + \vspace*{1\baselineskip} + {\bfseries\@subtitle}\par% } \vspace*{1in} \vspace*{\stretch{1}} + \doublespacing \@author\par \@thanks\par \@course\par diff --git a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls index c21130b4d09..24fd8433b57 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls @@ -1,6 +1,6 @@ -% Provides Turabian-style Chicago formatting for Research Papers +% Turabian Formatting for LaTeX -- Research Papers % -% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A Manual for Writers of Research Papers, Theses, and Dissertations (7th edition) +% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== % Copyright 2013 Omar Abdool @@ -20,13 +20,12 @@ % turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). % % ============================== -% Last updated: 2014/12/09 % % \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-researchpaper}[2014/12/09 Turabian Research Paper] +\ProvidesClass{turabian-researchpaper}[2014/12/10 Turabian Research Paper] % Flags adjusted with class options diff --git a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls index f29ce939b58..ad2518144de 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls @@ -1,6 +1,6 @@ -% Provides Turabian-style Chicago formatting for Theses and Dissertations +% Turabian Formatting for LaTeX -- Theses and Dissertations % -% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A Manual for Writers of Research Papers, Theses, and Dissertations (7th edition) +% Based on the Chicago Manual of Style (16th edition) and Kate Turabian's A Manual for Writers of Research Papers, Theses, and Dissertations (8th edition) % % ============================== % Copyright 2013 Omar Abdool @@ -20,13 +20,12 @@ % turabian-researchpaper.cls, turabian-thesis.cls, turabian-formatting-doc.tex, % and turabian-formatting-doc.pdf (in addition to this README file). % % ============================== -% Last updated: 2014/12/09 % % \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-thesis}[2014/12/09 Turabian Theses and Dissertations] +\ProvidesClass{turabian-thesis}[2014/12/10 Turabian Theses and Dissertations] @@ -82,32 +81,61 @@ \renewcommand{\maketitle}{% \normalfont\normalsize \doublespacing +% 7th Edition +% \begin{center} +% \vspace*{-1\baselineskip} +% \vspace*{\stretch{0.5}} +% \MakeUppercase{\@institution}\par +% \vspace*{\stretch{1}} +% \ifthenelse{\equal{\@subtitle}{}}% +% {% +% \uppercase\expandafter{\@title}\par% +% }% +% {% +% \MakeUppercase{\@title}:\par +% \MakeUppercase{\@subtitle}\par% +% } +% \vspace*{\stretch{1}} +% \MakeUppercase{A Dissertation Submitted to}\par +% \MakeUppercase{\@faculty}\par +% \MakeUppercase{in Candidacy for the Degree of}\par +% \MakeUppercase{\@mydegree}\par +% \vspace*{1\baselineskip} +% \MakeUppercase{\@department}\par +% \vspace*{\stretch{1}} +% BY\par +% \MakeUppercase{\@author}\par +% \vspace*{\stretch{1}} +% \MakeUppercase{\@location}\par +% \MakeUppercase{\@date} +% \vspace*{\stretch{0.5}} +% \end{center} \begin{center} \vspace*{-1\baselineskip} \vspace*{\stretch{0.5}} - \MakeUppercase{\@institution}\par + \@institution\par \vspace*{\stretch{1}} \ifthenelse{\equal{\@subtitle}{}}% {% - \uppercase\expandafter{\@title}\par% + {\bfseries\@title}\par% }% {% - \MakeUppercase{\@title}:\par - \MakeUppercase{\@subtitle}\par% + {\bfseries\@title}\par + {\bfseries\@subtitle}\par% } \vspace*{\stretch{1}} - \MakeUppercase{A Dissertation Submitted to}\par - \MakeUppercase{\@faculty}\par - \MakeUppercase{in Candidacy for the Degree of}\par - \MakeUppercase{\@mydegree}\par + A Dissertation Submitted to\par + \@faculty\par + in Candidacy for the Degree of\par + \@mydegree\par \vspace*{1\baselineskip} - \MakeUppercase{\@department}\par + \@department\par \vspace*{\stretch{1}} - BY\par - \MakeUppercase{\@author}\par + by\par + {\bfseries\@author}\par \vspace*{\stretch{1}} - \MakeUppercase{\@location}\par - \MakeUppercase{\@date} + \@location\par + \@date \vspace*{\stretch{0.5}} \end{center} \clearpage |