pwebmac (11feb21)

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

4 files changed, 59 insertions, 67 deletions

diff --git a/Master/texmf-dist/doc/plain/pwebmac/README.md b/Master/texmf-dist/doc/plain/pwebmac/README.md
index 92335dcbead..5c3399b280b 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/README.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/README.md
@@ -29,4 +29,4 @@ clickable links and bookmarks (depending on your PDF viewer).
 
 The `pwebmac` package is free software and may be used without constraints.
 
-This is version “4.5.6” of the `pwebmac` package — 2020-09-13, AS.
+This is version “4.5.7” of the `pwebmac` package — 2021-02-11, AS.
diff --git a/Master/texmf-dist/doc/plain/pwebmac/index.md b/Master/texmf-dist/doc/plain/pwebmac/index.md
index 0df2b9d9f50..b7584641ce9 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/index.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/index.md
@@ -1,15 +1,17 @@
 ---
-title: WEB programs in “TeX Live 2021”
+title: C/WEB programs in “\TeX\ Live 2021”
 colorlinks: true
 ---
+\raggedright
+\vspace{-2\baselineskip}
 
 ## Introduction
 
-Welcome to “All Things `WEB`” in “TeX Live.”
+Welcome to “All Things `WEB`” in “\TeX\ Live.”
 
 Here you find the documented source code of all major `WEB` and `CWEB` programs
 in readable format.  The “named” entries represent the unmodified base sources,
-the attached `[chg]` links point to “only the changed sections (or modules),”
+the attached “`chg`” links point to “only the changed sections (or modules),”
 so you may want to study these pairs in parallel.  Care has been taken to keep
 the section numbers for the main parts intact.
 
@@ -20,70 +22,74 @@ programs do not require these extra modifications, they get linked directly to
 the external runtime environment.)
 
 If you believe to have found anything that remains technically, historically,
-typographically, or politically incorrect, please notify the maintainers at
+typographically, or politically incorrect, please notify the maintainers on
 [the tex-k mailing list](mailto:tex-k@tug.org).
 
 ## Canonical Knuthian WEB programs
 
