1 files changed, 71 insertions, 40 deletions

diff --git a/Master/texmf-dist/tex/latex/mlacls/mla.cls b/Master/texmf-dist/tex/latex/mlacls/mla.cls
index c47907b8a52..2d88ba69bb6 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/18 v0.4.1 MLA Paper Class]
+    [2019/05/29 v0.6 MLA Paper Class]
 
 \LoadClass[letterpaper,12pt]{article}
 \newcommand{\mladate}{%
@@ -43,51 +43,68 @@
     \fi
     \the\year
 }
-\DeclareOption{mla7}{\def\@optMlaSeven}
-\DeclareOption{mla8}{\def\@optMlaEight}
-\DeclareOption{mla8alt}{\def\@optMlaEightAlt}
+\newif\ifMLA@seven
+\newif\ifMLA@eight
+\newif\ifMLA@eightalt
+\newif\ifMLA@microtype
+\DeclareOption{mla7}{\MLA@seventrue\MLA@eightfalse\MLA@eightaltfalse}
+\DeclareOption{mla8}{\MLA@sevenfalse\MLA@eighttrue\MLA@eightaltfalse}
+\DeclareOption{mla8alt}{\MLA@sevenfalse\MLA@eightfalse\MLA@eightalttrue}
+\DeclareOption{microtype}{\MLA@microtypetrue}
 \DeclareOption*{%
     \ClassWarning{mla}{Unknown option `\CurrentOption'; ignoring}
 }
 \ExecuteOptions{mla8}
 \ProcessOptions\relax
+\RequirePackage{caption}
 \RequirePackage{enotez}
 \RequirePackage{enumitem}
 \RequirePackage{fancyhdr}
+\RequirePackage{float}
 \RequirePackage{fullpage}
-\RequirePackage{indentfirst}
+\RequirePackage{graphicx}
 \RequirePackage{ragged2e}
-\RequirePackage{microtype}
 \RequirePackage{newtxtext}
 \RequirePackage{titlesec}
 \RequirePackage{xstring}
 \RequirePackage[american]{babel}
 \RequirePackage{csquotes}
 \RequirePackage{hanging}
-\RequirePackage[hidelinks,pdfusetitle]{hyperref}
-\ifdefined\@optMlaSeven
+\ifMLA@seven
     \RequirePackage[style=mla,noremoteinfo=false,showmedium=true,
                     backend=biber]{biblatex}
-\else
-    \ifdefined\@optMlaEightAlt
-        \RequirePackage[style=mla,noremoteinfo=false,
-                        showmedium=false,backend=biber]{biblatex}
-    \else\ifdefined\@optMlaEight
-        \RequirePackage[style=mla-new,noremoteinfo=false,
-                        showmedium=false,backend=biber]{biblatex}
-    \fi\fi
 \fi
-\microtypesetup{activate=false}
+\ifMLA@eight
+    \RequirePackage[style=mla-new,noremoteinfo=false,
+                    showmedium=false,backend=biber]{biblatex}
+\fi
+\ifMLA@eightalt
+    \RequirePackage[style=mla,noremoteinfo=false,
+                    showmedium=false,backend=biber]{biblatex}
+\fi
+\ifMLA@microtype
+    \RequirePackage{microtype}
+\fi
+\RequirePackage{hyperref}
+\hypersetup{hidelinks,pdfusetitle}
+\ifMLA@microtype
+    \microtypesetup{activate=false}
+\fi
 \linespread{1.905}
-\hyphenpenalty 10000
-\pretolerance 10000
-\setlength{\parindent}{0.5in}
-\setlength{\RaggedRightParindent}{\parindent}
+\hyphenpenalty=10000
+\pretolerance=10000
+\newlength{\MLA@indent}
+\setlength{\MLA@indent}{0.5in}
+\setlength{\parindent}{\MLA@indent}
+\setlength{\RaggedRightParindent}{\MLA@indent}
 \setlength{\parskip}{0em}
 \setlength{\topsep}{0em}
-\widowpenalty 0
-\clubpenalty 0
-\interlinepenalty 0
+\setlength{\partopsep}{0em}
+\let\@afterindentfalse\@afterindenttrue
+\@afterindenttrue
+\widowpenalty=0
+\clubpenalty=0
+\interlinepenalty=0
 \RaggedRight
 \renewenvironment{noindent}{%
     \edef\tmpind{\parindent}
@@ -126,6 +143,7 @@
     \end{noindent}
 }
 \renewcommand{\maketitle}{\makemlaheader}
+\AtBeginDocument{\maketitle}
 \renewcommand{\thesection}{\@arabic\c@section}
 \renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection}
 \renewcommand{\thesubsubsection}{\thesubsection.\@arabic\c@subsubsection}
@@ -140,42 +158,56 @@
     parsep=0pt,
     itemsep=0pt,
     topsep=0pt,
-    leftmargin=\parindent
+    leftmargin=\MLA@indent
 }
 \setlist[enumerate]{%
     parsep=0pt,
     itemsep=0pt,
     topsep=0pt,
-    leftmargin=\parindent
+    leftmargin=\MLA@indent
 }
 \renewenvironment{blockquote}{%
-    \list{}{\leftmargin 0.5in}
+    \list{}{\leftmargin \MLA@indent}
     \item[]
-    \setlength{\parindent}{0.5in}
+    \setlength{\parindent}{\MLA@indent}
     \vspace{-\topsep}
 }{%
     \endlist
     \vspace{-\topsep}
 }
-\newenvironment{paper}{%
-    \makemlaheader
-}{%
-    \newpage
+\setlength{\floatsep}{\baselineskip}
+\setlength{\intextsep}{\baselineskip}
+\setlength{\textfloatsep}{\baselineskip}
+\g@addto@macro\@floatboxreset\centering
+\renewcommand{\float@endH}{%
+    \vspace{-12pt}
+    \@endfloatbox\vskip\intextsep
+    \if@flstyle\setbox\@currbox\float@makebox\columnwidth\fi
+    \box\@currbox\vskip\intextsep\relax\@doendpe
 }
+\captionsetup{%
+    font={normalfont},
+    labelformat=simple,
+    labelsep=period,
+    position=bottom,
+    aboveskip=6pt,
+    belowskip=-10pt
+}
+\captionsetup[figure]{name=Fig.}
+\newenvironment{paper}{}{}
 \newenvironment{notes}{%
+    \newpage
     \begin{noindent}
         \pdfbookmark[0]{Notes}{notes}
         \begin{center}Notes\end{center}
     \end{noindent}
-}{%
-    \newpage
-}
+}{}
 \newlist{mlanotes}{description}{1}
 \setlist[mlanotes]{%
     parsep=0pt,
     itemsep=0pt,
     topsep=0pt,
-    leftmargin=\parindent
+    leftmargin=\MLA@indent
 }
 \DeclareInstance{enotez-list}{mla}{list}{%
     heading = {},
@@ -184,15 +216,14 @@
 }
 \setenotez{list-name={},list-style=mla,backref}
 \newenvironment{workscited}{%
+    \newpage
     \begin{noindent}
         \pdfbookmark[0]{Works Cited}{workscited}
         \begin{center}Works Cited\end{center}
     \end{noindent}
     \vspace{-16pt} % XXX to counter unexplained space
-}{%
-    \newpage
-}
-\setlength{\bibhang}{\parindent}
+}{}
+\setlength{\bibhang}{\MLA@indent}
 \endinput
 %%
 %% End of file `mla.cls'.