diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/mlacls/mla-example.pdf | bin | 60124 -> 61351 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mlacls/mla-example.tex | 25 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mlacls/mla.pdf | bin | 296896 -> 303085 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/mlacls/mla.dtx | 124 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/mlacls/mla.cls | 35 |
5 files changed, 158 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf b/Master/texmf-dist/doc/latex/mlacls/mla-example.pdf Binary files differindex 690425a18d5..7e824d5147f 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 24a032ad332..1eb78678514 100644 --- a/Master/texmf-dist/doc/latex/mlacls/mla-example.tex +++ b/Master/texmf-dist/doc/latex/mlacls/mla-example.tex @@ -4,7 +4,7 @@ \author{John Doe} \professor{Dr. Suzie Que} \course{\LaTeX\ 101} -\date{\today} +\date{\mladate} % see docs for `\mladate' % The .bib file (explained later) must be included in the preamble \addbibresource{mla-example.bib} @@ -46,13 +46,32 @@ Alongside regular top-level sections, one can use ``\textbackslash{}subsection'' commands too\endnote{Section commands in ``mla.cls'' work identical to those of the ``article'' class.}. +\section{Lists} + +Vertical lists are a rarity in MLA format, but if one so pleases, +they can be used. +The ``itemize'', ``enumerate'' and ``description'' lists +work just as expected, even with sublists. + +\begin{itemize} +\item A bogus item +\item Lorem ipsum dolor sit amet. This item has a bunch of text + just so it covers more than one line in the paper and shows + proper indentation. +\item Last item! +\begin{enumerate} +\item Just kidding; there's a subitem. And it's a number! +\end{enumerate} +\item Okay, now it's the last item. +\end{itemize} + \section{Using endnotes} As one may notice, the above subsection used an endnote. These can simply be cited with ``Yada yada text\textbackslash{}endnote\{more info\ldots\}.'' Endnotes can be easily printed in correct format by calling -``\textbackslash{}printendnotes[mla]'' within the +``\textbackslash{}printendnotes'' within the ``notes'' environment. \section{Using bibliographies} @@ -73,7 +92,7 @@ already prints one.) \begin{notes} -\printendnotes[mla] +\printendnotes \end{notes} diff --git a/Master/texmf-dist/doc/latex/mlacls/mla.pdf b/Master/texmf-dist/doc/latex/mlacls/mla.pdf Binary files differindex 683af471675..b7d11c2f764 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 41c17781920..272a53d9f4a 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/07 v0.3 MLA Paper Class] + [2019/05/18 v0.4.1 MLA Paper Class] %</mla> %<*driver> @@ -38,6 +38,7 @@ \newcommand*{\Dfile}[1]{\texttt{#1}} \newcommand*{\Dopt}[1]{\textsf{\small #1}} \newcommand*{\Dctr}[1]{\textsl{\small #1}} +\newcommand*{\Dlst}[1]{\texttt{#1}} \newcommand*{\Denv}[1]{\texttt{#1}} \newcommand*{\Dcls}[1]{\textsf{#1}} \newcommand*{\Dpkg}[1]{\textsf{#1}} @@ -117,6 +118,9 @@ \GlossaryPrologue{\pdfbookmark[0]{Change history}{ch} \section*{Change history}} +%% Everything just looks better, in my opinion +\usepackage{microtype} + %% Comment this if you don't want to produce a changelog \AtEndDocument{\PrintChanges} @@ -130,7 +134,7 @@ % % \fi % -% \CheckSum{0} +% \CheckSum{231} % % \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 @@ -183,7 +187,9 @@ % and version 1.3c or later is part of all distributions % of \LaTeX\ version 2008/05/04 or later. % +% \microtypesetup{protrusion=false} % \tableofcontents +% \microtypesetup{protrusion=true} % % \StopEventually{} ^^A % @@ -200,7 +206,9 @@ % \begin{macro}{\mladate} % The \citetitle{mlahb} requires use of the \term{day month year} % date format, not \TeX 's standard \term{month day, year}. -% The macro \cs{mladate} will format \cs{date} accordingly. +% The macro \cs{mladate} will format \cs{today} accordingly +% to be used as the default value for \cs{date} +% (see section~\ref{sec:the_header}). % % \changes{v0.2}{2019/05/02}{Added macro} % \begin{macrocode} @@ -282,12 +290,16 @@ % % \changes{v0.3}{2019/05/07}{Replaced obsolete \Dpkg{times} package % with \Dpkg{newtxtext}} +% \changes{v0.4}{2019/05/11}{Added \Dpkg{microtype} package} +% \changes{v0.4}{2019/05/12}{Added \Dpkg{enumitem} package} % \begin{macrocode} \RequirePackage{enotez} +\RequirePackage{enumitem} \RequirePackage{fancyhdr} \RequirePackage{fullpage} \RequirePackage{indentfirst} \RequirePackage{ragged2e} +\RequirePackage{microtype} \RequirePackage{newtxtext} \RequirePackage{titlesec} \RequirePackage{xstring} @@ -340,6 +352,21 @@ % \ac{MLA} format\footnote{According to the popular, oft-referenced % \ac{OWL}: \citeurl{owlmla}.}. % +% \subsubsection{Microtype} +% \label{sec:microtype} +% +% The \Dpkg{microtype} package (as loaded in +% section~\ref{sec:loading_packages}) +% will marginally offset the burden of using Times +% by correcting its ugly kerning and tracking. +% The vague \Dopt{activate=false} below simply disables +% protrusion, maintaining original line and page breaks. +% +% \changes{v0.4}{2019/05/12}{Disabled \Dpkg{microtype} protrusion} +% \begin{macrocode} +\microtypesetup{activate=false} +% \end{macrocode} +% % \subsection{Line breaking and spacing} % \label{sec:line_breaking} % @@ -351,8 +378,10 @@ % and likely following versions as well.} produces 24. % To compensate, line spacing is set to \emph{just enough}: % +% \changes{v0.4}{2019/05/08}{Changed \cs{linespacing} to +% prints 24 lines per page} % \begin{macrocode} -\linespread{1.99} +\linespread{1.905} % \end{macrocode} % % Though not explicitly denounced in the \citetitle{mlahb}, @@ -461,8 +490,20 @@ % \subsection{The header} % \label{sec:the_header} % +% \begin{macro}{\title} +% \begin{macro}{\author} +% \begin{macro}{\date} % The \cs{title}, \cs{author} and \cs{date} macros work as expected. -% The following, however, are unique to the \Dcls{mla} class. +% However, if your surname contains a space, you must contain the +% surname in braces as such: +% {\small |\author{Ludwig {van Beethoven}}|}. +% This keeps the full surname in the running head (see +% section~\ref{sec:running_head}). +% \end{macro} +% \end{macro} +% \end{macro} +% +% The following header commands are unique to the \Dcls{mla} class. % % \begin{macro}{\professor} % The instructor who assigned the paper, i.e. @@ -483,30 +524,32 @@ % \end{macro} % % To prevent undefined behavior, the internal macros used -% to store the above information are set empty (except for \cs{date}). +% to store the above information are set empty, except for \cs{date}. +% (Note the use of \cs{mladate}; see section~\ref{sec:initial_code}.) % % \begin{macrocode} \title{} \author{} \professor{} \course{} -\date{\today} +\date{\mladate} % \end{macrocode} % % \begin{macro}{\makemlaheader} % This command finally prints out the standard four-line % \ac{MLA} header, as well as the title. -% (Note the use of \cs{mladate}; see section~\ref{sec:initial_code}.) % % \changes{v0.2}{2019/05/02}{Changed date format to % \term{day month year}} +% \changes{v0.4.1}{2019/05/15}{Changed date format back to whatever +% is inside \cs{@date}} % \begin{macrocode} \newcommand{\makemlaheader}{% \begin{noindent} \@author \\ \@professor \\ \@course \\ - \mladate \\ + \@date \\ \begin{center}\@title\end{center} \end{noindent} } @@ -568,6 +611,38 @@ % The solution \Dpkg{indentfirst} package was already loaded % in section~\ref{sec:loading_packages}. % +% \subsection{Lists} +% \label{sec:lists} +% +% \begin{environment}{itemize} +% \changes{v0.4}{2019/05/12}{Added list type} +% \begin{environment}{enumerate} +% \changes{v0.4}{2019/05/12}{Added list type} +% 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 +% preserve double-spacing and adhere to +% common practice\footnote{According to the \ac{MLA} itself: +% \url{https://style.mla.org/vertical-lists-in-mla-style/}.}; +% these changes are acheived using the \Dpkg{enumitem} package. +% +% \begin{macrocode} +\setlist[itemize]{% + parsep=0pt, + itemsep=0pt, + topsep=0pt, + leftmargin=\parindent +} +\setlist[enumerate]{% + parsep=0pt, + itemsep=0pt, + topsep=0pt, + leftmargin=\parindent +} +% \end{macrocode} +% \end{environment} +% \end{environment} +% % \subsection{Block quotation} % \label{sec:block_quoatation} % @@ -622,31 +697,48 @@ % \changes{v0.2}{2019/04/28}{Added environment} % \changes{v0.2}{2019/04/28}{Countered unexplained vertical space % after heading} +% \changes{v0.4}{2019/05/12}{Changed endnotes list type to +% custom \Dlst{mlaendnotes} list} +% \changes{v0.4}{2019/05/12}{Changed default endnotes format +% to \Dlst{mla}} +% \changes{v0.4}{2019/05/12}{Removed extra \cs{vspace}} % \begin{macrocode} \newenvironment{notes}{% \begin{noindent} \pdfbookmark[0]{Notes}{notes} \begin{center}Notes\end{center} \end{noindent} - \vspace{-16pt} % XXX to counter unexplained space }{% \newpage } % \end{macrocode} % \end{environment} % -% The following code is to format endnotes per -% common practice\footnote{According to the popular, oft-referenced -% \ac{OWL}: \citeurl{owlendnotes}.} -% when using the \Dpkg{enotez} package. +% To correctly format endnotes per common practice\footnote{According +% to the popular, oft-referenced \ac{OWL}: \citeurl{owlendnotes}.}, +% a custom \Dlst{mlanotes} list type will be created. +% This is acheived with the \Dpkg{enumitem} package. +% +% \begin{macrocode} +\newlist{mlanotes}{description}{1} +\setlist[mlanotes]{% + parsep=0pt, + itemsep=0pt, + topsep=0pt, + leftmargin=\parindent +} +% \end{macrocode} +% +% The following initializes the \Dpkg{enotez} package to use +% the \Dlst{mlanotes} list format. % % \begin{macrocode} -\setenotez{list-name={}} \DeclareInstance{enotez-list}{mla}{list}{% heading = {}, format = \normalsize\normalfont, - list-type = description + list-type = mlanotes } +\setenotez{list-name={},list-style=mla,backref} % \end{macrocode} % % \subsubsection{Bibliography} diff --git a/Master/texmf-dist/tex/latex/mlacls/mla.cls b/Master/texmf-dist/tex/latex/mlacls/mla.cls index d8162b7f259..c47907b8a52 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/07 v0.3 MLA Paper Class] + [2019/05/18 v0.4.1 MLA Paper Class] \LoadClass[letterpaper,12pt]{article} \newcommand{\mladate}{% @@ -52,10 +52,12 @@ \ExecuteOptions{mla8} \ProcessOptions\relax \RequirePackage{enotez} +\RequirePackage{enumitem} \RequirePackage{fancyhdr} \RequirePackage{fullpage} \RequirePackage{indentfirst} \RequirePackage{ragged2e} +\RequirePackage{microtype} \RequirePackage{newtxtext} \RequirePackage{titlesec} \RequirePackage{xstring} @@ -75,7 +77,8 @@ showmedium=false,backend=biber]{biblatex} \fi\fi \fi -\linespread{1.99} +\microtypesetup{activate=false} +\linespread{1.905} \hyphenpenalty 10000 \pretolerance 10000 \setlength{\parindent}{0.5in} @@ -112,13 +115,13 @@ \author{} \professor{} \course{} -\date{\today} +\date{\mladate} \newcommand{\makemlaheader}{% \begin{noindent} \@author \\ \@professor \\ \@course \\ - \mladate \\ + \@date \\ \begin{center}\@title\end{center} \end{noindent} } @@ -133,6 +136,18 @@ \titlespacing*{\subsection}{0pt}{0pt}{0pt} \titlespacing*{\subsubsection}{0pt}{0pt}{0pt} \titlelabel{\thetitle. } +\setlist[itemize]{% + parsep=0pt, + itemsep=0pt, + topsep=0pt, + leftmargin=\parindent +} +\setlist[enumerate]{% + parsep=0pt, + itemsep=0pt, + topsep=0pt, + leftmargin=\parindent +} \renewenvironment{blockquote}{% \list{}{\leftmargin 0.5in} \item[] @@ -152,16 +167,22 @@ \pdfbookmark[0]{Notes}{notes} \begin{center}Notes\end{center} \end{noindent} - \vspace{-16pt} % XXX to counter unexplained space }{% \newpage } -\setenotez{list-name={}} +\newlist{mlanotes}{description}{1} +\setlist[mlanotes]{% + parsep=0pt, + itemsep=0pt, + topsep=0pt, + leftmargin=\parindent +} \DeclareInstance{enotez-list}{mla}{list}{% heading = {}, format = \normalsize\normalfont, - list-type = description + list-type = mlanotes } +\setenotez{list-name={},list-style=mla,backref} \newenvironment{workscited}{% \begin{noindent} \pdfbookmark[0]{Works Cited}{workscited} |