-* `errata/` \[
-  [The Errors of TeX](errata/errorlog.pdf) \|
-  [The TeXbook, 1^st^\ printing](errata/errata.one.pdf) \|
-  [The TeXbook, 2^nd^\ printing](errata/errata.two.pdf) \|
-  [Computers&Typesetting, 15\ June\ 1987](errata/errata.three.pdf) \|
-  [Computers&Typesetting, 20\ February\ 1989](errata/errata.four.pdf) \|
-  [Computers&Typesetting, 30\ September\ 1989](errata/errata.five.pdf) \|
-  [Computers&Typesetting, 31\ December\ 1990](errata/errata.six.pdf) \|
-  [Computers&Typesetting, 15\ March\ 1992](errata/errata.seven.pdf) \|
-  [Computers&Typesetting, pre-Millennium\ ed.](errata/errata.eight.pdf) \|
-  [The TeXbook, September 1996](errata/errata.nine.pdf) \|
-  [Computers&Typesetting, 1^st^\ Millennium\ ed.](errata/errata.ten.pdf) \|
-  [Computers&Typesetting, 2^nd^\ Millennium\ ed.](errata/errata.eleven.pdf) \|
-  [Computers&Typesetting, present](errata/errata.pdf) \]
 * `etc/` \[
-  [`VFtoVP`](etc/vftovp.pdf)~[chg](etc/vftovp-changes.pdf)~ \|
-  [`VPtoVF`](etc/vptovf.pdf)~[chg](etc/vptovf-changes.pdf)~ \]
+  [`VFtoVP`](etc/vftovp.pdf) ~[`chg`](etc/vftovp-changes.pdf)~ \|
+  [`VPtoVF`](etc/vptovf.pdf) ~[`chg`](etc/vptovf-changes.pdf)~ \]
 * `mf/` \[
-  [`Metafont`](mf/mf.pdf)~[chg](mf/mf-changes.pdf)~ \|
+  [`Metafont`](mf/mf.pdf) ~[`chg`](mf/mf-changes.pdf)~ \|
   [`TRAPMAN`](mf/trapman.pdf) \]
 * `mfware/` \[
-  [`GFtype`](mfware/gftype.pdf)~[chg](mfware/gftype-changes.pdf)~ \|
-  [`GFtoPK`](mfware/gftopk.pdf)~[chg](mfware/gftopk-changes.pdf)~ \|
-  [`GFtoDVI`](mfware/gftodvi.pdf)~[chg](mfware/gftodvi-changes.pdf)~ \|
-  [`MFT`](mfware/mft.pdf)~[chg](mfware/mft-changes.pdf)~ \]
+  [`GFtype`](mfware/gftype.pdf) ~[`chg`](mfware/gftype-changes.pdf)~ \|
+  [`GFtoPK`](mfware/gftopk.pdf) ~[`chg`](mfware/gftopk-changes.pdf)~ \|
+  [`GFtoDVI`](mfware/gftodvi.pdf) ~[`chg`](mfware/gftodvi-changes.pdf)~ \|
+  [`MFT`](mfware/mft.pdf) ~[`chg`](mfware/mft-changes.pdf)~ \]
 * `tex/` \[
   [`GLUE`](tex/glue.pdf) \|
-  [`TeX`](tex/tex.pdf)~[chg](tex/tex-changes.pdf)~ \|
+  [`TeX`](tex/tex.pdf) ~[`chg`](tex/tex-changes.pdf)~ \|
   [`TRIPMAN`](tex/tripman.pdf) \]
 * `texware/` \[
-  [`POOLtype`](texware/pooltype.pdf)~[chg](texware/pooltype-changes.pdf)~ \|
-  [`TFtoPL`](texware/tftopl.pdf)~[chg](texware/tftopl-changes.pdf)~ \|
-  [`PLtoTF`](texware/pltotf.pdf)~[chg](texware/pltotf-changes.pdf)~ \|
-  [`DVItype`](texware/dvitype.pdf)~[chg](texware/dvitype-changes.pdf)~ \]
+  [`POOLtype`](texware/pooltype.pdf) ~[`chg`](texware/pooltype-changes.pdf)~ \|
+  [`TFtoPL`](texware/tftopl.pdf) ~[`chg`](texware/tftopl-changes.pdf)~ \|
+  [`PLtoTF`](texware/pltotf.pdf) ~[`chg`](texware/pltotf-changes.pdf)~ \|
+  [`DVItype`](texware/dvitype.pdf) ~[`chg`](texware/dvitype-changes.pdf)~ \]
 * `web/` \[
   [`WEBMAN`](web/webman.pdf) \|
-  [`WEAVE`](web/weave.pdf)~[chg](web/weave-changes.pdf)~ \|
-  [`TANGLE`](web/tangle.pdf)~[chg](web/tangle-changes.pdf)~ \]
+  [`WEAVE`](web/weave.pdf) ~[`chg`](web/weave-changes.pdf)~ \|
+  [`TANGLE`](web/tangle.pdf) ~[`chg`](web/tangle-changes.pdf)~ \]
 
 ## Complementary WEB programs
 
 * `other/` \[
-  [`DVIcopy`](other/dvicopy.pdf)~[chg](other/dvicopy-changes.pdf)~ \|
-  [`PatGen`](other/patgen.pdf)~[chg](other/patgen-changes.pdf)~ \|
-  [`PKtoGF`](other/pktogf.pdf)~[chg](other/pktogf-changes.pdf)~ \|
-  [`PKtype`](other/pktype.pdf)~[chg](other/pktype-changes.pdf)~ \]
-* `bibtex/` \[ [`BibTeX`](bibtex/bibtex.pdf)~[chg](bibtex/bibtex-changes.pdf)~ \]
-* `pdftex/` \[ [`pdfTeX`](pdftex/pdftex.pdf)~[chg](pdftex/pdftex-changes.pdf)~ \]
-* `xetex/` \[ [`XeTeX`](xetex/xetex.pdf)~[chg](xetex/xetex-changes.pdf)~ \]
+  [`DVIcopy`](other/dvicopy.pdf) ~[`chg`](other/dvicopy-changes.pdf)~ \|
+  [`PatGen`](other/patgen.pdf) ~[`chg`](other/patgen-changes.pdf)~ \|
+  [`PKtoGF`](other/pktogf.pdf) ~[`chg`](other/pktogf-changes.pdf)~ \|
+  [`PKtype`](other/pktype.pdf) ~[`chg`](other/pktype-changes.pdf)~ \]
+* `bibtex/` \[ [`BibTeX`](bibtex/bibtex.pdf) ~[`chg`](bibtex/bibtex-changes.pdf)~ \]
+* `pdftex/` \[ [`pdfTeX`](pdftex/pdftex.pdf) ~[`chg`](pdftex/pdftex-changes.pdf)~ \]
+* `xetex/` \[ [`XeTeX`](xetex/xetex.pdf) ~[`chg`](xetex/xetex-changes.pdf)~ \]
 
 ## CWEB programs
 
 * `cweb/` \[
   [`CWEBMAN`](cweb/cwebman.pdf) \|
-  [`COMMON`](cweb/common.pdf)~[chg](cweb/common-changes.pdf)~ \|
-  [`CTANGLE`](cweb/ctangle.pdf)~[chg](cweb/ctangle-changes.pdf)~ \|
-  [`CWEAVE`](cweb/cweave.pdf)~[chg](cweb/cweave-changes.pdf)~ \|
+  [`COMMON`](cweb/common.pdf) ~[`chg`](cweb/common-changes.pdf)~ \|
+  [`CTANGLE`](cweb/ctangle.pdf) ~[`chg`](cweb/ctangle-changes.pdf)~ \|
+  [`CWEAVE`](cweb/cweave.pdf) ~[`chg`](cweb/cweave-changes.pdf)~ \|
   [`CTWILL`](cweb/ctwill.pdf) \]
