mlawriter (5jul23)

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

4 files changed, 50 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/plain/mlawriter/README b/Master/texmf-dist/doc/plain/mlawriter/README
index 12d76388497..e941858bef8 100644
--- a/Master/texmf-dist/doc/plain/mlawriter/README
+++ b/Master/texmf-dist/doc/plain/mlawriter/README
@@ -11,7 +11,7 @@
 
 And start writing the body.
 
-After finished here is how to format citations:
+After finished, here is how to format citations:
 
 \citepage{<Title, could be Work Cited or Works Cited>}
 Cite 1
@@ -19,8 +19,13 @@ Cite 1
 Cite 2, separated as paragraphs
 \endcite
 
-And you are good to go.
+And you are good to go. Remember that the list needs to be alphabetical
+ordered.
 
+When you finished, you might want to to pair up with \mla
+
+\endmla
+% Maybe additional materials.
 \bye
 
 * Additional macros
@@ -31,9 +36,18 @@ And you are good to go.
 ...
 \endquote  Quoting paragraphs
 
-* License
+\url{https://...} Typesetting URLs as required by MLA style.
+
+* Updates
+
+1.0.1: Initial version on CTAN.
+
+1.1.0: \mla now needs to be paired with \endmla. Added \url macro.
+Change font to be utmr8t. Minor documentation editing.
+
+* Copying
 
-Written in 2023-06-26 by LdBeth <ldbeth@sdf.org>
+Written in 2023-07-05 by LdBeth <ldbeth@sdf.org>
 
 To the extent possible under law, the author have dedicated all
 copyright and related and neighboring rights to this software to the
@@ -44,3 +58,4 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software. If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 
+MLA stands for Modern Language Association.
diff --git a/Master/texmf-dist/doc/plain/mlawriter/testmla.pdf b/Master/texmf-dist/doc/plain/mlawriter/testmla.pdf
index 18b84b3e089..2eba84c52e5 100644
--- a/Master/texmf-dist/doc/plain/mlawriter/testmla.pdf
+++ b/Master/texmf-dist/doc/plain/mlawriter/testmla.pdf
diff --git a/Master/texmf-dist/doc/plain/mlawriter/testmla.tex b/Master/texmf-dist/doc/plain/mlawriter/testmla.tex
index abf335a30fd..72fd9c58b7f 100644
--- a/Master/texmf-dist/doc/plain/mlawriter/testmla.tex
+++ b/Master/texmf-dist/doc/plain/mlawriter/testmla.tex
@@ -13,7 +13,11 @@ that I need. And I'm surprised how much extra packages it depended to
 just get simple things like page size or header. These things are
 really simple! They are all described in the \TeX book.
 
-Nam et convallis lectus. Morbi fermentum massa vitae nunc vestibulum,
+Nam et convallis lectus. You can find my homepage
+and other things at \url{https://ldbeth.sdf.org/articles}.
+Note that your manuscript is expected to be printed, and MLA format
+does not allow URLs to be converted to hyperlinks, so there
+is nothing fancy. Morbi fermentum massa vitae nunc vestibulum,
 quis bibendum odio venenatis. Vivamus vehicula, dolor ut consectetur
 auctor, nisl lorem pharetra libero, a tristique augue neque eu
 mi. Nulla fringilla volutpat erat, ut venenatis justo cursus ut. Nulla
@@ -36,15 +40,14 @@ ut. Proin nec ornare enim, vitae hendrerit ipsum. Class aptent taciti
 sociosqu ad litora torquent per conubia nostra, per inceptos
 himenaeos.
 
-
 Neque porro quisquam est qui dolorem ipsum quia dolor sit amet,
-consectetur, adipisci velit:
+consectetur, adipisci velit. Praesent luctus tortor et augue eleifend,
+a eleifend velit gravida. Maecenas blandit auctor finibus. Aliquam
+tempus lobortis dolor, eget pellentesque erat fermentum ac. Donec
+tempus orci eu magna hendrerit fermentum. Donec semper elit at lacinia
+interdum:
 \quote
-Praesent luctus tortor et augue eleifend, a eleifend velit
-gravida. Maecenas blandit auctor finibus. Aliquam tempus lobortis
-dolor, eget pellentesque erat fermentum ac. Donec tempus orci eu magna
-hendrerit fermentum. Donec semper elit at lacinia interdum. Nulla
-malesuada justo velit. Quisque tincidunt in mauris consequat
+Nulla malesuada justo velit. Quisque tincidunt in mauris consequat
 facilisis. Donec finibus lectus nec elementum auctor. Lorem ipsum
 dolor sit amet, consectetur adipiscing elit. Nulla est enim, vehicula
 id tincidunt eu, varius at purus. Class aptent taciti sociosqu ad
@@ -70,4 +73,5 @@ ornare, feugiat urna vel, mollis diam.
 \citepage{Work Cited}
 Knuth, Donald E. {\it The \TeX book.} Addison-Wesley, 1986. 
 \endcite
+\endmla
 \bye
diff --git a/Master/texmf-dist/tex/plain/mlawriter/mlawriter.tex b/Master/texmf-dist/tex/plain/mlawriter/mlawriter.tex
index 0f3e0284d4f..b993465358b 100644
--- a/Master/texmf-dist/tex/plain/mlawriter/mlawriter.tex
+++ b/Master/texmf-dist/tex/plain/mlawriter/mlawriter.tex
@@ -1,5 +1,6 @@
 % -*- mode: TeX -*-
-% The MLA style for plain TeX, Version 1.0.1 2023-06-26
+% The MLA style for plain TeX, Version 1.1.0 2023-07-05
+% MLA stands for Modern Language Association
 % written by LdBeth
 % CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
 % letter paper 8.5in * 11in, 1in margin
@@ -8,10 +9,10 @@
 \hoffset = 0pt
 \voffset = 0pt
 % "Times New Roman" font
-\font\twelverm = utmr7t at 12pt
-\font\twelveit = utmri7t at 12pt
-\font\twelvebf = utmb7t at 12pt
-\font\twelvesl = utmro7t at 12pt
+\font\twelverm = utmr8t at 12pt
+\font\twelveit = utmri8t at 12pt
+\font\twelvebf = utmb8t at 12pt
+\font\twelvesl = utmro8t at 12pt
 % page number
 \nopagenumbers
 \catcode`\@=11
@@ -37,6 +38,7 @@
 % mla macro
 \outer\def\mla\name#1 #2\teacher#3\course#4\date#5\title{%
   \setheader{#2}
+  \begingroup
   \let\rm=\twelverm \let\bf=\twelvebf
   \let\it=\twelveit \let\sl=\twelvesl 
   % double space, 24 lines per page
@@ -45,6 +47,7 @@
   \parindent = .5in
   % no hyphenation
   \pretolerance = 10000\hbadness = 10000
+  \hyphenpenalty= 9999 \exhyphenpenalty= 9999
   \frenchspacing
   \raggedright
   \rm
@@ -54,11 +57,18 @@
   \noindent #5\par
   \settitle
   }
-% quote macro
-\def\quote{\begingroup\noindent\leftskip = .5in }
-\def\endquote{\par\endgroup\noindent}
+\outer\def\endmla{\endgroup}
+% quote paragraph macro
+\outer\def\quote{\par\begingroup\noindent\leftskip = .5in }
+\outer\def\endquote{\par\endgroup\noindent}
+% url macro
+\def\url{\begingroup\catcode`\/=\active\activ@url}
+{\catcode`\/=\active
+\global\def\activ@url#1{%
+\def/{\char`\/\penalty-100}%
+<#1>\endgroup}}
 % bib entry
-\def\citepage#1{%
+\outer\def\citepage#1{%
 \vfil\eject
 \begingroup
 \parindent=\z@