Tuneup for CWEB 4.7.

* Add support for HiTeX/HINT.

Author: ascherer

Makefile.unix

@@ -4,12 +4,12 @@
 # Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
 #
 # Modified for GCC under Linux by Andreas Scherer, June 8, 1996.
-# Last updated by Andreas Scherer, March 2021.
+# Last updated by Andreas Scherer, February 2022.
 
 # The following copyright notice extends to the changes in this Makefile
 # only, not to any part of the original CWEB distribution.
 #
-# Copyright (C) 1994, 1996, 2000, 2005, 2021 Andreas Scherer
+# Copyright (C) 1994, 1996, 2000, 2005, 2022 Andreas Scherer
 
 # Permission is granted to make and distribute verbatim copies of this
 # document provided that the copyright notice and this permission notice
@@ -137,9 +137,11 @@ CP= /bin/cp
 
 # uncomment the second line if you use xetex to mogrify .dvi files into .pdf
 # uncomment the third line if you use pdftex to bypass .dvi files altogether
+# uncomment the forth line if you use hitex for HINT output
 PDFTEX = dvipdfm
 #PDFTEX = xetex
 #PDFTEX = pdftex
+#PDFTEX = hitex
 
 ##########  You shouldn't have to change anything after this point #######
 
@@ -247,6 +249,8 @@ ALL = $(ORIGINAL) $(CTWILLSRC) $(COMMPATCH) $(CTANGPATCH) $(CWEAVPATCH) \
 			TEXINPUTS=.//: xetex "\let\pdf+ \input $*" ;; \
 		pdftex ) TEXINPUTS=.//: pdftex $* ; \
 			TEXINPUTS=.//: pdftex $* ;; \
+		hitex ) TEXINPUTS=.//: hitex $* ; \
+			TEXINPUTS=.//: hitex $* ;; \
 	esac
 
 .ref.sref: refsort
@@ -416,7 +420,7 @@ clean:
 	$(RM) -f -r *~ *.o common.tex ctangle.tex cweave.tex ctwill.tex \
 	cweave.$(EXTENSION) prod-cweave.w ctwill.$(EXTENSION) prod-twill.w \
 	cwebbin.tex *-foo.* *-doc.ch *.orig *.rej \
-	  *.log *.dvi *.toc *.idx *.scn *.pdf core cweave ctangle \
+	  *.log *.dvi *.toc *.idx *.scn *.pdf *.hnt core cweave ctangle \
 	ctwill refsort twinx refsort.c twinx.c
 
 install: all

README.md