-* `ctie/` \[ [`CTIE`](ctie/ctie.pdf)~[chg](ctie/ctie-changes.pdf)~ \]
-* `tie/` \[ [`TIE`](tie/tie.pdf)~[chg](tie/tie-changes.pdf)~ \]
+* `ctie/` \[ [`CTIE`](ctie/ctie.pdf) ~[`chg`](ctie/ctie-changes.pdf)~ \]
+* `tie/` \[ [`TIE`](tie/tie.pdf) ~[`chg`](tie/tie-changes.pdf)~ \]
+
+## Errata for “Computers & Typesetting”
+
+* `errata/`
+  * [The Errors of \TeX](errata/errorlog.pdf)
+  * [The \TeX book, 1^st^\ printing](errata/errata.one.pdf)
+  * [The \TeX book, 2^nd^\ printing](errata/errata.two.pdf)
+  * [Computers & Typesetting, 15\ June\ 1987](errata/errata.three.pdf)
+  * [Computers & Typesetting, 20\ February\ 1989](errata/errata.four.pdf)
+  * [Computers & Typesetting, 30\ September\ 1989](errata/errata.five.pdf)
+  * [Computers & Typesetting, 31\ December\ 1990](errata/errata.six.pdf)
+  * [Computers & Typesetting, 15\ March\ 1992](errata/errata.seven.pdf)
+  * [Computers & Typesetting, pre-Millennium\ ed.](errata/errata.eight.pdf)
+  * [The \TeX book, September 1996](errata/errata.nine.pdf)
+  * [Computers & Typesetting, 1^st^\ Millennium\ ed.](errata/errata.ten.pdf)
+  * [Computers & Typesetting, 2^nd^\ Millennium\ ed.](errata/errata.eleven.pdf)
+  * [Computers & Typesetting, early 2014](errata/errata.twelve.pdf)
+  * [Computers & Typesetting, 31\ January\ 2021](errata/errata.pdf)
 
 ## Happy C/WEB Programming!
diff --git a/Master/texmf-dist/doc/plain/pwebmac/makeall b/Master/texmf-dist/doc/plain/pwebmac/makeall
index 035141119b2..b67a8af1540 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/makeall
+++ b/Master/texmf-dist/doc/plain/pwebmac/makeall
@@ -82,10 +82,7 @@ do
 	esac
 done
 
