diff options
author | Norbert Preining <norbert@preining.info> | 2021-02-10 03:01:13 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-02-10 03:01:13 +0000 |
commit | 7428e668f046bec10d1200214789e40390fa51e7 (patch) | |
tree | d28de61e9d3ed96c80ebf2300d0ba3d6a76414e6 /systems/knuth/dist/lib | |
parent | 1350502b809c028b8f123dec94ca92782eda564f (diff) |
CTAN sync 202102100301
Diffstat (limited to 'systems/knuth/dist/lib')
-rw-r--r-- | systems/knuth/dist/lib/grayf.mf | 2 | ||||
-rw-r--r-- | systems/knuth/dist/lib/plain.tex | 6 | ||||
-rw-r--r-- | systems/knuth/dist/lib/slant.mf | 4 | ||||
-rw-r--r-- | systems/knuth/dist/lib/webmac.tex | 22 |
4 files changed, 21 insertions, 13 deletions
diff --git a/systems/knuth/dist/lib/grayf.mf b/systems/knuth/dist/lib/grayf.mf index 1a34e18fd1..7765ebd812 100644 --- a/systems/knuth/dist/lib/grayf.mf +++ b/systems/knuth/dist/lib/grayf.mf @@ -10,7 +10,7 @@ forsuffixes m = mag,rep: mg := mag; mag := 1; mode_setup; if mg>1: hppp := hppp*mg; vppp := vppp*mg; extra_endchar:= - "if charcode>0:currentpicture:=currentpicture scaled mg;fi" + "if charcode>0:currentpicture:=currentpicture scaled mg;fi;" & extra_endchar; fi; if picture pix_picture: rep := 1; diff --git a/systems/knuth/dist/lib/plain.tex b/systems/knuth/dist/lib/plain.tex index 2b72027dff..0f363a96c0 100644 --- a/systems/knuth/dist/lib/plain.tex +++ b/systems/knuth/dist/lib/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/systems/knuth/dist/lib/slant.mf b/systems/knuth/dist/lib/slant.mf index 3763222bce..b851c3e1d8 100644 --- a/systems/knuth/dist/lib/slant.mf +++ b/systems/knuth/dist/lib/slant.mf @@ -19,8 +19,8 @@ pickup pencircle scaled r; ruler := savepen; for k=1 upto n: beginchar(k,k*u#*s,n*u#,0); pickup ruler; draw origin--(k*u*s,k*u); - unfill (lft-1,bot -1)--(rt 1,bot -1) - --(rt 1,0)--(lft-1,0)--cycle; + unfill (lft -1,bot -1)--(rt 1,bot -1) + --(rt 1,0)--(lft -1,0)--cycle; unfill ((lft -1,0)--(rt 1,0) --(rt 1,top 1)--(lft -1,top 1)--cycle) shifted (k*u*s,k*u); endchar; endfor diff --git a/systems/knuth/dist/lib/webmac.tex b/systems/knuth/dist/lib/webmac.tex index 5ca707bb9b..ec44128d45 100644 --- a/systems/knuth/dist/lib/webmac.tex +++ b/systems/knuth/dist/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 |