@@ -4,7 +4,7 @@
 [cweb system](http://www-cs-faculty.stanford.edu/~uno/cweb.html)
 and donald e. knuth's [ctwill program](http://ftp.cs.stanford.edu/pub/ctwill).
 it requires the contents of [the original *cweb* source
-drop](https://github.com/ascherer/cweb/releases/download/cweb-4.6/cweb-4.6.tar.gz)
+drop](https://github.com/ascherer/cweb/releases/download/cweb-4.7/cweb-4.7.tar.gz)
 and [the secondary *ctwill* source
 drop](http://ftp.cs.stanford.edu/pub/ctwill/ctwill.tar.gz), to which it applies
 a set of change files to introduce advanced features. see the extensive
@@ -21,11 +21,11 @@ a set of change files to introduce advanced features. see the extensive
 
 ## manual compilation
 
-extract `ctwill.tar.gz` and add the contents of `cweb-4.6.tar.gz` (overwriting
-outdated source files) and `cwebbin-2021.6.tar.gz` (overwriting `README.md`)
+extract `ctwill.tar.gz` and add the contents of `cweb-4.7.tar.gz` (overwriting
+outdated source files) and `cwebbin-2022.1.tar.gz` (overwriting `README.md`)
 for the full set of source files.
 replace `@@VERSION@@` in line 129 of the `Makefile.unix` with something like
-`Version 4.6 [CWEBbin 2021.6]`.
+`Version 4.7 [CWEBbin 2022.1]`.
 `touch *.cxx`.
 unix/linux users should work with [`make -f Makefile.unix`](Makefile.unix)
 exclusively (targets `boot`, `cautiously`, and `all`).
@@ -39,8 +39,8 @@ sources and for creating installable packages in *rpm* and *deb* format. clone
 [cweb](https://github.com/ascherer/cweb) and
 [cwebbin](https://github.com/ascherer/cwebbin), create the source drops with
 ```
-git archive -o cweb-4.6.tar.gz cweb-4.6
-git archive -o cwebbin-2021.6.tar.gz cwebbin-2021.6
+git archive -o cweb-4.7.tar.gz cweb-4.7
+git archive -o cwebbin-2022.1.tar.gz cwebbin-2022.1
 ```
 respectively, put these two tarballs and the original `ctwill.tar.gz` in the
 *SOURCES* directory and `cwebbin.spec` in the *SPECS* directory of your build

README.txt

@@ -1,12 +1,12 @@
 							-*-Text-*-
 %%% LEGALESE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% This file is part of CWEBbin (Version 4.6 [2021]).
+% This file is part of CWEBbin (Version 4.7 [2022]).
 % (Set TAB to 8 spaces to get the spacing right.)
 % The CWEB programs by Silvio Levy are based on programs by D. E. Knuth.
 % They are distributed WITHOUT ANY WARRANTY, express or implied.
 
-% This README file was last updated March 29, 2021 by Andreas Scherer.
+% This README file was last updated February 5, 2022 by Andreas Scherer.
 
 % The following copyright notices extend to the respective parts of the
 % changed or added source code introduced in this patch only, not to the
@@ -16,7 +16,7 @@
 % Copyright (C) 1991-1993 Hans-Hermann Bode
 % Copyright (C) 1992 Klaus Guntermann
 % Copyright (C) 1991,1993 Carsten Steger
-% Copyright (C) 1993-2000,2005,2011,2018–2021 Andreas Scherer
+% Copyright (C) 1993-2000,2005,2011,2018–2022 Andreas Scherer
 
 % Permission is granted to make and distribute verbatim copies of this
 % document provided that the copyright notice and this permission notice
@@ -382,6 +382,10 @@ So here are some words about the `special features':
      'evil twin' CTWILL, together with its utility programs 'refsort' and
      'twinx', and the associated TeX macros.
 
+   - [GENERAL] CWEB 4.7 introduced full support for
+     Martin Ruckert's HiTeX and its HINT output format; see
+     https://hint.userweb.mwn.de/hint/hitex.html for details.
+
 %%% CREDIT WHERE CREDIT IS DUE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 I want to express my deep gratitude to Silvio Levy and Donald Knuth for the
@@ -391,7 +395,7 @@ and co-workers on whose initial ideas and contributions this package is based.
 
 Happy CWEBbin'!
 
-February 6, 2021
+February 5, 2022
 
 Andreas Scherer
 

comm-mini.ch

@@ -1,9 +1,9 @@
 Limbo.
 
 @x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.6 [CWEBbin 2021])}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.7 [CWEBbin 2022])}
 @y
-\def\title{COMMON (Version 4.6 [CWEBbin 2021])}
+\def\title{COMMON (Version 4.7 [CWEBbin 2022])}
 \def\contentspagenumber{0}
 @z
 

comm-newpage.ch

@@ -1,7 +1,7 @@
 @x
-\def\contentspagenumber{28}
+\def\contentspagenumber{29}
 @y
-\def\contentspagenumber{30}
+\def\contentspagenumber{31}
 \input Xcwebmac
 \input pdfwebtocfront
 @z

comm-patch.ch

@@ -1,6 +1,6 @@
 								-*-Web-*-
 This file, COMM-FOO.CH, is part of CWEBBIN (@VERSION@).
-It is a changefile for COMMON.W, Version 4.6.
+It is a changefile for COMMON.W, Version 4.7.
 
 Technically, COMM-FOO.CH is constructed from a multitude of separate change
 files by applying Klaus Guntermann's TIE processor.  Any comments (like this
@@ -34,7 +34,7 @@ This program is distributed WITHOUT ANY WARRANTY, express or implied.
 The following copyright notice extends to this changefile only, not to
 the masterfile COMMON.W.
 
-Copyright (C) 1993-1995,1998,2000,2005,2020,2021 Andreas Scherer
+Copyright (C) 1993-1995,1998,2000,2005,2018-2022 Andreas Scherer
 Copyright (C) 1991,1993 Carsten Steger
 Copyright (C) 1991-1993 Hans-Hermann Bode
 
@@ -179,17 +179,19 @@ p21	29 October 2005	AS	ANSI C++ patches to patch level [p21].
 	06 June 2021		AS	Tuneup for CWEB 4.4 [2021].
 	14 July 2021		AS	Tuneup for CWEB 4.5 [2021].
 	25 December 2021	AS	Tuneup for CWEB 4.6 [2021].
+
+2022	05 February 2022	AS	Tuneup for CWEB 4.7 [2022].
 ------------------------------------------------------------------------------
 Material in limbo.
 
 @x l.25
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.6)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
 @y
 \def\title{Common code for CTANGLE and CWEAVE (@VERSION@)}
 @z
 
 @x l.30
-  \centerline{(Version 4.6)}
+  \centerline{(Version 4.7)}
 @y
   \centerline{(@VERSION@)}
 @z

comm-texlive.ch

@@ -13,13 +13,13 @@ Material in limbo.
 \def\title{Common code for CTANGLE and CWEAVE (@VERSION@)}
 @y
 \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
-\def\title{Common code for CTANGLE and CWEAVE (4.6 [\TeX~Live])}
+\def\title{Common code for CTANGLE and CWEAVE (4.7 [\TeX~Live])}
 @z
 
 @x l.30 and l.191 of COMM-PATCH.CH
   \centerline{(@VERSION@)}
 @y
-  \centerline{(Version 4.6 [\TeX~Live])}
+  \centerline{(Version 4.7 [\TeX~Live])}
 @z
 
 @x l.32

ctang-newpage.ch

@@ -1,7 +1,7 @@
 @x
-\def\contentspagenumber{64}
+\def\contentspagenumber{65}
 @y
-\def\contentspagenumber{73}
+\def\contentspagenumber{74}
 \input Xcwebmac
 \input pdfwebtocfront
 @z

ctang-patch.ch

@@ -1,6 +1,6 @@
 								-*-Web-*-
 This file, CTANG-FOO.CH, is part of CWEBBIN (@VERSION@).
-It is a changefile for CTANGLE.W, Version 4.6.
+It is a changefile for CTANGLE.W, Version 4.7.
 
 Technically, CTANG-FOO.CH is constructed from a multitude of separate
 change files by applying Klaus Guntermann's TIE processor.  Any comments
@@ -31,7 +31,7 @@ This program is distributed WITHOUT ANY WARRANTY, express or implied.
 The following copyright notice extends to this changefile only, not to
 the masterfile CTANGLE.W.
 
-Copyright (C) 1993-1995,1998,2000,2005,2011,2019,2021 Andreas Scherer
+Copyright (C) 1993-1995,1998,2000,2005,2011,2018-2022 Andreas Scherer
 Copyright (C) 1991-1993 Hans-Hermann Bode
 
 Permission is granted to make and distribute verbatim copies of this
@@ -156,24 +156,26 @@ p21	29 October 2005	AS	ANSI C++ patches for patch level [p21].
 2018	17 October 2018	AS	Updated version number [2018].
 	06 November 2018 AS	Integration with TeXLive.
 
-2021	04 February 2021	AS	2021 tuneup for CWEB 4.0 [2021].
-	20 February 2021	AS	2021 tuneup for CWEB 4.1 [2021].
-	25 February 2021	AS	2021 tuneup for CWEB 4.2 [2021].
-	13 April 2021		AS	2021 tuneup for CWEB 4.3 [2021].
-	06 June 2021		AS	2021 tuneup for CWEB 4.4 [2021].
-	14 July 2021		AS	2021 tuneup for CWEB 4.5 [2021].
-	25 December 2021	AS	2021 tuneup for CWEB 4.6 [2021].
+2021	04 February 2021	AS	tuneup for CWEB 4.0 [2021].
+	20 February 2021	AS	tuneup for CWEB 4.1 [2021].
+	25 February 2021	AS	tuneup for CWEB 4.2 [2021].
+	13 April 2021		AS	tuneup for CWEB 4.3 [2021].
+	06 June 2021		AS	tuneup for CWEB 4.4 [2021].
+	14 July 2021		AS	tuneup for CWEB 4.5 [2021].
+	25 December 2021	AS	tuneup for CWEB 4.6 [2021].
+
+2022	05 February 2022	AS	tuneup for CWEB 4.7 [2022].
 ------------------------------------------------------------------------------
 Material in limbo.
 
 @x l.30
-\def\title{CTANGLE (Version 4.6)}
+\def\title{CTANGLE (Version 4.7)}
 @y
 \def\title{CTANGLE (@VERSION@)}
 @z
 
 @x l.34
-  \centerline{(Version 4.6)}
+  \centerline{(Version 4.7)}
 @y
   \centerline{(@VERSION@)}
 @z
@@ -189,7 +191,7 @@ z
 Section 1.
 
 @x l.64
-@d banner "This is CTANGLE (Version 4.6)"
+@d banner "This is CTANGLE (Version 4.7)"
 @y
 @d banner "This is CTANGLE (@VERSION@)"
 @z

ctang-texlive.ch

@@ -12,13 +12,13 @@ Material in limbo.
 @x l.30 and l.169 of CTANG-PATCH.CH
 \def\title{CTANGLE (@VERSION@)}
 @y
-\def\title{CTANGLE (Version 4.6 [\TeX~Live])}
+\def\title{CTANGLE (Version 4.7 [\TeX~Live])}
 @z
 
 @x l.34 and l.175 of CTANG-PATCH.CH
   \centerline{(@VERSION@)}
 @y
-  \centerline{(Version 4.6 [\TeX~Live])}
+  \centerline{(Version 4.7 [\TeX~Live])}
 @z
 
 @x l.36
@@ -38,7 +38,7 @@ Section 1.
 @x l.64 and l.188 of CTANG-PATCH.CH and l.17 of CTANG-I18N.CH
 @d banner _("This is CTANGLE (@VERSION@)")
 @y
-@d banner "This is CTANGLE, Version 4.6"
+@d banner "This is CTANGLE, Version 4.7"
   /* will be extended by the \TeX~Live |versionstring| */
 @z