CTAN sync 202005300301

4 files changed, 33 insertions, 46 deletions

diff --git a/web/pwebmac/LICENSE b/web/pwebmac/LICENSE
deleted file mode 100644
index c8b9b87cdb..0000000000
--- a/web/pwebmac/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Andreas Scherer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/web/pwebmac/README.md b/web/pwebmac/README.md
index b8ac146c2e..c2aeee9760 100644
--- a/web/pwebmac/README.md
+++ b/web/pwebmac/README.md
@@ -27,5 +27,5 @@ created by `weave`.  From there, all depends on the “TeX engine” you use:
 `tex "\let\pdf+\input…"`, `pdftex`, and `xetex` create PDF output with
 clickable links and bookmarks (depending on your PDF viewer).
 
-The `pwebmac` package is free software and may be used and distributed
-according to the MIT License as shipped with the original distribution.
+The `pwebmac` package is free software and may be used without restraints.
+This is version “4.5.1” of the `pwebmac` package — 2020-05-29, AS.
diff --git a/web/pwebmac/makeall b/web/pwebmac/makeall
index 22e4f4662e..0ceba6f511 100755
--- a/web/pwebmac/makeall
+++ b/web/pwebmac/makeall
@@ -1,12 +1,17 @@
 #!/bin/sh
+# Test driver for 'pwebmac.tex' in combination with various TeX engines.
+# Production tool for all major WEB programs in TeX Live (invoked as
+# './makeall --new --pdftocfront --tex={pdftex,xetex}').
+# Public domain.  Originally written by Andreas Scherer, 2020.
 
-LONGOPTS=changes,new,pdftocfront,tex:
-SHRTOPTS=cnpt:
+LONGOPTS=changes,new,outdir:,pdftocfront,tex:
+SHRTOPTS=cno:pt:
 
-CHANGES=false
-NEW=false
-PDFTOCFRONT=false
-TEX=tex
+CHANGES=false # apply main changefile to WEB source
+NEW=false # '\input pwebmac' instead of '\input webmac'
+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'
 
 getopt -T >/dev/null
 
@@ -24,8 +29,8 @@ while true
 do
 	case "$1" in
 		-c | --changes ) CHANGES=true; shift ;;
-		-n | --new ) NEW=true; export TEXINPUTS=".:/opt/github/web//:"
-			shift ;;
+		-n | --new ) NEW=true; shift ;;
+		-o | --outdir ) OUTDIR="$2"; shift 2 ;;
 		-p | --pdftocfront ) PDFTOCFRONT=true; shift ;;
 		-t | --tex ) TEX="$2"; shift 2 ;;
 		-- ) shift; break ;;
@@ -43,14 +48,14 @@ for f in \
 do
 	if $CHANGES
 	then
-		c=$(basename $f .web).ch
+		c=$(basename $f .web)
 		case $c in
-			"pdftex.ch"|"xetex.ch" )
+			"pdftex"|"xetex" )
 				c=$KNUTHWARE/$c
 				c=$(echo $c | sed -e 's?\(texk/\)?Work/\1?') ;;
 			* ) c=$KNUTHWARE/$c ;;
 		esac
-		weave $f $c
+		weave $f $c.ch
 		sed -i -e "s/\(\\\\let\\\\maybe=\)\\\\iftrue/\1\\\\iffalse/" \
 			$(basename $f .web).tex
 	else
@@ -74,7 +79,7 @@ do
 		# purge conflict between bibtex.web and webmac.tex
 		# 'E' no longer free to be active character
 		# fix table-of-contents page for bibtex
-		"bibtex") sed -i -e "s/titlefalse/titletrue/" \
+		"bibtex" ) sed -i -e "s/titlefalse/titletrue/" \
 			-e "70,77d" $f.tex ;;
 
 		# make room for new material in weave.web
@@ -104,6 +109,7 @@ FI
 						r pdftex.patch
 						}"  $f.tex
 				fi
+				# active links in PDF outlines/bookmarks
 				cat > texmf-pdf.patch << FI
   \ifacro{\toksF={}\makeoutlinetoks{[#2] #3}\outlinedone\outlinedone}\fi
 FI
@@ -124,7 +130,6 @@ FI
 	if $PDFTOCFRONT
 	then
 		# shift table-of-contents pages to the front in PDF
-		export TEXINPUTS=".:/opt/github/cwebbin//:"$TEXINPUTS
 		sed -i -e "1 s/\(webmac\)/\1\n\\\\input pdfwebtocfront/" $f.tex
 		$TEX $f.tex # run TeX twice
 	fi
@@ -135,17 +140,19 @@ done
 if $PDFTOCFRONT
 then
 	# create tarballs for publication
-	pax vftovp.pdf vptovf.pdf -wvzf etc.tar.gz -s ,^,etc/,
-	pax mf.pdf -wvzf mf.tar.gz -s ,^,mf/,
+	pax vftovp.pdf vptovf.pdf -wvzf $OUTDIR/etc.tar.gz -s ,^,etc/,
+	pax mf.pdf -wvzf $OUTDIR/mf.tar.gz -s ,^,mf/,
 	pax gftodvi.pdf gftopk.pdf gftype.pdf mft.pdf \
-		-wvzf mfware.tar.gz -s ,^,mfware/,
-	pax tex.pdf -wvzf tex.tar.gz -s ,^,tex/,
+		-wvzf $OUTDIR/mfware.tar.gz -s ,^,mfware/,
+	pax tex.pdf -wvzf $OUTDIR/tex.tar.gz -s ,^,tex/,
 	pax dvitype.pdf pltotf.pdf pooltype.pdf tftopl.pdf \
-		-wvzf texware.tar.gz -s ,^,texware/,
-	pax tangle.pdf weave.pdf -wvzf web.tar.gz -s ,^,web/,
-	pax bibtex.pdf -wvzf bibtex.tar.gz -s ,^,bibtex/,
+		-wvzf $OUTDIR/texware.tar.gz -s ,^,texware/,
+	pax tangle.pdf weave.pdf -wvzf $OUTDIR/web.tar.gz -s ,^,web/,
+	pax bibtex.pdf -wvzf $OUTDIR/bibtex.tar.gz -s ,^,bibtex/,
 	pax dvicopy.pdf patgen.pdf pktogf.pdf pktype.pdf \
-		-wvzf other.tar.gz -s ,^,other/,
-	pax pdftex.pdf -wvzf pdftex.tar.gz -s ,^,pdftex/,
-	pax xetex.pdf -wvzf xetex.tar.gz -s ,^,xetex/,
+		-wvzf $OUTDIR/other.tar.gz -s ,^,other/,
+	pax pdftex.pdf -wvzf $OUTDIR/pdftex.tar.gz -s ,^,pdftex/,
+	pax xetex.pdf -wvzf $OUTDIR/xetex.tar.gz -s ,^,xetex/,
 fi
+
+exit 0
diff --git a/web/pwebmac/pwebmac.tex b/web/pwebmac/pwebmac.tex
index 19fdaa2c4e..648064e650 100644
--- a/web/pwebmac/pwebmac.tex
+++ b/web/pwebmac/pwebmac.tex
@@ -2,6 +2,7 @@
 % pdfTeX adjustments provided by Han The Thanh <thanh@pdftex.org>.
 % XeTeX adjustments provided by Khaled Hosny <khaledhosny@eglug.org>.
 % 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}
 \newif\ifpdf