mlacls (17aug20)

git-svn-id: svn://tug.org/texlive/trunk@56126 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 44 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf b/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf
index 43abfb7c375..8bebefb5901 100644
--- a/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf
+++ b/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf
diff --git a/Master/texmf-dist/doc/latex/mlacls/mla-example.tex b/Master/texmf-dist/doc/latex/mlacls/mla-example.tex
index 8b9d624c3b0..0d7bc93f0ff 100644
--- a/Master/texmf-dist/doc/latex/mlacls/mla-example.tex
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/mlacls/mla.pdf b/Master/texmf-dist/doc/latex/mlacls/mla.pdf
index 2fb4f09ee6d..a351cac71f0 100644
--- a/Master/texmf-dist/doc/latex/mlacls/mla.pdf
+++ b/Master/texmf-dist/doc/latex/mlacls/mla.pdf
diff --git a/Master/texmf-dist/source/latex/mlacls/mla.dtx b/Master/texmf-dist/source/latex/mlacls/mla.dtx
index ba5c6784ab5..cefa444991a 100644
--- a/Master/texmf-dist/source/latex/mlacls/mla.dtx
+++ b/Master/texmf-dist/source/latex/mlacls/mla.dtx
@@ -27,7 +27,7 @@
 %<mla>\NeedsTeXFormat{LaTeX2e}
 %<mla>\ProvidesClass{mla}
 %<*mla>
-    [2019/05/29 v0.6 MLA Paper Class]
+    [2020/08/16 v0.8 MLA Paper Class]
 %</mla>
 
 %<*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/Master/texmf-dist/tex/latex/mlacls/mla.cls b/Master/texmf-dist/tex/latex/mlacls/mla.cls
index 2d88ba69bb6..6f77f45ef7e 100644
--- a/Master/texmf-dist/tex/latex/mlacls/mla.cls
+++ b/Master/texmf-dist/tex/latex/mlacls/mla.cls
@@ -23,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{mla}
-    [2019/05/29 v0.6 MLA Paper Class]
+    [2020/08/16 v0.8 MLA Paper Class]
 
 \LoadClass[letterpaper,12pt]{article}
 \newcommand{\mladate}{%
@@ -36,6 +36,7 @@
         \or May
         \or June
         \or July
+        \or August
         \or September
         \or October
         \or November
@@ -93,10 +94,8 @@
 \linespread{1.905}
 \hyphenpenalty=10000
 \pretolerance=10000
-\newlength{\MLA@indent}
-\setlength{\MLA@indent}{0.5in}
-\setlength{\parindent}{\MLA@indent}
-\setlength{\RaggedRightParindent}{\MLA@indent}
+\setlength{\parindent}{0.5in}
+\setlength{\RaggedRightParindent}{\parindent}
 \setlength{\parskip}{0em}
 \setlength{\topsep}{0em}
 \setlength{\partopsep}{0em}
@@ -147,29 +146,32 @@
 \renewcommand{\thesection}{\@arabic\c@section}
 \renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection}
 \renewcommand{\thesubsubsection}{\thesubsection.\@arabic\c@subsubsection}
-\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}{}{}{}
 \setlist[itemize]{%
     parsep=0pt,
     itemsep=0pt,
     topsep=0pt,
-    leftmargin=\MLA@indent
+    leftmargin=\parindent
 }
 \setlist[enumerate]{%
     parsep=0pt,
     itemsep=0pt,
     topsep=0pt,
-    leftmargin=\MLA@indent
+    leftmargin=\parindent
 }
 \renewenvironment{blockquote}{%
-    \list{}{\leftmargin \MLA@indent}
+    \list{}{\leftmargin 0.5in}
     \item[]
-    \setlength{\parindent}{\MLA@indent}
+    \setlength{\parindent}{0.5in}
     \vspace{-\topsep}
 }{%
     \endlist
@@ -207,7 +209,7 @@
     parsep=0pt,
     itemsep=0pt,
     topsep=0pt,
-    leftmargin=\MLA@indent
+    leftmargin=\parindent
 }
 \DeclareInstance{enotez-list}{mla}{list}{%
     heading = {},
@@ -221,9 +223,9 @@
         \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
 }{}
-\setlength{\bibhang}{\MLA@indent}
+\setlength{\bibhang}{\parindent}
 \endinput
 %%
 %% End of file `mla.cls'.