pwebmac (6feb22)

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

3 files changed, 133 insertions, 98 deletions

diff --git a/Master/texmf-dist/doc/plain/pwebmac/README.md b/Master/texmf-dist/doc/plain/pwebmac/README.md
index a876aaf212a..1fec3c29a58 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/README.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/README.md
@@ -12,22 +12,26 @@ output; all these macros can only be used with a specific “TeX engine” each.
 The present `pwebmac` package integrates these three WEB macro files similar
 to `cwebmac.tex` in Silvio Levy's and Don Knuth's
 [CWEB](https://ctan.org/pkg/cweb) system, so `pwebmac.tex` can be used with
-“plain TeX,” “pdfTeX,” and “XeTeX” alike.
+“plain TeX,” “pdfTeX,” and “XeTeX” alike. And it adds full support for Martin
+Ruckert's “[HiTeX](https://ctan.org/pkg/hitex)” engine and its `HINT` output
+format.
 
-Its initial application is the production of PDF files for all major WEB
-programs for “TeX and friends” as distributed in
+Its initial application is the production of PDF and HINT files for all major
+WEB programs for “TeX and friends” as distributed in
 [TeX Live](https://www.tug.org/texlive).  For this purpose, the shell script
 `makeall` was whipped together; it provides various commandline options and
 works around several “quirks” in the WEB sources.  The resulting collection
-of PDF documents can be browsed in the `knuth-pdf` package.
+of PDF documents can be browsed in the `knuth-pdf` package amd the collection
+of HINT documents are available in the `knuth-hint` package.
 
 WEB programmers who want to use `pwebmac.tex` instead of the default
 `webmac.tex` in their programs have to change the first line in the TeX file
 created by `weave`.  From there, all depends on the “TeX engine” you use:
 “plain TeX” by default creates DVI output, “plain TeX” with the invocation
 `tex "\let\pdf+\input…"`, `pdftex`, and `xetex` create PDF output with
-clickable links and bookmarks (depending on your PDF viewer).
+clickable links and bookmarks (depending on your PDF viewer), and `hitex`
+creates HINT output that can be viewed with the `hintview` program.
 
 The `pwebmac` package is free software and may be used without constraints.
 
-This is version “4.6.4” of the `pwebmac` package — 2021-11-06, Andreas Scherer.
+This is version “4.7” of the `pwebmac` package — 2022-02-05, Andreas Scherer.
diff --git a/Master/texmf-dist/doc/plain/pwebmac/index.md b/Master/texmf-dist/doc/plain/pwebmac/index.md
index 0c9accb73ef..59f6663e267 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/index.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/index.md
@@ -1,5 +1,5 @@
 ---
-title: C/WEB programs in “\TeX\ Live 2021”
+title: C/WEB programs in \TeX\ Live 2022
 colorlinks: true
 filecolor: blue
 urlcolor: blue
@@ -9,14 +9,14 @@ urlcolor: blue
 
 ## 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
-as written by their respective authors, the attached “`chg`” links point to
-“only the changed sections (or modules)” as applied for release in the
-“\TeX\ Live” distribution, so you may want to study these pairs in parallel.
-Care has been taken to keep the section numbers for the main parts intact.
+in readable format.  The `NAMED` entries represent the unmodified base sources
+as written by their respective authors, the attached `chg` links point to
+only the changed sections (or modules) as applied for release in the
+\TeX\ Live distribution, so you may want to study these pairs in parallel.
+Care has been taken to keep the section numbering intact.
 
 Although not all the programs presented here are written or maintained by
 Donald Knuth, it is more convenient for everything to be collected in one place
@@ -24,67 +24,68 @@ for reading and searching.  And they all stem from the system that Knuth
 created.
 
 Note that all `WEB` programs are mogrified from Pascal code to C code before
-compilation, so further modifications and amendments will occur “for the real
-thing,” i.e., the production of the executable `WEB` programs.  (The `CWEB`
+compilation, so further modifications and amendments will occur for the real
+thing, i.e., the production of the executable `WEB` programs.  (The `CWEB`
 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 in any of these files, please feel
 free to [report bugs in \TeX\ and friends](https://tug.org/texmfbug/) or
-[contact the maintainer of this library](mailto:andreas_github@freenet.de)
+[contact the maintainer of this collection](mailto:andreas_github@freenet.de)
 directly.
 
 ## Canonical Knuthian WEB programs
 
 * `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) \|
+  [`TWILL`](web/twill.pdf) \]
 
 ## Complementary WEB programs by other authors
 
 * `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 by Knuth _et\ al._
 
 * `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) \|
-  [`REFSORT`](cweb/refsort.pdf)\ ~[`chg`](cweb/refsort-changes.pdf)~ \|
-  [`TWINX`](cweb/twinx.pdf)\ ~[`chg`](cweb/twinx-changes.pdf)~ \]
-* `ctie/` \[ [`CTIE`](ctie/ctie.pdf)\ ~[`chg`](ctie/ctie-changes.pdf)~ \]
-* `tie/` \[ [`TIE`](tie/tie.pdf)\ ~[`chg`](tie/tie-changes.pdf)~ \]
+  [`REFSORT`](cweb/refsort.pdf)+[`chg`](cweb/refsort-changes.pdf) \|
+  [`TWINX`](cweb/twinx.pdf)+[`chg`](cweb/twinx-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” by Donald E.\ Knuth
 
@@ -106,4 +107,4 @@ directly.
 
 ## Happy C/WEB Programming!
 
-2021-03-17 Andreas Scherer
+2022-02-02 Andreas Scherer
diff --git a/Master/texmf-dist/doc/plain/pwebmac/makeall b/Master/texmf-dist/doc/plain/pwebmac/makeall
index 879ec912d43..2a058c5c6f4 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/makeall
+++ b/Master/texmf-dist/doc/plain/pwebmac/makeall
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PROG=$(basename $0)
 
@@ -8,8 +8,8 @@ usage ()
 Usage: $PROG [options]
 
 Test driver for 'pwebmac.tex' in combination with various TeX engines.
-Produce TeX output in DVI or PDF from a set of C/WEB programs included
-in the 'TeX Live' source tree.
+Produce TeX output in DVI, PDF or HINT format from a set of C/WEB programs
+included in the 'TeX Live' source tree.
 
 Options are (--long options only with GNU getopt):
 	-c, --changes		Apply change file to C/WEB source
@@ -18,7 +18,7 @@ Options are (--long options only with GNU getopt):
 	-n, --new		Use 'pwebmac' instead of 'webmac'
 	-o, --outdir ARG	Create tarballs in path ARG
 	-p, --pdftocfront	Place TOC page at the front (PDF only)
-	-t, --tex ARG		Use TeX variant ARG={tex,pdftex,xetex}
+	-t, --tex ARG		Use TeX variant ARG={tex,{hi,pdf,xe}tex}
 
 Public domain.  Originally written by Andreas Scherer, 2020.
 HELP
@@ -32,7 +32,7 @@ FILESELECT=false # user-defined '--files' selection
 NEW=false # '\input pwebmac' instead of '\input webmac' for PDF et al.
 OUTDIR=. # path where the resulting tarballs are placed
 PDFTOCFRONT=false # push table-of-contents to front of PDF output
-TEX=tex # or 'pdftex' or 'xetex'
+TEX=tex # or 'pdftex' or 'xetex' or 'hitex'
 
 # Initial list of C/WEB sources to process, overridable with option '-f':
 KNUTHWHERE=$(locate /bibtex.web)
@@ -41,7 +41,7 @@ then echo "$PROG: Can't locate the TeX Live source tree!" >&2; exit 1
 fi
 KNUTHWARE=$(dirname $KNUTHWHERE)
 
-FILES="$KNUTHWARE/*.web pdftex.web xetex.web"
+FILES="$KNUTHWARE/*.web pdftex.web xetex.web twill"
 WEBINPUTS=$KNUTHWARE//:
 
 FILES="$FILES common ctangle cweave ctwill refsort twinx ctie tie"
@@ -87,6 +87,15 @@ CWEAVE="cweave -f +lX"
 CTWILL="ctwill -f +lpdf"
 PAX="pax -wvzf"
 SED_I="sed -i" # non-GNU-sed requires an extra '' argument for '-i' option.
+PDF=pdf
+
+# HINT format
+if [ hitex = $TEX ]
+then
+	$TEX -ini -jobname=hitex tex.ini
+	TEX="hitex --compress"
+	PDF=hnt
+fi
 
 # WEB and CWEB programs we want to get formatted
 for f in $FILES
@@ -101,6 +110,11 @@ do
 		$CTWILL $f # prime the pump
 		$CTWILL $f # get decent answers
 
+	elif [ twill = $f ]
+	then
+		tie -m $f.web weave.web weave.ch weav-$f.ch
+		weave $f
+
 	elif [ glue = $f ]
 	then
 		weave $f # no 'glue.ch' at this time
@@ -121,6 +135,9 @@ do
 				WEBINPUTS=$KNUTHWARE/../../Work//:$WEBINPUTS: \
 				weave $f $f-final ;;
 
+			# TWILL is a change in and of itself
+			twill ) ;;
+
 			# all other WEB codes have singular changefiles
 			* ) weave $f $f ;;
 		esac
@@ -157,7 +174,7 @@ do
 				$SED_I -e "s/\(\\\\def\\\\title\)/\\\\datecontentspage\n\1/" $f.tex ;;
 
 			mf | tex | pdftex | xetex )
-				$SED_I -e "s/\(\\\\def\\\\botofcontents\)/\\\\datethis\n\\\\emergencystretch=.1\\\\hsize\1/" $f.tex
+				$SED_I -e "s/\(\\\\def\\\\topofcontents\)/\\\\datethis\n\\\\emergencystretch=.1\\\\hsize\n\1/" $f.tex
 
 				# amend '\N' redefinition for PDF outlines in
 				# Metafont and TeX (also pdfTeX and XeTeX)
@@ -214,7 +231,7 @@ FI
 		# FIX: pdfTeX uses '\pdfTeX' in section names; these should
 		# appear correctly in the bookmarks, too.
 		pdftex )
-			if $NEW && [ tex != $TEX ]
+			if $NEW && [ tex != "$TEX" ] && [[ ! $TEX =~ hitex ]]
 			then
 				$SED_I -e "s/\(\\\\def\\\\pdfTeX{pdf\\\\TeX}\)/\1 \\\\sanitizecommand\\\\pdfTeX{pdfTeX}\\\\sanitizecommand\\\\eTeX{e-TeX}/" \
 					$f.tex
@@ -245,62 +262,72 @@ FI
 	# only XeTeX can process XETEX.WEB
 	if [ xetex = $f ]
 	then $f $f
-	elif [ refsort = $f ]
-	then $TEX -interaction nonstopmode $f
-	else $TEX $f
-	fi
-
-	if [ ctwill = $f ]
+	elif [ ctwill = $f ]
 	then
+		if [[ $TEX =~ hitex ]]
+		then
+			CTWILLTEX=pdftex
+		else
+			CTWILLTEX="$TEX"
+		fi
+		$CTWILLTEX $f
 		# sort mini-indexes
 		ctwill-refsort < $f.ref > $f.sref
-		$TEX $f
+		$CTWILLTEX $f
+	elif [ refsort = $f ]
+	then $TEX -interaction nonstopmode $f
+	else $TEX $f
 	fi
 done
 
-if $PDFTOCFRONT && ! $FILESELECT
+if ( $PDFTOCFRONT || [[ $TEX =~ hitex ]] ) && ! $FILESELECT
 then
 	# create tarballs w/o changes for publication
 	if $CHANGES
 	then
-		for f in *.pdf
+		for f in *.$PDF
 		do
 			case $f in
-				*-changes.pdf ) rm -f $f; continue ;;
+				*-changes.$PDF ) rm -f $f; continue ;;
 			esac
-			mv $f $(basename $f .pdf)-changes.pdf
+			mv $f $(basename $f .$PDF)-changes.$PDF
 		done
+		if [[ $TEX =~ hitex ]]
+		then
+			rm -f xetex-changes.pdf
+			mv xetex.pdf xetex-changes.pdf
+		fi
 		$PAX "$OUTDIR/etc-changes.tar.gz" -s ,^,etc/, \
-			vftovp-changes.pdf vptovf-changes.pdf
+			vftovp-changes.$PDF vptovf-changes.$PDF
 		$PAX "$OUTDIR/mf-changes.tar.gz" -s ,^,mf/, \
-			mf-changes.pdf
+			mf-changes.$PDF
 		$PAX "$OUTDIR/mfware-changes.tar.gz" -s ,^,mfware/, \
-			gftodvi-changes.pdf gftopk-changes.pdf \
-			gftype-changes.pdf mft-changes.pdf
+			gftodvi-changes.$PDF gftopk-changes.$PDF \
+			gftype-changes.$PDF mft-changes.$PDF
 		$PAX "$OUTDIR/tex-changes.tar.gz" -s ,^,tex/, \
-			tex-changes.pdf
+			tex-changes.$PDF
 		$PAX "$OUTDIR/texware-changes.tar.gz" -s ,^,texware/, \
-			dvitype-changes.pdf pltotf-changes.pdf \
-			pooltype-changes.pdf tftopl-changes.pdf
+			dvitype-changes.$PDF pltotf-changes.$PDF \
+			pooltype-changes.$PDF tftopl-changes.$PDF
 		$PAX "$OUTDIR/web-changes.tar.gz" -s ,^,web/, \
-			tangle-changes.pdf weave-changes.pdf
+			tangle-changes.$PDF weave-changes.$PDF
 		$PAX "$OUTDIR/bibtex-changes.tar.gz" -s ,^,bibtex/, \
-			bibtex-changes.pdf
+			bibtex-changes.$PDF
 		$PAX "$OUTDIR/other-changes.tar.gz" -s ,^,other/, \
-			dvicopy-changes.pdf patgen-changes.pdf \
-			pktogf-changes.pdf pktype-changes.pdf
+			dvicopy-changes.$PDF patgen-changes.$PDF \
+			pktogf-changes.$PDF pktype-changes.$PDF
 		$PAX "$OUTDIR/pdftex-changes.tar.gz" -s ,^,pdftex/, \
-			pdftex-changes.pdf
+			pdftex-changes.$PDF
 		$PAX "$OUTDIR/xetex-changes.tar.gz" -s ,^,xetex/, \
 			xetex-changes.pdf
 		$PAX "$OUTDIR/ctie-changes.tar.gz" -s ,^,ctie/, \
-			ctie-changes.pdf
+			ctie-changes.$PDF
 		$PAX "$OUTDIR/tie-changes.tar.gz" -s ,^,tie/, \
-			tie-changes.pdf
+			tie-changes.$PDF
 		$PAX "$OUTDIR/cweb-changes.tar.gz" -s ,^,cweb/, \
-			common-changes.pdf ctangle-changes.pdf \
-			cweave-changes.pdf refsort-changes.pdf \
-			twinx-changes.pdf
+			common-changes.$PDF ctangle-changes.$PDF \
+			cweave-changes.$PDF refsort-changes.$PDF \
+			twinx-changes.$PDF
 	else
 		# Finally, build the remaining documents
 		# * TeX and Metafont test routines
@@ -336,45 +363,48 @@ then
 			eleven twelve
 		do
 			$TEX errata.$f
-			mv errata.pdf errata.$f.pdf
+			mv errata.$PDF errata.$f.$PDF
 		done
 
 		$TEX errata
 
 		$PAX "$OUTDIR/errata.tar.gz" -s ,^,errata/, \
-			errorlog.pdf errata.*.pdf errata.pdf
-		$PAX "$OUTDIR/etc.tar.gz" -s ,^,etc/, vftovp.pdf vptovf.pdf
-		$PAX "$OUTDIR/mf.tar.gz" -s ,^,mf/, mf.pdf trapman.pdf
+			errorlog.$PDF errata.*.$PDF errata.$PDF
+		$PAX "$OUTDIR/etc.tar.gz" -s ,^,etc/, vftovp.$PDF vptovf.$PDF
+		$PAX "$OUTDIR/mf.tar.gz" -s ,^,mf/, mf.$PDF trapman.$PDF
 		$PAX "$OUTDIR/mfware.tar.gz" -s ,^,mfware/, \
-			gftodvi.pdf gftopk.pdf gftype.pdf mft.pdf
+			gftodvi.$PDF gftopk.$PDF gftype.$PDF mft.$PDF
 		$PAX "$OUTDIR/tex.tar.gz" -s ,^,tex/, \
-			glue.pdf tex.pdf tripman.pdf
+			glue.$PDF tex.$PDF tripman.$PDF
 		$PAX "$OUTDIR/texware.tar.gz" -s ,^,texware/, \
-			dvitype.pdf pltotf.pdf pooltype.pdf tftopl.pdf
+			dvitype.$PDF pltotf.$PDF pooltype.$PDF tftopl.$PDF
 		$PAX "$OUTDIR/web.tar.gz" -s ,^,web/, \
-			webman.pdf tangle.pdf weave.pdf
-		$PAX "$OUTDIR/bibtex.tar.gz" -s ,^,bibtex/, bibtex.pdf
+			webman.$PDF tangle.$PDF weave.$PDF twill.$PDF
+		$PAX "$OUTDIR/bibtex.tar.gz" -s ,^,bibtex/, bibtex.$PDF
 		$PAX "$OUTDIR/other.tar.gz" -s ,^,other/, \
-			dvicopy.pdf patgen.pdf pktogf.pdf pktype.pdf
-		$PAX "$OUTDIR/pdftex.tar.gz" -s ,^,pdftex/, pdftex.pdf
+			dvicopy.$PDF patgen.$PDF pktogf.$PDF pktype.$PDF
+		$PAX "$OUTDIR/pdftex.tar.gz" -s ,^,pdftex/, pdftex.$PDF
 		$PAX "$OUTDIR/xetex.tar.gz" -s ,^,xetex/, xetex.pdf
-		$PAX "$OUTDIR/ctie.tar.gz" -s ,^,ctie/, ctie.pdf
-		$PAX "$OUTDIR/tie.tar.gz" -s ,^,tie/, tie.pdf
+		$PAX "$OUTDIR/ctie.tar.gz" -s ,^,ctie/, ctie.$PDF
+		$PAX "$OUTDIR/tie.tar.gz" -s ,^,tie/, tie.$PDF
 		$PAX "$OUTDIR/cweb.tar.gz" -s ,^,cweb/, \
-			cwebman.pdf common.pdf ctangle.pdf cweave.pdf \
-			ctwill.pdf refsort.pdf twinx.pdf
+			cwebman.$PDF common.$PDF ctangle.$PDF cweave.$PDF \
+			ctwill.pdf refsort.$PDF twinx.$PDF
 	fi
 
 	# Notes to self:
 	# (1) Create a user-friendly central entrypoint with
 	#     (a) pandoc index.md -o index.pdf
 	#     (b) pandoc index.md -o index.tex;
-	#         pandoc index.tex -s -o index.html;
+	#         pandoc index.tex -s -o index.html \
+	#           --metadata title="C/WEB programs in TeX Live 2022";
 	#         rm index.tex
 	# (2) Prepare a super-tarball from all the contents of these
-	#     individual tarballs (27/31) with either of
+	#     individual tarballs (42/53 and 34/54) with either of
 	#     (a) pax -wzf knuth-pdf.tar.gz knuth-pdf
+	#     (a') pax -wzf knuth-hint.tar.gz knuth-hint
 	#     (b) zip -r knuth-pdf.zip knuth-pdf
+	#     (b') zip -r knuth-hint.zip knuth-hint
 fi
 
 exit 0