summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/plain/base/gkpmac.tex45
-rw-r--r--Master/texmf-dist/tex/plain/base/letter.tex119
-rw-r--r--Master/texmf-dist/tex/plain/base/letterformat.tex85
-rw-r--r--Master/texmf-dist/tex/plain/base/list-latin.tex30
-rw-r--r--Master/texmf-dist/tex/plain/base/llist-latin.tex84
-rw-r--r--Master/texmf-dist/tex/plain/base/llist.tex2
-rw-r--r--Master/texmf-dist/tex/plain/base/plain.tex6
-rw-r--r--Master/texmf-dist/tex/plain/knuth-lib/webmac.tex22
8 files changed, 212 insertions, 181 deletions
diff --git a/Master/texmf-dist/tex/plain/base/gkpmac.tex b/Master/texmf-dist/tex/plain/base/gkpmac.tex
index 1ae0f1a7a68..5b143505a21 100644
--- a/Master/texmf-dist/tex/plain/base/gkpmac.tex
+++ b/Master/texmf-dist/tex/plain/base/gkpmac.tex
@@ -4,12 +4,12 @@
% Fonts for regular text
-\font\textrm=ccr10 % roman
-\font\textit=ccti10 % italic (emphasis)
-\font\textsl=ccsl10 % slanted (titles)
-\font\textbf=cmbx10 % bold
-\font\textcsc=cccsc10 % caps and small caps
-\font\oldsty=ccmi10 % equation numbers
+\font\textrm=ccr10 % roman
+\font\textit=ccti10 % italic (emphasis)
+\font\textsl=ccsl10 % slanted (titles)
+\font\textbf=cmbx10 % bold
+\font\textcsc=cccsc10 % caps and small caps
+\font\oldsty=ccmi10 % equation numbers
\font\twelvett=cmtt12
% Fonts for regular math
@@ -266,8 +266,8 @@
\smallskip\noindent}
\def\beginsection#1 #2 \par{ % should not be first in the chapter
- \backup=\lastskip % but should come on first or second page of chapter
- \mark{#1\enspace #2} % because the mark gives running head on right page
+ \backup=\lastskip % but should come on first or second page of chapter
+ \mark{#1\enspace #2} % because the mark gives running head on right page
\nobreak\vskip-\backup\penalty-200
{\subtitle\baselineskip=34pt
\noindent\hbox to2\parindent{#1\hfil}\uppercase{\kern-.05em#2}\par}
@@ -413,8 +413,8 @@
\def\copyrite{\ifpreprint{\textfont2=\sevensy\sevenrm\copyright\ 1988
Addison-Wesley Publishing Company; all rights reserved}\fi}
-\newdimen\htrimsize \htrimsize=7.5in
-\newdimen\vtrimsize \vtrimsize=9.1875in
+\newdimen\htrimsize \htrimsize=7.375in
+\newdimen\vtrimsize \vtrimsize=9.25in
\newdimen\outermargin \outermargin=23mm
\newdimen\topmargin \topmargin=10mm % plus height of the headline box
\newbox\htrim \newbox\vtrim \newbox\trimmarks
@@ -438,14 +438,15 @@
\vbox to\vtrimsize{\kern\topmargin\fi
\vbox to\totheight{
\offinterlineskip % butt the boxes together
+ \vskip2.5pt % adjustment at the top (10 Jan 2011)
\vbox to 2pc{ % this part goes on top of the regular pages
\ifodd\pageno \rightheadline\else\leftheadline\fi
\vfill} % this completes the \vbox to 2pc
\ifodd\pageno\moveright7pc\fi #1
\vfill
\iftitle \global\titlefalse % reset the titlepage switch
- \ifodd\pageno \hbox to35pc{\hfil\foliofont\folio}
- \else\hbox{\foliofont\folio}\fi\fi
+ \ifodd\pageno \hbox to35pc{\hfil\foliofont\folio}
+ \else\hbox{\foliofont\folio}\fi\fi
\ifpreprint\ifinxmode\makeinxfooter\fi\fi
\iffinal % finish the trimmed page
}\vfill}\ifodd\pageno\hskip\outermargin\else\hss\fi
@@ -489,9 +490,9 @@
\catcode`\|=\active
\expandafter\def\expandafter\dospecials\expandafter{\dospecials\do\|}
-\newcount\defcount % number of old definitions not yet repeated
-\newcount\changecount % number of new definitions that are changed
-\newcount\miscount % number of unknown references
+\newcount\defcount % number of old definitions not yet repeated
+\newcount\changecount % number of new definitions that are changed
+\newcount\miscount % number of unknown references
\newread\tempin
\def\refin#1 {\openin\tempin=#1.ref
@@ -763,6 +764,7 @@
\def\And{\quad{\rm and}\quad}
\let\==\equiv
\def\tmod#1{(mod~$#1$)}
+\def\pmod#1{\allowbreak\mkern18mu\hbox{(}{\rm mod}\,\,#1\hbox{)}}
\let\implies=\Longrightarrow
\def\?{\hbox{!`}} % subfactorial
\def\hyp{\mathop{F{}}\nolimits\hyper}
@@ -770,14 +772,14 @@
\def\hyper#1#2#3{\mathchoice{\tightplus
\hbox{$\displaystyle\biggl({#1\atop#2}\Big\vert\,{#3}\!\biggr)$}}%
{\bigl({#1\atop#2}\vert\mskip2mu#3\bigr)}%
- {}{}} % used only in D and T styles
+ {}{}} % used only in D and T styles
%\def\hypk_#1{\mathop{F{}}_{#1}\nolimits\hyper} % confl with mFn convention
\def\hypk_#1#2#3#4{\mathop{F{}}\mathchoice{\tightplus
\hbox{$\displaystyle\biggl({#2\atop#3}\Big\vert\,{#4}\!\biggr)$}%
\lower\fontdimen11\mathsym\hbox{$\scriptstyle\!#1$}}%
{\bigl({#2\atop#3}\vert\mskip2mu#4\bigr)\lower\fontdimen12\mathsym
\hbox{$\scriptstyle\!#1$}}%
- {}{}} % used only in D and T styles
+ {}{}} % used only in D and T styles
\def\double(#1\choose#2){\mathchoice{\biggl(\!\!{#1\choose#2}\!\!\biggr)}
{\bigl(\!{#1\choose#2}\!\bigr)}{}{}} % only D and T styles
\def\hypstrut{\vphantom{_1\_^k}} % if there's another denominator with \_^k
@@ -853,9 +855,9 @@
\hyphenation{logical Mac-Mahon hyper-geo-metric hyper-geo-met-rics Ber-noulli}
-\preprintfalse % WE ARE MAKING THE REAL BOOK!
-\inxmodetrue % WE ARE PREPARING A ROUGH INDEX
-\showmissestrue % THE REFERENCES SHOULD ALL BE READY NOW
+\preprintfalse % WE ARE MAKING THE REAL BOOK!
+\inxmodetrue % WE ARE PREPARING A ROUGH INDEX
+\showmissestrue % THE REFERENCES SHOULD ALL BE READY NOW
\ifinxmode\immediate\openout\inx=\jobname.inx \fi % file for index reminders
\ifinxmode\immediate\openout\bnx=\jobname.bnx \fi % file for bib reminders
@@ -883,7 +885,8 @@
\message{OK, I'm making final copy with trim marks!}
\hoffset=-.5in
\getnxtpg % this should ensure eof on the \pages file
-\else\message{OK, I'll ship only the requested pages!}\fi\fi
+\else\message{OK, I'll ship only the requested pages!}
+ \hoffset=-.5in\fi\fi
\def\shipout{\ifeof\pages\let\next=\Shipout
\else\ifnum\pageno=\nxtpg\getnxtpg\let\next=\Shipout
\else\let\next=\Tosspage\fi\fi \next}
diff --git a/Master/texmf-dist/tex/plain/base/letter.tex b/Master/texmf-dist/tex/plain/base/letter.tex
deleted file mode 100644
index 531a8b520df..00000000000
--- a/Master/texmf-dist/tex/plain/base/letter.tex
+++ /dev/null
@@ -1,119 +0,0 @@
-% This macro file is for business letters
-
-\def\today{\ifcase\month\or
- January\or February\or March\or April\or May\or June\or
- July\or August\or September\or October\or November\or December\fi
- \space\number\day, \number\year}
-\def\narrower{\advance\leftskip by 20pt \advance\rightskip by 20pt }
-
-\raggedbottom
-\interlinepenalty=1000
-\hsize=6.25truein \voffset=24pt \advance\vsize by-\voffset
-\parindent=0pt \parskip=0pt
-\nopagenumbers
-\headline={\ifnum\pageno>1
- \tenrm To \addressee\hfil\today\hfil Page \folio
- \else\hfil\fi}
-
-\def\beginlinemode{\endmode
- \begingroup\obeylines\def\endmode{\par\endgroup}}
-\def\beginparmode{\endmode
- \begingroup\parskip=\medskipamount \def\endmode{\par\endgroup}}
-\let\endmode=\par
-\def\endletter{\endmode\vfill\supereject \pageno=1 }
-
-\newdimen\longindentation \longindentation=4truein
-\newbox\theaddress
-\def\address{\beginlinemode\getaddress}
-{\obeylines\gdef\getaddress#1
- #2
- {\gdef\addressee{#2\unskip}%
- \global\setbox\theaddress=\vbox\bgroup\raggedright%
- \hsize=\longindentation \everypar{\hangindent2em}#2
- \def\endmode{\egroup\endgroup \copy\theaddress \bigskip}}}
-
-\def\body{\beginparmode}
-\def\closing{\beginlinemode\getclosing}
-{\obeylines\gdef\getclosing #1
- #2
- {\nobreak\bigskip \leftskip=\longindentation #2
- \nobreak\bigskip\bigskip\bigskip % space for signature
- \def
- {\endgraf\nobreak}}}
-\def\annotations{\beginlinemode\def\par{\endgraf\nobreak}\obeylines\par}
-\def\ps{\beginparmode\nobreak
- \interlinepenalty5000\def\par{\endgraf\penalty5000}}
-\def\cc{\beginparmode\nobreak
- \interlinepenalty5000\def\par{\endgraf\penalty5000}}
-
-\def\up#1{\leavevmode \raise.16ex\hbox{#1}}
-\font\smallheadfont=cmr8 at 8truept
-\font\largeheadfont=cmbx10 at 14.4truept
-\font\logofont=stan70 at 70truept
-\def\stanfordseal{\vbox{\kern-3truept\hbox{\logofont A}\kern-3truept}}
-
-\def\csdreturn{Computer Science Department\par \stanfordreturn}
-\def\stanfordreturn{Stanford University\par
- Stanford, CA 94305\kern.5pt-21\kern-.5pt40 USA\par}
-\def\letterhead{\pageno=1 \univletterhead
- {\leftskip=\longindentation
- {\baselineskip9truept\smallheadfont\sendingaddress}
- \bigskip\bigskip\rm\today\bigskip}}
-\def\specrule#1{\nointerlineskip
- \line{\hbox to 60truept{\hrulefill
- \hphantom{\stanfordseal\kern-#1truept}%
- \hrulefill}\hrulefill}\nointerlineskip}
-\def\univletterhead{\vglue-34pt
- \specrule{11}\vskip8truept
- \hbox{\hbox to\longindentation{\smash{\hbox to60truept{\hfil\kern2.5truept
- \lower10truept\stanfordseal\hfil}}%
- \largeheadfont STANFORD UNIVERSITY\hfil}%
- \smallheadfont STANFORD, CALIFORNIA 94305\kern.5pt-21\kern-.5pt40}
- \vskip6truept\specrule{17}\vskip13truept }
-
-\def\deklet{
- \def\sendingaddress{DONALD E. KNUTH\par
- Professor Emeritus of The Art of\par
- \qquad Computer Programming\par
- Department of Computer Science\par
- Telephone \up[415\up]\thinspace 723-4367\par}
- \def\returnaddress{Prof.~D. E. Knuth\par \csdreturn}
- \letterhead}
-
-\def\memoto{\beginlinemode\parindent=60truept
- \everypar{\hangindent70truept}\startmemo}
-\def\bigmemoto{\beginlinemode\parindent=60pt % use this for magstep>1!
- \everypar{\hangindent70pt}\startmemo}
-\def\textin#1{\noindent\hbox to\parindent{#1\hss}\ignorespaces}
-{\obeylines\gdef\startmemo #1
- {\gdef\addressee{#1}%
- \global\pageno=1 \vglue-34pt\specrule{11}\vskip8truept
- \leftline{\smash{\hbox to60truept{\hfil\kern2.5truept
- \lower10truept\stanfordseal\hfil}}%
- \largeheadfont Stanford Computer Science Department %
- \rm\today}%
- \vskip6truept\specrule{20}\bigskip\bigskip\bigskip%
- \textin{Memo to:}#1
- \def\endmode{\par\endgroup\bigskip}}
- \gdef\from #1
- {\smallskip\textin{From:}#1
- }
- \gdef\subject #1
- {\smallskip\textin{Subject:}#1
- }
-}
-
-\def\makelabel{\endletter\hbox{\vrule
- \vbox{\hrule \kern6truept
- \hbox{\kern6truept\stanfordseal\kern3pt
- \vbox{\smallheadfont\baselineskip9truept\hsize=2truein\returnaddress}
- \kern6truept}\kern6truept\hrule}\vrule}
- \kern.1truein
- \hbox{\vrule
- \vbox{\hrule \kern12truept
- \hbox{\kern12truept\copy\theaddress
- \kern12truept}\kern12truept\hrule}\vrule}
- \pageno=0\vfill\eject}
-
-\def\frac#1/#2{\leavemode\kern.1em\raise.5ex\hbox{\the\scriptfont0
- #1}\kern-.1em/\kern-.15em\lower.25ex\hbox{\the\scriptfont0 #2}}
diff --git a/Master/texmf-dist/tex/plain/base/letterformat.tex b/Master/texmf-dist/tex/plain/base/letterformat.tex
new file mode 100644
index 00000000000..bc2144a3c15
--- /dev/null
+++ b/Master/texmf-dist/tex/plain/base/letterformat.tex
@@ -0,0 +1,85 @@
+% This macro file is for business letters
+
+\def\today{\ifcase\month\or
+ January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
+ \space\number\day, \number\year}
+
+\raggedbottom
+\interlinepenalty=1000
+\hsize=6.25truein
+\voffset=24pt
+\advance\vsize by-\voffset
+\parindent=0pt
+\parskip=0pt
+\nopagenumbers
+\headline={\ifnum\pageno>1
+ \tenrm To \addressee\hfil\today\hfil Page \folio
+ \else\hfil\fi}
+
+\def\beginlinemode{\endmode
+ \begingroup\obeylines\def\endmode{\par\endgroup}}
+\def\beginparmode{\endmode
+ \begingroup\parskip=\medskipamount \def\endmode{\par\endgroup}}
+\let\endmode=\par
+\def\endletter{\endmode\vfill\supereject}
+
+\newdimen\longindentation \longindentation=4truein
+\newbox\theaddress
+\def\address{\beginlinemode\getaddress}
+{\obeylines\gdef\getaddress #1
+ #2
+ {#1\gdef\addressee{#2}%
+ \global\setbox\theaddress=\vbox\bgroup\raggedright%
+ \hsize=\longindentation \everypar{\hangindent2em}#2
+ \def\endmode{\egroup\endgroup \copy\theaddress \bigskip}}}
+
+\def\body{\beginparmode}
+\def\closing{\beginlinemode\getclosing}
+{\obeylines\gdef\getclosing #1
+ #2
+ {#1\nobreak\bigskip \leftskip=\longindentation #2
+ \nobreak\bigskip\bigskip\bigskip % space for signature
+ \def
+ {\endgraf\nobreak}}}
+\def\annotations{\beginlinemode\def\par{\endgraf\nobreak}\obeylines\par}
+\def\ps{\beginparmode\nobreak
+ \interlinepenalty5000\def\par{\endgraf\penalty5000 }}
+
+\def\up#1{\leavevmode \raise.16ex\hbox{#1}}
+\font\smallheadfont=cmr8 at 8truept
+\font\largeheadfont=cmdunh10 at 14.4truept
+\font\logofont=manfnt at 14.4truept
+
+\def\rjdletterhead{
+ \def\sendingaddress{R. J. DROFNATS, F.T.U.G.\par
+ PROFESSOR OF FARM ECOLOGY\par
+ TEX.RJD @ SU-SCORE.ARPA\par
+ \up[415\up]\thinspace 497-4975\par}
+ \def\returnaddress{R. J. Drofnats, Dept.~of Farm Ecology\par
+ The University of St.~Anford\par
+ P. O. Box 1009, Haga Alto, CA 94321 USA}
+ \letterhead}
+
+\def\letterhead{\pageno=1 \def\addressee{} \univletterhead
+ {\leftskip=\longindentation
+ {\baselineskip9truept\smallheadfont\sendingaddress}
+ \bigskip\bigskip\rm\today\bigskip}}
+
+\def\univletterhead{\vglue-\voffset
+ \hbox{\hbox to\longindentation{\raise4truemm\hbox{\logofont
+ \kern2truept X\kern-1.667truept
+ \lower2truept\hbox{X}\kern-1.667truept X}\hfil
+ \largeheadfont The University of St.~Anford\hfil}%
+ \kern-\longindentation
+ \vbox{\smallheadfont\baselineskip9truept
+ \leftskip=\longindentation BOX 1009\par HAGA ALTO, CA 94321}}
+ \vskip2truept\hrule\vskip4truept }
+
+\def\makelabel{\endletter\hbox{\vrule
+ \vbox{\hrule \kern6truept
+ \hbox{\kern6truept\vbox to 2truein{\hsize=\longindentation
+ \smallheadfont\baselineskip9truept\returnaddress
+ \vfill\moveright 2truein\copy\theaddress\vfill}%
+ \kern6truept}\kern6truept\hrule}\vrule}
+ \pageno=0\vfill\eject}
diff --git a/Master/texmf-dist/tex/plain/base/list-latin.tex b/Master/texmf-dist/tex/plain/base/list-latin.tex
index 71d5bb6d9a1..09e27dd479a 100644
--- a/Master/texmf-dist/tex/plain/base/list-latin.tex
+++ b/Master/texmf-dist/tex/plain/base/list-latin.tex
@@ -1,4 +1,3 @@
-% This program by D. E. Knuth is not copyrighted and can be used freely.
% Makes a listing of one or more files
% Extended to allow the Latin-1 accented characters in UTF-8 encoding
% Typical usage:
@@ -63,32 +62,3 @@
% at present, it's indistinguishable from newline (^^J).
% You can get up to 103 characters on a line without an overfull box.
-
-% Further notes from Don, January 2017:
-%
-% Maybe I'm the only person left who still uses plain TeX in a UTF-8 world.
-%
-% But for what it's worth, I'm appending a little file that I prepared today,
-% since it turned out to be useful in a project of interest to me.
-%
-% Namely, I've got a program that takes an XML encoding of organ-pipe
-% settings, used by performers when they change the stops during a
-% performance, and translates it into a human-readable form.
-% I mean, the output says "when you reach combination nunber 0013,
-% the following ranks of pipes are set to play".
-%
-% The names of those ranks of pipes often contain accented characters,
-% as well as things like the German \ss. In order to use such texts on the Web,
-% I have them in UTF-8 code. But to make a verbatim hardcopy listing using
-% nice typewriter-style fonts, I wanted a program like "list.tex", which
-% I've been using to print text files for more than 25 years.
-%
-% Fortunately, the accented characters all turn out to be two-character
-% sequences in UTF-8, where the first character is always '303. So I
-% can simply make that character active, and it can then change the
-% following character appropriately.
-%
-% Therefore I added a few lines to "list.tex", resulting in "list-latin.tex".
-% And it works! Hence it might be a useful addition to the CTAN archives.
-%
-% Yours truly, Don
diff --git a/Master/texmf-dist/tex/plain/base/llist-latin.tex b/Master/texmf-dist/tex/plain/base/llist-latin.tex
new file mode 100644
index 00000000000..cbc61408500
--- /dev/null
+++ b/Master/texmf-dist/tex/plain/base/llist-latin.tex
@@ -0,0 +1,84 @@
+% Makes a landscape listing of one or more files
+% Extended to allow the Latin-1 accented characters in UTF-8 encoding
+% Typical usage:
+% tex llist-latin *.txt \\end
+
+\def\grabfile#1 {\setbox0=\lastbox\endgraf\doit{#1}}
+\everypar{\grabfile}
+
+\font\filenamefont= cmtt8 scaled\magstep3
+\font\headlinefont= cmr8
+\font\listingfont= cmtex8
+\font\ttfont= cmtt8
+\font\syttfont= cmsytt10 at 8pt
+\font\eoffont= cmti8
+
+\def\today{\ifcase\month\or
+ January\or February\or March\or April\or May\or June\or
+ July\or August\or September\or October\or November\or December\fi
+ \space\number\day, \number\year}
+\newcount\m \newcount\n
+\n=\time \divide\n 60 \m=-\n \multiply\m 60 \advance\m \time
+\def\hours{\twodigits\n\twodigits\m}
+\def\twodigits#1{\ifnum #1<10 0\fi \number#1}
+
+\newlinechar=`@
+\message{@\today\space at \hours}
+
+\baselineskip=9pt
+\medskipamount=4pt minus 1pt
+\raggedbottom
+\nopagenumbers
+
+\newcount\n
+\catcode`\^^c3=\active
+\def\missing{{\syttfont\char15}}
+\def^^c3#1{\n=`#1\advance\n by-128
+ {\ttfont\ifcase\n
+ \`A\or\'A\or\^A\or\~A\or\"A\or\AA\or\AE\or\c C\or
+ \`E\or\'E\or\^E\or\"E\or\`I\or\'I\or\^I\or\"I\or
+ \missing\or\~N\or\`O\or\'O\or\^O\or\~O\or\"O\or{\syttfont\char2}\or
+ \O\or\`U\or\'U\or\^U\or\"U\or\'Y\or\missing\or\ss\or
+ \`a\or\'a\or\^a\or\~a\or\"a\or\aa\or\ae\or\c c\or
+ \`e\or\'e\or\^e\or\"e\or\`\i\or\'\i\or\^\i\or\"\i\or
+ \missing\or\~n\or\`o\or\'o\or\^o\or\~o\or\"o\or{\syttfont\char4}\or
+ \o\or\`u\or\'u\or\^u\or\"u\or\'y\or\missing\or\"y\fi}}
+
+\chardef\other=12
+\def\doit#1{\message{@Listing #1@}
+ \begingroup \everypar{} \frenchspacing
+ \headline{\ifright \headlinefont \hfill Page \folio
+ \else\filenamefont#1\quad\headlinefont \today\ at \hours\hss \fi}
+ \def\do##1{\catcode`##1=\other}\dospecials
+ \catcode127=\other \catcode9=\other \catcode12=\other
+ \parindent 0pt \parfillskip=0pt plus 1fil minus .8in
+ \everypar{\hangindent 1in} \rightskip=0pt plus 2in
+ \def\par{\ifvmode\penalty-50\medskip\else\endgraf\fi}
+ \listingfont \obeylines \obeyspaces \global\pageno=1
+ \input #1 {\eoffont(end of\/ file)}\endgraf\vfill\eject
+ \ifright\null\vfill\eject\fi\endgroup}
+{\obeyspaces\global\let =\ }
+\catcode`\_=\other % allow _ in file names
+
+\hsize=4.6truein
+\vsize=7truein
+\hoffset=-.5truein
+\voffset=-.2truein
+\newif\ifright
+\newbox\lefthalf
+\output{\ifright
+ \shipout\hbox{\hbox to5.5in{\box\lefthalf\hss}%
+ \vbox{\makeheadline\pagebody\makefootline}}
+ \advancepageno\global\rightfalse
+ \else\global\setbox\lefthalf\vbox{\makeheadline\pagebody\makefootline}
+ \global\righttrue\fi}
+
+\special{landscape}
+
+% A tab (^^I) prints as lowercase gamma.
+% Character ^^M could be made visible, with a bit of work;
+% at present, it's indistinguishable from newline (^^J).
+
+% You can get up to 91 characters on a line without an overfull box.
+% (But lines with more than 84 characters will be clipped, if they
+% appear on a righthand halfpage.)
diff --git a/Master/texmf-dist/tex/plain/base/llist.tex b/Master/texmf-dist/tex/plain/base/llist.tex
index f107169e248..9674f618030 100644
--- a/Master/texmf-dist/tex/plain/base/llist.tex
+++ b/Master/texmf-dist/tex/plain/base/llist.tex
@@ -31,7 +31,7 @@
\def\doit#1{\message{@Listing #1@}
\begingroup \everypar{} \frenchspacing
\headline{\ifright \headlinefont \hfill Page \folio
- \else\filenamefont#1\quad\headlinefont \today\ at \hours\hfill \fi}
+ \else\filenamefont#1\quad\headlinefont \today\ at \hours\hss \fi}
\def\do##1{\catcode`##1=\other}\dospecials
\catcode127=\other \catcode9=\other \catcode12=\other
\parindent 0pt \parfillskip=0pt plus 1fil minus .8in
diff --git a/Master/texmf-dist/tex/plain/base/plain.tex b/Master/texmf-dist/tex/plain/base/plain.tex
index 2b72027dff8..0f363a96c0e 100644
--- a/Master/texmf-dist/tex/plain/base/plain.tex
+++ b/Master/texmf-dist/tex/plain/base/plain.tex
@@ -225,11 +225,11 @@
\outer\def\newcount{\alloc@0\count\countdef\insc@unt}
\outer\def\newdimen{\alloc@1\dimen\dimendef\insc@unt}
\outer\def\newskip{\alloc@2\skip\skipdef\insc@unt}
-\outer\def\newmuskip{\alloc@3\muskip\muskipdef\@cclvi}
+\outer\def\newmuskip{\alloc@3\muskip\muskipdef\@cclv}
\outer\def\newbox{\alloc@4\box\chardef\insc@unt}
\let\newtoks=\relax % we do this to allow plain.tex to be read in twice
\outer\def\newhelp#1#2{\newtoks#1#1\expandafter{\csname#2\endcsname}}
-\outer\def\newtoks{\alloc@5\toks\toksdef\@cclvi}
+\outer\def\newtoks{\alloc@5\toks\toksdef\@cclv}
\outer\def\newread{\alloc@6\read\chardef\sixt@@n}
\outer\def\newwrite{\alloc@7\write\chardef\sixt@@n}
\outer\def\newfam{\alloc@8\fam\chardef\sixt@@n}
@@ -1238,4 +1238,4 @@
\nonfrenchspacing % punctuation affects the spacing
\catcode`@=12 % at signs are no longer letters
-\def\fmtname{plain}\def\fmtversion{3.141592653} % identifies the current format
+\def\fmtname{plain}\def\fmtversion{3.1415926535} % identifies the current format
diff --git a/Master/texmf-dist/tex/plain/knuth-lib/webmac.tex b/Master/texmf-dist/tex/plain/knuth-lib/webmac.tex
index 5ca707bb9b2..ec44128d45c 100644
--- a/Master/texmf-dist/tex/plain/knuth-lib/webmac.tex
+++ b/Master/texmf-dist/tex/plain/knuth-lib/webmac.tex
@@ -1,5 +1,5 @@
% standard macros for WEB listings (in addition to PLAIN.TEX)
-\xdef\fmtversion{\fmtversion+WEBMAC4.1} % identifies current set of macros
+\xdef\fmtversion{\fmtversion+WEBMAC4.2} % identifies current set of macros
\parskip 0pt % no stretch between paragraphs
\parindent 1em % for paragraphs and for the first line of Pascal text
@@ -84,8 +84,10 @@
\edef\next{\write\cont{\Z{#2}{\modno}{\the\pageno}}}\next % to contents file
\ifon\startsection{\bf\ignorespaces#2.\quad}\ignorespaces}
\def\MN#1.{\par % common code for \M, \N
- {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}
- \ifx\modno\modstar \onmaybe \else\ontrue \fi \mark{\modno}}
+ {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}% remove \* from section name
+ \ifx\modno\modstar \onmaybe \else\ontrue \fi
+ \mark{{{\tensy x}\modno}{\rhead}}}
+ % each \mark is {section reference or null}{group title}
\def\O#1{\hbox{\rm\char'23\kern-.2em\it#1\/\kern.05em}} % octal constant
\def\P{\rightskip=0pt plus 100pt minus 10pt % go into Pascal mode
\sfcode`;=3000
@@ -115,10 +117,14 @@
\def\onmaybe{\let\ifon=\maybe} \let\maybe=\iftrue
\newif\ifon \newif\iftitle \newif\ifpagesaved
-\def\lheader{\mainfont\the\pageno\eightrm\qquad\rhead\hfill\title\qquad
- \tensy x\mainfont\topmark} % top line on left-hand pages
-\def\rheader{\tensy x\mainfont\topmark\eightrm\qquad\title\hfill\rhead
- \qquad\mainfont\the\pageno} % top line on right-hand pages
+\def\lheader{\mainfont\the\pageno\eightrm\qquad\rhead
+ \hfill\title\qquad\mainfont\topsecno} % top line on left-hand pages
+\def\rheader{\mainfont\topsecno\eightrm\qquad\title\hfill
+ \rhead\qquad\mainfont\the\pageno} % top line on right-hand pages
+\def\topsecno{\expandafter\takeone\topmark}
+\def\takeone#1#2{#1}
+\def\taketwo#1#2{#2}
+\def\nullsec{\eightrm\kern-2em} % the \kern-2em cancels \qquad in headers
\def\page{\box255 }
\def\normaloutput#1#2#3{\ifodd\pageno\hoffset=\pageshift\fi
\shipout\vbox{
@@ -129,6 +135,7 @@
\global\advance\pageno by1}
\def\rhead{\.{WEB} OUTPUT} % this running head is reset by starred sections
+\mark{\noexpand\nullsec{\rhead}}
\def\title{} % an optional title can be set by the user
\def\topofcontents{\centerline{\titlefont\title}
\vfill} % this material will start the table of contents page
@@ -183,6 +190,7 @@
\if L\lr\else\null\vfill\eject\fi % finish the current page
\parfillskip 0pt plus 1fil
\def\rhead{NAMES OF THE SECTIONS}
+ \let\topsecno=\nullsec
\message{Section names:}
\output{\normaloutput\page\lheader\rheader}
\setpage