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 --- .../turabian-formatting/turabian-formatting.sty | 43 +++++++++------------- .../turabian-formatting/turabian-researchpaper.cls | 2 +- .../latex/turabian-formatting/turabian-thesis.cls | 40 +++----------------- 3 files changed, 23 insertions(+), 62 deletions(-) (limited to 'Master/texmf-dist/tex') 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