From ce111182f0ecbdc3d83fa92b13dc125370af7280 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Dec 2014 23:22:51 +0000 Subject: turabian-formatting (27dec14) git-svn-id: svn://tug.org/texlive/trunk@35917 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/turabian-formatting/README | 9 ++++- .../turabian-formatting-doc.pdf | Bin 94219 -> 94667 bytes .../turabian-formatting-doc.tex | 31 ++++++++------- .../turabian-formatting/turabian-formatting.sty | 43 ++++++++------------- .../turabian-formatting/turabian-researchpaper.cls | 2 +- .../latex/turabian-formatting/turabian-thesis.cls | 40 +++---------------- 6 files changed, 48 insertions(+), 77 deletions(-) diff --git a/Master/texmf-dist/doc/latex/turabian-formatting/README b/Master/texmf-dist/doc/latex/turabian-formatting/README index 98843916f52..219653d4086 100644 --- a/Master/texmf-dist/doc/latex/turabian-formatting/README +++ b/Master/texmf-dist/doc/latex/turabian-formatting/README @@ -1,4 +1,4 @@ -Turabian Formatting for LaTeX (2014/12/10) +Turabian Formatting for LaTeX (2014/12/27) This package provides Chicago-style formatting based on Kate L. Turabian's "A Manual for Writers of Research Papers, Theses, and @@ -31,6 +31,13 @@ directory. This is usually the texmf/tex/latex/ directory. UPDATES +2014/12/27 + +- Improved documentation as well as adjustments to both subsection +titles and title page formatting for both research papers and +theses/dissertations. + + 2014/12/10 - Updated formatting and documentation to better-conform with the 8th 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 index c1ed894a7fd..8a1ac6af76b 100644 Binary files a/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf and b/Master/texmf-dist/doc/latex/turabian-formatting/turabian-formatting-doc.pdf differ 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 1964b2f749e..3becfb3fdb0 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/10 +% Last updated: 2014/12/27 % % Corresponding package items: -% 2014/12/10 Turabian Formatting -% 2014/12/10 Turabian Research Paper -% 2014/12/10 Turabian Theses and Dissertations +% 2014/12/27 Turabian Formatting +% 2014/12/27 Turabian Research Paper +% 2014/12/27 Turabian Theses and Dissertations % @@ -109,7 +109,7 @@ For citations, this package provides optional support for David Fussner's outsta To format a document with this package, one can load the \texttt{turabian-formatting} package in the \LaTeX{} source file preamble. Alternatively, the document class can be specified as either a research paper (\texttt{turabian-researchpaper}) or a thesis/dissertation (\texttt{turabian-thesis}). -\subsection{Package for Turabian-style formatting} +\subsection{Package for Turabian-Style Formatting} \marginnote{turabian-\newline formatting}% The \texttt{turabian-formatting} package is loaded in the preamble of the source file:\footnote{ @@ -121,7 +121,7 @@ The \texttt{turabian-formatting} package is loaded in the preamble of the source \underline{Important note}: The \texttt{turabian-formatting} package should always be loaded \emph{before} loading the \texttt{biblatex-chicago} package. \newpage -\subsection{Document class for Research Papers} +\subsection{Document Class for Research Papers} \marginnote{turabian-\newline researchpaper}% The \texttt{turabian-researchpaper} document class provides formatting specific to research papers. The requisite code: @@ -132,7 +132,7 @@ The \texttt{turabian-researchpaper} document class provides formatting specific This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{article} document class. -\subsection{Document class for Theses and Dissertations} +\subsection{Document Class for Theses and Dissertations} \marginnote{turabian-thesis}% The \texttt{turabian-thesis} document class offers formatting specific to theses and dissertations. The requisite code: @@ -148,7 +148,7 @@ This document class builds on the \texttt{turabian-formatting} package and is ba \subsection{Standard Options for Document Classes} Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support many of the standard document class options.\footnote{ - Neither the \texttt{notitlepage} nor the \texttt{twocolumn} options are available with either document class.} + Neither the \texttt{notitlepage} nor the \texttt{twocolumn} options are available for either document class.} The default page size, for both document classes, is 8\nicefrac{1}{2} × 11 inches (US Letter size). The normal font size is 12pt. @@ -179,10 +179,10 @@ 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 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. +By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature."\footnote{Kate L. Turabian, \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th ed. (University of Chicago Press, 2013), 404.} For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option. -\subsection{Adjustments to \texttt{biblatex-chicago} formatting} +\subsection{Adjustments to \texttt{biblatex-chicago} Formatting} \marginnote{noadjustbib}% Reformatting support for \texttt{biblatex-chicago} can be disabled using the \texttt{nodajustbib} formatting option. This affects adjustments to the formatting of footnotes and endnotes, as well as changes to both the headings and spacing in the bibliography. @@ -235,7 +235,7 @@ Text indicating the draft status of the document is only found on pages that use \marginnote{\textbackslash maketitle}% To create a title page, you can use the standard \texttt{\textbackslash maketitle} command along with \texttt{\textbackslash title}, \texttt{\textbackslash author}, and \texttt{\textbackslash date}.\footnote{% - By default, a separate title page is created with the \texttt{\textbackslash maketitle} command. The \texttt{notitlepage} for standard document classes (and default for the \texttt{article} document class) is no longer available.} + By default, a separate title page is created with the \texttt{\textbackslash maketitle} command. This default behaviour can be disabled when a \texttt{notitlepage} option is specified when loading \texttt{turabian-formatting} as a package. This option, however, is not available for either the \texttt{turabian-researchpaper} or \texttt{turabian-thesis} document classes.} Both \texttt{formatting-turabian} and \texttt{turabian-researchpaper}, by default, produce a title page intended for research papers. Page numbering begins immediately following the title page. @@ -243,7 +243,7 @@ The following optional commands are also available for use with the title page ( \marginnote{\textbackslash setwordcount}% -The optional \texttt{\textbackslash setwordcount} command inserts text at the bottom right of the title page---text intended for an optional word count sometimes required in the submission of research papers. The inclusion of the word count does \underline{not} affect the vertical positioning of text on the title page. +The optional \texttt{\textbackslash setwordcount} command inserts text at the bottom right of the title page---text intended for an optional word count sometimes required in the submission of research papers. \marginnote{\textbackslash mytitlepage}% To implement a custom title page, renew the optional \texttt{\textbackslash mytitlepage} command with your text written with \LaTeX{}. This can include reference to another \texttt{.tex} file. For example: @@ -255,7 +255,7 @@ To implement a custom title page, renew the optional \texttt{\textbackslash myti \end{lstlisting} -\subsubsection{Thesis/dissertation title page} +\subsubsection{Thesis/Dissertation Title Page} \label{subsubsec:td_titlepage} The \texttt{turabian-thesis} document class provides a title page intended for a thesis or dissertation. In addition to the commands noted above, this document class provides commands that can be placed in the header. This includes: \texttt{\textbackslash faculty}, \texttt{\textbackslash mydegree}, \texttt{\textbackslash department}, and \texttt{\textbackslash location}. @@ -333,8 +333,11 @@ This package requires \LaTeX{}2e and makes use of the following packages install \section{Updates} \label{sec:updates} +\marginnote{\rmfamily{2014/12/27}}% +Improved documentation as well as adjustments to both subsection titles and title page formatting for both research papers and theses/dissertations. + \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}. +Update to formatting and documentation based on the 8th edition of Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations}. 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 9f9951c3ab7..786475d0935 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-formatting.sty @@ -33,7 +33,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{turabian-formatting}[2014/12/10 Turabian Formatting] +\ProvidesPackage{turabian-formatting}[2014/12/27 Turabian Formatting] % Flags adjusted with package options @@ -224,8 +224,6 @@ \RequirePackage{titlesec} \titleformat{\chapter}[display]% - % 7th Edition - % {\normalfont\mdseries\normalsize\singlespacing\centering}% {\normalfont\bfseries\normalsize\singlespacing\centering}% {Chapter \thechapter}% {1\baselineskip}% @@ -246,7 +244,7 @@ {0pt} \titleformat{\subsection}[block]% - {\normalfont\mdseries\normalsize\singlespacing\centering}% + {\normalfont\mdseries\itshape\normalsize\singlespacing\centering}% {}% {0pt}% {} @@ -283,46 +281,40 @@ \setwordcount{} -% Title Page: reformat \maketitle (Research Paper default) +% Title Page default: reformat \maketitle (Research Paper) + +\newcommand{\@makewordcount}{% + \ifthenelse{\equal{\@wordcount}{}}% + {} + {\hspace*{\fill}\@wordcount} +} \if@maketitlepage \renewcommand{\thanks}[1]{\def\@thanks{#1}} \thanks{} - \newcommand{\@makewordcount}{% - \ifthenelse{\equal{\@wordcount}{}}% - {}% - {% - \hspace*{\fill} - \vspace{-1\baselineskip} - \@wordcount\ words% - } - } \renewcommand{\mytitlepage}{% - \vspace*{\stretch{1}} + \vspace*{-1.2\baselineskip} + \vspace*{0.333\paperheight} + \vspace*{-1in} \ifthenelse{\equal{\@subtitle}{}}% {% - % 7th Edition - % \uppercase\expandafter{\@title}\par% - {\bfseries\@title}% + {\bfseries\@title}\par% }% {% - % 7th Edition - % \MakeUppercase{\@title}:\par - % \MakeUppercase{\@subtitle}\par% - {\bfseries\@title}\par - \vspace*{1\baselineskip} + {\bfseries\@title :}\par + \vspace*{0.833\baselineskip} {\bfseries\@subtitle}\par% } - \vspace*{1in} \vspace*{\stretch{1}} - \doublespacing + \parskip=0.833\baselineskip \@author\par \@thanks\par \@course\par \@institution\par \@date\par + \parskip=0pt \vspace*{\stretch{1}} \@makewordcount% } @@ -331,7 +323,6 @@ \newgeometry{margin=1in, ignoreall, noheadfoot} \thispagestyle{empty} {\normalfont\normalsize\centering\singlespacing - \vspace*{-1\baselineskip} \mytitlepage} \clearpage \restoregeometry 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 24fd8433b57..eb54ecea50d 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-researchpaper.cls @@ -25,7 +25,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-researchpaper}[2014/12/10 Turabian Research Paper] +\ProvidesClass{turabian-researchpaper}[2014/12/27 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 ad2518144de..e60759532c1 100644 --- a/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls +++ b/Master/texmf-dist/tex/latex/turabian-formatting/turabian-thesis.cls @@ -25,7 +25,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{turabian-thesis}[2014/12/10 Turabian Theses and Dissertations] +\ProvidesClass{turabian-thesis}[2014/12/27 Turabian Theses and Dissertations] @@ -80,39 +80,9 @@ \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}} + \vspace*{-1.2\baselineskip} + \parskip=0.833\baselineskip \@institution\par \vspace*{\stretch{1}} \ifthenelse{\equal{\@subtitle}{}}% @@ -120,7 +90,7 @@ {\bfseries\@title}\par% }% {% - {\bfseries\@title}\par + {\bfseries\@title :}\par {\bfseries\@subtitle}\par% } \vspace*{\stretch{1}} @@ -136,7 +106,7 @@ \vspace*{\stretch{1}} \@location\par \@date - \vspace*{\stretch{0.5}} + \parskip=0pt \end{center} \clearpage \singlespacing -- cgit v1.2.3