From 93d76f7f0046e5023c836e1b7a5bac6dabad3fd9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 18 Aug 2020 03:01:54 +0000 Subject: CTAN sync 202008180301 --- macros/latex/contrib/mlacls/mla-example.pdf | Bin 2654820 -> 2697315 bytes macros/latex/contrib/mlacls/mla-example.tex | 2 +- macros/latex/contrib/mlacls/mla.dtx | 57 ++++++++++++---------------- macros/latex/contrib/mlacls/mla.pdf | Bin 312047 -> 301548 bytes 4 files changed, 26 insertions(+), 33 deletions(-) (limited to 'macros/latex/contrib/mlacls') diff --git a/macros/latex/contrib/mlacls/mla-example.pdf b/macros/latex/contrib/mlacls/mla-example.pdf index 43abfb7c37..8bebefb590 100644 Binary files a/macros/latex/contrib/mlacls/mla-example.pdf and b/macros/latex/contrib/mlacls/mla-example.pdf differ diff --git a/macros/latex/contrib/mlacls/mla-example.tex b/macros/latex/contrib/mlacls/mla-example.tex index 8b9d624c3b..0d7bc93f0f 100644 --- a/macros/latex/contrib/mlacls/mla-example.tex +++ b/macros/latex/contrib/mlacls/mla-example.tex @@ -1,4 +1,4 @@ -\documentclass[mla7,microtype]{mla} +\documentclass[mla8]{mla} \title{Sample MLA Document} \author{John Doe} diff --git a/macros/latex/contrib/mlacls/mla.dtx b/macros/latex/contrib/mlacls/mla.dtx index ba5c6784ab..cefa444991 100644 --- a/macros/latex/contrib/mlacls/mla.dtx +++ b/macros/latex/contrib/mlacls/mla.dtx @@ -27,7 +27,7 @@ %\NeedsTeXFormat{LaTeX2e} %\ProvidesClass{mla} %<*mla> - [2019/05/29 v0.6 MLA Paper Class] + [2020/08/16 v0.8 MLA Paper Class] % %<*driver> @@ -137,7 +137,7 @@ % % \fi % -% \CheckSum{291} +% \CheckSum{299} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -214,6 +214,7 @@ % (see section~\ref{sec:the_header}). % % \changes{v0.2}{2019/05/02}{Added macro} +% \changes{v0.7}{2019/08/30}{Added August to month list} % \begin{macrocode} \newcommand{\mladate}{% \the\day\ @@ -225,6 +226,7 @@ \or May \or June \or July + \or August \or September \or October \or November @@ -452,23 +454,10 @@ % The \citetitle{mlahb} specifies half-inch first-line indentation % for every paragraph and no extra spacing in between. % -% \begin{macro}{\MLA@indent} -% \changes{v0.7}{2019/06/05}{Added macro} -% In case the indent should be changed, several other macros relying -% on it might be broken. -% Using an internal like \cs{MLA@indent} prevents this. -% -% \begin{macrocode} -\newlength{\MLA@indent} -\setlength{\MLA@indent}{0.5in} -% \end{macrocode} -% \end{macro} -% -% % \changes{v0.6}{2019-05-29}{Explicitly set \cs{partopset} to 0pt} % \begin{macrocode} -\setlength{\parindent}{\MLA@indent} -\setlength{\RaggedRightParindent}{\MLA@indent} +\setlength{\parindent}{0.5in} +\setlength{\RaggedRightParindent}{\parindent} \setlength{\parskip}{0em} \setlength{\topsep}{0em} \setlength{\partopsep}{0em} @@ -652,6 +641,8 @@ % \subsection{Sectioning} % \label{sec:sectioning} % +% \changes{v0.7}{2019/08/30}{Replaced regular space after dot +% in section headings with \cs{enspace}} % \begin{macro}{\section} % \changes{v0.2}{2019/05/02}{Changed heading to small-caps} % \begin{macro}{\subsection} @@ -679,14 +670,19 @@ % Un-fancifying the headings is acheived using % the \Dpkg{titlesec} package. % +% \changes{v0.8}{2020/08/16}{Removed extraneous spacing and newlines +% in section headings} % \begin{macrocode} -\titleformat*{\section}{\normalsize\sc} -\titleformat*{\subsection}{\normalsize\sc} -\titleformat*{\subsubsection}{\normalsize\sc} +\titleformat{\section}[block]{\normalsize\sc}{\thetitle.\enspace}{0pt}{}[] +\titleformat{\subsection}[block]{\normalsize\sc}{\thetitle.\enspace}{0pt}{}[] +\titleformat{\subsubsection}[block]{\normalsize\sc}{\thetitle.\enspace}{0pt}{}[] \titlespacing*{\section}{0pt}{0pt}{0pt} \titlespacing*{\subsection}{0pt}{0pt}{0pt} \titlespacing*{\subsubsection}{0pt}{0pt}{0pt} -\titlelabel{\thetitle. } +\titlelabel{} +\patchcmd{\ttl@select}{\strut}{}{}{} +\patchcmd{\ttlh@hang}{\strut}{}{}{} +\patchcmd{\ttlh@hang}{\strut}{}{}{} % \end{macrocode} % \end{macro} % \end{macro} @@ -699,7 +695,6 @@ % \changes{v0.4}{2019/05/12}{Added list type} % \begin{environment}{enumerate} % \changes{v0.4}{2019/05/12}{Added list type} -% \changes{v0.7}{2019/06/05}{Changed length to use \cs{MLA@indent}} % To the user, \Dlst{itemize} and \Dlst{enumerate} lists % will function exactly as expected. % However, the formatting of the lists must be modified as to @@ -713,13 +708,13 @@ parsep=0pt, itemsep=0pt, topsep=0pt, - leftmargin=\MLA@indent + leftmargin=\parindent } \setlist[enumerate]{% parsep=0pt, itemsep=0pt, topsep=0pt, - leftmargin=\MLA@indent + leftmargin=\parindent } % \end{macrocode} % \end{environment} @@ -736,12 +731,11 @@ % % \changes{v0.2}{2019/04/28}{Countered unexplained vertical space % after environment} -% \changes{v0.7}{2019/06/05}{Changed length to use \cs{MLA@indent}} % \begin{macrocode} \renewenvironment{blockquote}{% - \list{}{\leftmargin \MLA@indent} + \list{}{\leftmargin 0.5in} \item[] - \setlength{\parindent}{\MLA@indent} + \setlength{\parindent}{0.5in} \vspace{-\topsep} }{% \endlist @@ -854,7 +848,6 @@ % to \Dlst{mla}} % \changes{v0.4}{2019/05/12}{Removed extra \cs{vspace}} % \changes{v0.5}{2019/05/18}{Moved \cs{newpage} to beginning of environment} -% \changes{v0.7}{2019/06/05}{Changed length to use \cs{MLA@indent}} % \begin{macrocode} \newenvironment{notes}{% \newpage @@ -877,7 +870,7 @@ parsep=0pt, itemsep=0pt, topsep=0pt, - leftmargin=\MLA@indent + leftmargin=\parindent } % \end{macrocode} % @@ -904,7 +897,7 @@ % \changes{v0.2}{2019/04/28}{Countered unexplained vertical space % after heading} % \changes{v0.5}{2019/05/18}{Moved \cs{newpage} to beginning of environment} -% \changes{v0.7}{2019/06/05}{Changed length to use \cs{MLA@indent}} +% \changes{v0.7}{2019/08/30}{Changed correction spacing from 16pt to 10pt} % \begin{macrocode} \newenvironment{workscited}{% \newpage @@ -912,7 +905,7 @@ \pdfbookmark[0]{Works Cited}{workscited} \begin{center}Works Cited\end{center} \end{noindent} - \vspace{-16pt} % XXX to counter unexplained space + \vspace{-10pt} % XXX to counter unexplained space }{} % \end{macrocode} % \end{environment} @@ -923,7 +916,7 @@ % defined by the \Dpkg{biblatex} package. % % \begin{macrocode} -\setlength{\bibhang}{\MLA@indent} +\setlength{\bibhang}{\parindent} % \end{macrocode} % % \appendix diff --git a/macros/latex/contrib/mlacls/mla.pdf b/macros/latex/contrib/mlacls/mla.pdf index 2fb4f09ee6..a351cac71f 100644 Binary files a/macros/latex/contrib/mlacls/mla.pdf and b/macros/latex/contrib/mlacls/mla.pdf differ -- cgit v1.2.3