From 1c0ada95b9f2e2d9dd151cf8d8487f9430ff1db9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Dec 2014 00:31:15 +0000 Subject: turabian-formatting (11dec14) git-svn-id: svn://tug.org/texlive/trunk@35790 c570f23f-e606-0410-a88d-b1316a301751 --- .../turabian-formatting/turabian-formatting.sty | 29 ++++++---- .../turabian-formatting/turabian-researchpaper.cls | 7 ++- .../latex/turabian-formatting/turabian-thesis.cls | 62 ++++++++++++++++------ 3 files changed, 67 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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 -- cgit v1.2.3