-if [ xetex = $TEX ]
-then CWEAVE="cweave -f -lp+"
-else CWEAVE="cweave -f"
-fi
+CWEAVE="cweave -f"
 CTWILL="ctwill -f +lpdf"
 PAX="pax -wvzf"
 SED_I="sed -i" # non-GNU-sed requires an extra '' argument for '-i' option.
@@ -191,18 +188,15 @@ FI
 		esac
 	fi
 
-	# replace former convention to indicate "not a title page"
-	# to include page headers for table-of-contents
-	# FIX: most of the WEB codes will be corrected upstream.
-	$SED_I -e "s/\\\\def\\\\titlepage{F}/\\\\titlefalse/" $f.tex
-
 	# special treatment for individual C/WEB programs
 	case $f in
+		# replace former convention to indicate "not a title
+		# page" to include page headers for table-of-contents;
 		# purge conflict between bibtex.web and webmac.tex
 		# 'E' no longer free to be active character
 		# fix table-of-contents page for bibtex
 		# FIX: don't wait for Oren Patashnik.
-		bibtex ) $SED_I -e "s/titlefalse/titletrue/" $f.tex
+		bibtex ) $SED_I -e "s/\\\\def\\\\titlepage{F}/\\\\titletrue/" $f.tex
 			if ! $CHANGES
 			then
 				$SED_I -e "71,78d" $f.tex
@@ -221,10 +215,6 @@ FI
 					$f.tex
 			fi ;;
 
-		# make room for new material in weave.web
-		# FIX: should be fixed upstream.
-		tangle ) $SED_I -e "s/number{123}/number{125}/" $f.tex ;;
-
 		# FIX: purge obsolete macros from XeTeX.
 		xetex ) $SED_I -e "/\\\\input xewebmac/d" $f.tex ;;
 
@@ -309,7 +299,7 @@ then
 		# * WEB and CWEB manuals
 		export TEXINPUTS=.:$(kpsewhich --var-value=TEXMFDIST)//:$KNUTHWARE//
 
-		rm -f trapman.tex webman.tex cwebman.tex errorlog.tex
+		rm -f trapman.tex webman.tex cwebman.tex
 
 		# FIX: Prepare 'trapman' for automatic processing; several
 		# input files are renamed in TeX Live (in fact, there are
@@ -325,10 +315,6 @@ then
 		f=$(kpsewhich -engine tex cwebman)
 		tie -m $(basename $f) $f $(basename $f .tex)-w2c.ch
 
-		# FIX: Prepare 'errorlog.tex' for automatic processing;
-		# requires a 'meta-bug' to be fixed.
-		f=$(kpsewhich -engine tex errorlog)
-		tie -m $(basename $f) $f /opt/github/web/$(basename $f .tex).ch
 		touch pages.tex # let 'manmac' produce output at all
 
 		for f in tripman trapman webman cwebman errorlog
@@ -337,7 +323,7 @@ then
 		done
 
 		for f in one two three four five six seven eight nine ten \
-			eleven # twelve
+			eleven twelve
 		do
 			$TEX errata.$f
 			mv errata.pdf errata.$f.pdf
diff --git a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
index 39907b48c53..7f9972d21c5 100644
--- a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
+++ b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
@@ -4,7 +4,7 @@
 % macro integration \`a la CWEB by Andreas Scherer <andreas_tex@freenet.de>.
 % This file is not copyrighted and can be used freely.
 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+WEBMAC4.5}
+\xdef\fmtversion{\fmtversion+WEBMAC4.6}
 \newif\ifpdf
 \ifx\pdf+\pdftrue\fi
 % Uncomment the following line if you want PDF goodies to be the default
@@ -15,7 +15,7 @@
 \ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse
 \else \pdftextrue \pdfoutput=1
   \def\Black{\pdfliteral{0 g 0 G}}  % use rgb colors for direct PDF output too
-  \def\PDFlinkcolor{\pdfliteral{\pdflinkcolor rg \pdflinkcolor RG}}
+  \def\PDFlinkcolor{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
 \fi\fi
 \newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi