summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2021-12-26 13:44:30 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2021-12-26 13:44:30 +0000
commit072ecf41200a568426414e62b729e04dde6cb879 (patch)
tree641468cc7313ff459718160a0877bc0b4073b319 /Build
parent8c53c10ac2ba6da709122053e1589e139beedac8 (diff)
[CWEB] New release 4.6.
Major changes since CWEB 4.5: * Restore '\T' macro backward compatibility. CWEB 4.3 introduced a major change in the '\T' macro to allow C++ 'hex exponent' notation (e.g., 0x1FFFFp10). This made CWEAVE/CTWILL mutually incompatible with non-matching versions of their set of macros and v.v. This release tries to reestablish the standard behavior at least for numeric constants. Of course, 'old' CWEAVE/CTWILL won't deliver on 'hex exponents' in the CWEB input, but those should be rare anyway. * Restore 'classic' PDF page dimensions. Heiko's PDF files of 2014 used 'Executive' page dimensions, i.e., 7.5in times 10in. C/WEB's internal inch values suggest to use those plus a 0.5in border on each side. * Revert meaning of option 'c'. Option 'c' is OFF by default to avoid spurious entries in build.log. * 'squash'/'reduce' have been straightened out for k=1,..,4. * Code beautifications for 'make fullmanual'. * Code cleanup for internal reasons. * Cleanup in 'prod.w' (indentation et al.). * New 'prod-cweave.w' (along 'prod-twill.w') for material from CWEBbin. * Fixes for option '-o' (didn't work as advertised in border cases). * New signature for the 'make_ministring' function in CTWILL. git-svn-id: svn://tug.org/texlive/trunk@61411 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/ctangleboot.cin44
-rw-r--r--Build/source/texk/web2c/cwebboot.cin42
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog24
-rw-r--r--Build/source/texk/web2c/cwebdir/Makefile2
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-mac.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-mini.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-ql.ch8
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch8
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.h2
-rw-r--r--Build/source/texk/web2c/cwebdir/common.h2
-rw-r--r--Build/source/texk/web2c/cwebdir/common.w6
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-bs.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-pc.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-ql.ch8
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-vms.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-w2c.ch12
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-w32.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/ctangle.c2
-rw-r--r--Build/source/texk/web2c/cwebdir/ctangle.w8
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-mini.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-w2c.ch12
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-bs.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-pc.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-ql.ch8
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-vms.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-w2c.ch12
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-w32.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/cweave.w10
-rw-r--r--Build/source/texk/web2c/cwebdir/cwebmac.tex6
-rw-r--r--Build/source/texk/web2c/cwebdir/cwebman-w2c.ch14
-rw-r--r--Build/source/texk/web2c/cwebdir/cwebman.tex12
-rw-r--r--Build/source/texk/web2c/cwebdir/po/cweb-tl.pot8
-rw-r--r--Build/source/texk/web2c/cwebdir/po/cweb.pot6
-rw-r--r--Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po16
-rw-r--r--Build/source/texk/web2c/cwebdir/po/de/cweb.po12
-rw-r--r--Build/source/texk/web2c/cwebdir/po/it/cweb.po16
-rw-r--r--Build/source/texk/web2c/cwebdir/prod-cweave.w2
-rw-r--r--Build/source/texk/web2c/cwebdir/prod-twill.w2
-rw-r--r--Build/source/texk/web2c/cwebdir/prod.w2
-rw-r--r--Build/source/texk/web2c/man/ChangeLog4
-rw-r--r--Build/source/texk/web2c/man/ctwill.man4
42 files changed, 198 insertions, 165 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index c2aad157ceb..92fadf21048 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2021-12-26 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.cin,
+ * cwebboot.cin: CWEB release 4.6.
+
2021-11-14 Andreas Scherer <https://ascherer.github.io>
* cwebboot.cin: More generic point of interest.
diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin
index 291d08e358c..8c346559f8f 100644
--- a/Build/source/texk/web2c/ctangleboot.cin
+++ b/Build/source/texk/web2c/ctangleboot.cin
@@ -2,7 +2,15 @@
#line 66 "cwebdir/ctangle.w"
/*4:*/
-#line 51 "cwebdir/comm-w2c.h"
+#line 54 "cwebdir/comm-w2c.h"
+
+#include <ctype.h>
+#include <kpathsea/simpletypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
@@ -14,18 +22,10 @@
#define gettext(a) a
#endif
-#include <ctype.h>
-#include <kpathsea/simpletypes.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/*:4*/
#line 67 "cwebdir/ctangle.w"
-#define banner "This is CTANGLE, Version 4.5" \
+#define banner "This is CTANGLE, Version 4.6" \
\
#define _(s) gettext(s) \
@@ -178,7 +178,7 @@ extern cweb program;
extern int phase;
/*:3*//*5:*/
-#line 91 "cwebdir/comm-w2c.h"
+#line 94 "cwebdir/comm-w2c.h"
extern char section_text[];
extern char*section_text_end;
@@ -186,7 +186,7 @@ extern char*id_first;
extern char*id_loc;
/*:5*//*6:*/
-#line 109 "cwebdir/comm-w2c.h"
+#line 112 "cwebdir/comm-w2c.h"
extern char buffer[];
extern char*buffer_end;
@@ -194,7 +194,7 @@ extern char*loc;
extern char*limit;
/*:6*//*7:*/
-#line 126 "cwebdir/comm-w2c.h"
+#line 129 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -211,7 +211,7 @@ extern boolean changing;
extern boolean web_file_open;
/*:7*//*9:*/
-#line 147 "cwebdir/comm-w2c.h"
+#line 150 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -219,7 +219,7 @@ extern boolean change_pending;
extern boolean print_where;
/*:9*//*10:*/
-#line 161 "cwebdir/comm-w2c.h"
+#line 164 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -244,12 +244,12 @@ extern hash_pointer hash_end;
extern hash_pointer h;
/*:10*//*12:*/
-#line 205 "cwebdir/comm-w2c.h"
+#line 208 "cwebdir/comm-w2c.h"
extern int history;
/*:12*//*14:*/
-#line 222 "cwebdir/comm-w2c.h"
+#line 225 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -261,7 +261,7 @@ extern boolean flags[];
extern const char*use_language;
/*:14*//*15:*/
-#line 237 "cwebdir/comm-w2c.h"
+#line 240 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -382,14 +382,14 @@ static eight_bits next_control;
#line 71 "cwebdir/ctangle.w"
/*8:*/
-#line 141 "cwebdir/comm-w2c.h"
+#line 144 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
extern void reset_input(void);
/*:8*//*11:*/
-#line 184 "cwebdir/comm-w2c.h"
+#line 187 "cwebdir/comm-w2c.h"
extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -402,7 +402,7 @@ extern void print_section_name(name_pointer);
extern void sprint_section_name(char*,name_pointer);
/*:11*//*13:*/
-#line 208 "cwebdir/comm-w2c.h"
+#line 211 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -410,7 +410,7 @@ extern void fatal(const char*,const char*);
extern void overflow(const char*);
/*:13*//*16:*/
-#line 246 "cwebdir/comm-w2c.h"
+#line 249 "cwebdir/comm-w2c.h"
extern void common_init(void);
extern void print_stats(void);
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 6cc9cfb0aae..29a1c3fe915 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -2,7 +2,15 @@
#line 62 "cwebdir/common.w"
/*3:*/
-#line 51 "cwebdir/comm-w2c.h"
+#line 54 "cwebdir/comm-w2c.h"
+
+#include <ctype.h>
+#include <kpathsea/simpletypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
@@ -14,14 +22,6 @@
#define gettext(a) a
#endif
-#include <ctype.h>
-#include <kpathsea/simpletypes.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/*:3*//*91:*/
#line 739 "cwebdir/comm-w2c.ch"
@@ -184,7 +184,7 @@ extern cweb program;
extern int phase;
/*:2*//*4:*/
-#line 91 "cwebdir/comm-w2c.h"
+#line 94 "cwebdir/comm-w2c.h"
extern char section_text[];
extern char*section_text_end;
@@ -192,7 +192,7 @@ extern char*id_first;
extern char*id_loc;
/*:4*//*5:*/
-#line 109 "cwebdir/comm-w2c.h"
+#line 112 "cwebdir/comm-w2c.h"
extern char buffer[];
extern char*buffer_end;
@@ -200,7 +200,7 @@ extern char*loc;
extern char*limit;
/*:5*//*6:*/
-#line 126 "cwebdir/comm-w2c.h"
+#line 129 "cwebdir/comm-w2c.h"
extern int include_depth;
extern FILE*file[];
@@ -217,7 +217,7 @@ extern boolean changing;
extern boolean web_file_open;
/*:6*//*8:*/
-#line 147 "cwebdir/comm-w2c.h"
+#line 150 "cwebdir/comm-w2c.h"
extern sixteen_bits section_count;
extern boolean changed_section[];
@@ -225,7 +225,7 @@ extern boolean change_pending;
extern boolean print_where;
/*:8*//*9:*/
-#line 161 "cwebdir/comm-w2c.h"
+#line 164 "cwebdir/comm-w2c.h"
typedef struct name_info{
char*byte_start;
@@ -250,12 +250,12 @@ extern hash_pointer hash_end;
extern hash_pointer h;
/*:9*//*11:*/
-#line 205 "cwebdir/comm-w2c.h"
+#line 208 "cwebdir/comm-w2c.h"
extern int history;
/*:11*//*13:*/
-#line 222 "cwebdir/comm-w2c.h"
+#line 225 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
@@ -267,7 +267,7 @@ extern boolean flags[];
extern const char*use_language;
/*:13*//*14:*/
-#line 237 "cwebdir/comm-w2c.h"
+#line 240 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -414,14 +414,14 @@ char separators[]= SEPARATORS;
#line 66 "cwebdir/common.w"
/*7:*/
-#line 141 "cwebdir/comm-w2c.h"
+#line 144 "cwebdir/comm-w2c.h"
extern boolean get_line(void);
extern void check_complete(void);
extern void reset_input(void);
/*:7*//*10:*/
-#line 184 "cwebdir/comm-w2c.h"
+#line 187 "cwebdir/comm-w2c.h"
extern boolean names_match(name_pointer,const char*,size_t,eight_bits);
extern name_pointer id_lookup(const char*,const char*,eight_bits);
@@ -434,7 +434,7 @@ extern void print_section_name(name_pointer);
extern void sprint_section_name(char*,name_pointer);
/*:10*//*12:*/
-#line 208 "cwebdir/comm-w2c.h"
+#line 211 "cwebdir/comm-w2c.h"
extern int wrap_up(void);
extern void err_print(const char*);
@@ -442,7 +442,7 @@ extern void fatal(const char*,const char*);
extern void overflow(const char*);
/*:12*//*15:*/
-#line 246 "cwebdir/comm-w2c.h"
+#line 249 "cwebdir/comm-w2c.h"
extern void common_init(void);
extern void print_stats(void);
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index a0ddb025e3e..702dc019c81 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,27 @@
+2021-12-26 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * comm-{mac,mini,ql,w2c}.ch,
+ * comm-w2c.h,
+ * common.h,
+ * common.w,
+ * ctang-{bs,pc,ql,vms,w2c,w32}.ch,
+ * ctangle.c,
+ * ctangle.w,
+ * ctwill-{mini,w2c}.ch,
+ * cweav-{bs,pc,ql,vms,w2c,w32}.ch,
+ * cweave.w,
+ * cwebmac.tex,
+ * cwebman-w2c.ch,
+ * cwebman.tex,
+ * po/cweb-tl.pot,
+ * po/cweb.pot,
+ * po/de/cweb-tl.po,
+ * po/de/cweb.po,
+ * po/it/cweb.po,
+ * prod-{cweave,twill}.w,
+ * prod.w: CWEB 4.6 and CWEBbin 2021.6 release.
+
2021-12-20 Andreas Scherer <https://ascherer.github.io>
* comm-w2c.h,
diff --git a/Build/source/texk/web2c/cwebdir/Makefile b/Build/source/texk/web2c/cwebdir/Makefile
index 34ef6ff9295..86db9f3bfc6 100644
--- a/Build/source/texk/web2c/cwebdir/Makefile
+++ b/Build/source/texk/web2c/cwebdir/Makefile
@@ -1,6 +1,6 @@
# This file is part of CWEB.
# It is distributed WITHOUT ANY WARRANTY, express or implied.
-# Version 4.5 --- July 2021
+# Version 4.6 --- December 2021
# Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
diff --git a/Build/source/texk/web2c/cwebdir/comm-mac.ch b/Build/source/texk/web2c/cwebdir/comm-mac.ch
index 7d741e933fa..4d1382accd1 100644
--- a/Build/source/texk/web2c/cwebdir/comm-mac.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-mac.ch
@@ -4,9 +4,9 @@ No changes to CTANGLE or CWEAVE are needed.
(Contributed 13 Oct 2000 by AndPio@aol.com; slightly edited by Don Knuth)
@x in limbo, change the title page document to specify Mac version
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
@y
- \centerline{(Version 4.5 for MacOS)}
+ \centerline{(Version 4.6 for MacOS)}
@z
@x section 23: Make input_ln accept \n, \r, \n\r, or \r\n as line endings
diff --git a/Build/source/texk/web2c/cwebdir/comm-mini.ch b/Build/source/texk/web2c/cwebdir/comm-mini.ch
index ddca7840a99..a3de561086c 100644
--- a/Build/source/texk/web2c/cwebdir/comm-mini.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-mini.ch
@@ -1,9 +1,9 @@
Limbo.
@x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5 [CWEBbin 2021])}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.6 [CWEBbin 2021])}
@y
-\def\title{COMMON (Version 4.5 [CWEBbin 2021])}
+\def\title{COMMON (Version 4.6 [CWEBbin 2021])}
\def\contentspagenumber{0}
@z
diff --git a/Build/source/texk/web2c/cwebdir/comm-ql.ch b/Build/source/texk/web2c/cwebdir/comm-ql.ch
index a1949b5cb7c..191fb51f1dd 100644
--- a/Build/source/texk/web2c/cwebdir/comm-ql.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-ql.ch
@@ -10,24 +10,24 @@ ex <dev_>cc;'-v -h -c -=500000 -DCWEBINPUTS=flp2_ common_c'
@x
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.6)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
\vfill}
\def\botofcontents{\vfill
\noindent
@y
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.6)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
\vfill}
\def\botofcontents{\vfill
\noindent
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index aed24c75151..f37e23c5ab9 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -17,16 +17,16 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.6)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
-\def\title{Common code for CTANGLE and CWEAVE (4.5 [\TeX~Live])}
+\def\title{Common code for CTANGLE and CWEAVE (4.6 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.6 [\TeX~Live])}
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.h b/Build/source/texk/web2c/cwebdir/comm-w2c.h
index 621a880e36a..095aa8b493e 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.h
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.h
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021 (works also with later versions)
+% Version 4.6 --- December 2021 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
diff --git a/Build/source/texk/web2c/cwebdir/common.h b/Build/source/texk/web2c/cwebdir/common.h
index 4a5a1f14de7..2a584ff4425 100644
--- a/Build/source/texk/web2c/cwebdir/common.h
+++ b/Build/source/texk/web2c/cwebdir/common.h
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021 (works also with later versions)
+% Version 4.6 --- December 2021 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
diff --git a/Build/source/texk/web2c/cwebdir/common.w b/Build/source/texk/web2c/cwebdir/common.w
index bca9b5a2bbf..36f35f3cbc9 100644
--- a/Build/source/texk/web2c/cwebdir/common.w
+++ b/Build/source/texk/web2c/cwebdir/common.w
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.6 --- December 2021
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -22,12 +22,12 @@
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.5)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.6)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
\vfill}
\def\botofcontents{\vfill
\noindent
diff --git a/Build/source/texk/web2c/cwebdir/ctang-bs.ch b/Build/source/texk/web2c/cwebdir/ctang-bs.ch
index 4664215673a..ceaefa93e5f 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-bs.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-bs.ch
@@ -17,12 +17,12 @@ by using "huge" pointers.
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@y
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
-@d banner "This is CTANGLE (Version 4.5pc/big)"
+@d banner "This is CTANGLE (Version 4.6pc/big)"
@z
diff --git a/Build/source/texk/web2c/cwebdir/ctang-pc.ch b/Build/source/texk/web2c/cwebdir/ctang-pc.ch
index 2010d6d03dd..2fb9b90440f 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-pc.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-pc.ch
@@ -9,9 +9,9 @@ that allows >64K arrays. If you need lots of bytes and toks, try the
alternate change files with -bs suffix instead of -pc.
@x section 1
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@y
-@d banner "This is CTANGLE (Version 4.5pc)"
+@d banner "This is CTANGLE (Version 4.6pc)"
@z
@x section 17
@d max_bytes 90000 /* the number of bytes in identifiers,
diff --git a/Build/source/texk/web2c/cwebdir/ctang-ql.ch b/Build/source/texk/web2c/cwebdir/ctang-ql.ch
index 66568f4be16..2f4ff604b17 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-ql.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-ql.ch
@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c -=500000 ctangle_c"
@x
-\def\title{CTANGLE (Version 4.5)}
+\def\title{CTANGLE (Version 4.6)}
@y
-\def\title{CTANGLE (QL Version 4.5)}
+\def\title{CTANGLE (QL Version 4.6)}
@z
@x section 1
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@y
-@d banner "This is CTANGLE (QL Version 4.5)"
+@d banner "This is CTANGLE (QL Version 4.6)"
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/ctang-vms.ch b/Build/source/texk/web2c/cwebdir/ctang-vms.ch
index cfe2f222847..9f5dd2a6772 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-vms.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-vms.ch
@@ -10,9 +10,9 @@ created:
(these changes not necessary for initial bootstrapping)
@x section 1 (01-FEB-1992 ST)
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@y
-@d banner "This is CTANGLE (VAX/VMS Version 4.5)"
+@d banner "This is CTANGLE (VAX/VMS Version 4.6)"
@z
@x section 4 (01-FEB-1992 ST)
diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
index 359f1eaa0b0..e1233636a81 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CTANGLE (Version 4.5)}
+\def\title{CTANGLE (Version 4.6)}
@y
-\def\title{CTANGLE (Version 4.5 [\TeX~Live])}
+\def\title{CTANGLE (Version 4.6 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.6 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@y
-@d banner "This is CTANGLE, Version 4.5"
+@d banner "This is CTANGLE, Version 4.6"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/Build/source/texk/web2c/cwebdir/ctang-w32.ch b/Build/source/texk/web2c/cwebdir/ctang-w32.ch
index acdcdd2381a..d299f006837 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-w32.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-w32.ch
@@ -4,9 +4,9 @@ This is the change file for CWEB's CTANGLE under Win32
Changes necessary for compiling with Borland C/C++
@x section 1
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@y
-@d banner "This is CTANGLE (Version 4.5win32)"
+@d banner "This is CTANGLE (Version 4.6win32)"
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/ctangle.c b/Build/source/texk/web2c/cwebdir/ctangle.c
index b0400a3fae7..0c6f8afe2a9 100644
--- a/Build/source/texk/web2c/cwebdir/ctangle.c
+++ b/Build/source/texk/web2c/cwebdir/ctangle.c
@@ -15,7 +15,7 @@
/*:4*/
#line 67 "ctangle.w"
-#define banner "This is CTANGLE (Version 4.5)" \
+#define banner "This is CTANGLE (Version 4.6)" \
#define ctangle false
#define cweave true \
diff --git a/Build/source/texk/web2c/cwebdir/ctangle.w b/Build/source/texk/web2c/cwebdir/ctangle.w
index 1bbc7216959..1a9e8065af8 100644
--- a/Build/source/texk/web2c/cwebdir/ctangle.w
+++ b/Build/source/texk/web2c/cwebdir/ctangle.w
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.6 --- December 2021
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -27,11 +27,11 @@
\mathchardef\RA="3221 % right arrow
\mathchardef\BA="3224 % double arrow
-\def\title{CTANGLE (Version 4.5)}
+\def\title{CTANGLE (Version 4.6)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CTANGLE} processor}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -61,7 +61,7 @@ Joachim Schrod, Lee Wittenberg, and others who have contributed improvements.
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
-@d banner "This is CTANGLE (Version 4.5)"
+@d banner "This is CTANGLE (Version 4.6)"
@c
@<Include files@>@/
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
index 7ba090a95f9..e7725904503 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
@@ -552,9 +552,9 @@ Section 106.
Section 108.
@x
-@d print_cat(c) fputs(cat_name[c],stdout)
+@d print_cat(c) fputs(cat_name[c],stdout) /* symbolic printout of a category */
@y
-@d print_cat(c) fputs(cat_name[c],stdout)
+@d print_cat(c) fputs(cat_name[c],stdout) /* symbolic printout of a category */
@-c@>
@z
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
index 674521cd185..e1668d822ae 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
@@ -35,9 +35,9 @@
@z
@x
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.6)}
@y
-\def\title{CTWILL (Version 4.5 [\TeX~Live])}
+\def\title{CTWILL (Version 4.6 [\TeX~Live])}
@z
@x
@@ -47,9 +47,9 @@
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.6 [\TeX~Live])}
@z
@x
@@ -76,7 +76,7 @@ Crusius, and others who have contributed improvements.
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
This is the \.{CTWILL} program by D. E. Knuth, based
on \.{CWEAVE} by Silvio Levy and D.~E. Knuth. It is also based on
@@ -100,7 +100,7 @@ Until then, \.{CWEAVE}'s sequence of sections will be preserved.
The ``banner line'' defined here should be changed whenever \.{CTWILL} is
modified. The version number parallels the corresponding version of \.{CWEAVE}.
-@d banner "This is CTWILL, Version 4.5"
+@d banner "This is CTWILL, Version 4.6"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/Build/source/texk/web2c/cwebdir/cweav-bs.ch b/Build/source/texk/web2c/cwebdir/cweav-bs.ch
index e224406107e..5aa05c8b8cb 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-bs.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-bs.ch
@@ -20,12 +20,12 @@ This file contributed by Barry Schwartz, trashman@crud.mn.org, 28 Jun 94.
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.5pc/big)"
+@d banner "This is CWEAVE (Version 4.6pc/big)"
@z
diff --git a/Build/source/texk/web2c/cwebdir/cweav-pc.ch b/Build/source/texk/web2c/cwebdir/cweav-pc.ch
index 94e63a2cd36..23b37416a80 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-pc.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-pc.ch
@@ -11,9 +11,9 @@ that allows >64K arrays. (If you need lots more bytes, try the alternate
change files that have -bs in their name instead of -pc.)
@x section 1
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
-@d banner "This is CWEAVE (Version 4.5pc)"
+@d banner "This is CWEAVE (Version 4.6pc)"
@z
@x section 17
diff --git a/Build/source/texk/web2c/cwebdir/cweav-ql.ch b/Build/source/texk/web2c/cwebdir/cweav-ql.ch
index 3245c5d84c2..4525b8006db 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-ql.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-ql.ch
@@ -7,15 +7,15 @@ ex <dev_>cc;"-v -h -c =500000 cweave_c"
@x
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.6)}
@y
-\def\title{CWEAVE (QL Version 4.5)}
+\def\title{CWEAVE (QL Version 4.6)}
@z
@x section 1
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
-@d banner "This is CWEAVE (QL Version 4.5)"
+@d banner "This is CWEAVE (QL Version 4.6)"
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/cweav-vms.ch b/Build/source/texk/web2c/cwebdir/cweav-vms.ch
index 6423cb631f9..f6d786da4a0 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-vms.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-vms.ch
@@ -13,9 +13,9 @@ modified:
(also modified by Don Knuth to keep version numbers uptodate)
@x section 1 (01-FEB-1992 ST)
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
-@d banner "This is CWEAVE (VAX/VMS Version 4.5)"
+@d banner "This is CWEAVE (VAX/VMS Version 4.6)"
@z
@x section 4 (01-FEB-1992 ST)
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
index e0fabf749b1..c8b530c44f9 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.6)}
@y
-\def\title{CWEAVE (Version 4.5 [\TeX~Live])}
+\def\title{CWEAVE (Version 4.6 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
@y
- \centerline{(Version 4.5 [\TeX~Live])}
+ \centerline{(Version 4.6 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
-@d banner "This is CWEAVE, Version 4.5"
+@d banner "This is CWEAVE, Version 4.6"
/* will be extended by the \TeX~Live |versionstring| */
@z
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w32.ch b/Build/source/texk/web2c/cwebdir/cweav-w32.ch
index 6292149580f..1fc91f1a885 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w32.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w32.ch
@@ -2,9 +2,9 @@ This is the change file for CWEB's CWEAVE under Win32
(Contributed by Fabrice Popineau, February 2002)
@x section 1
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@y
-@d banner "This is CWEAVE (Version 4.5win32)"
+@d banner "This is CWEAVE (Version 4.6win32)"
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w
index 5ac6224127f..bcc8efcfb74 100644
--- a/Build/source/texk/web2c/cwebdir/cweave.w
+++ b/Build/source/texk/web2c/cwebdir/cweave.w
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.6 --- December 2021
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -32,11 +32,11 @@
\def\skipxTeX{\\{skip\_\TEX/}}
\def\copyxTeX{\\{copy\_\TEX/}}
-\def\title{CWEAVE (Version 4.5)}
+\def\title{CWEAVE (Version 4.6)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CWEAVE} processor}
\vskip 15pt
- \centerline{(Version 4.5)}
+ \centerline{(Version 4.6)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -67,7 +67,7 @@ Crusius, and others who have contributed improvements.
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
-@d banner "This is CWEAVE (Version 4.5)"
+@d banner "This is CWEAVE (Version 4.6)"
@c
@<Include files@>@/
@@ -1838,7 +1838,7 @@ static char cat_name[256][12]; /* |12==strlen("struct_head")+1| */
@ This code allows \.{CWEAVE} to display its parsing steps.
-@d print_cat(c) fputs(cat_name[c],stdout)
+@d print_cat(c) fputs(cat_name[c],stdout) /* symbolic printout of a category */
@ The token lists for translated \TEX/ output contain some special control
symbols as well as ordinary characters. These control symbols are
diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex
index 81a2bb1b6ff..586e7bb30f0 100644
--- a/Build/source/texk/web2c/cwebdir/cwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex
@@ -1,8 +1,8 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.5 --- October 2021
+% Version 4.6 --- December 2021
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB4.5}
-\chardef\cwebversion=4 \chardef\cwebrevision=5
+\xdef\fmtversion{\fmtversion+CWEB4.6}
+\chardef\cwebversion=4 \chardef\cwebrevision=6
\newif\ifpdf
\ifx\pdf+\pdftrue\fi
% Uncomment the following line if you want PDF goodies to be the default
diff --git a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch
index a554cb7eff0..8a548ec9620 100644
--- a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch
@@ -93,17 +93,17 @@
@z
@x
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.5)}
+\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.6)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
-\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.5 [\TeX~Live])}
+\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.6 [\TeX~Live])}
@z
@x
-\vskip 18pt\centerline{(Version 4.5 --- July 2021)}
+\vskip 18pt\centerline{(Version 4.6 --- December 2021)}
@y
-\vskip 18pt\centerline{(Version 4.5 --- July 2021)%
-\footnote*{This document describes the extended \.{CWEB} (Version 4.5 [\TeX~Live]).}}
+\vskip 18pt\centerline{(Version 4.6 --- December 2021)%
+\footnote*{This document describes the extended \.{CWEB} (Version 4.6 [\TeX~Live]).}}
@z
@x
@@ -313,9 +313,9 @@ And here's what the same excerpt looks like when typeset.
@z
@x
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.6)\}{ }\\vfill\}}\cr}$$
@y
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.6)\}{ }\\vfill\}}\cr}$$
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex
index 6b2098f933b..476b526a602 100644
--- a/Build/source/texk/web2c/cwebdir/cwebman.tex
+++ b/Build/source/texk/web2c/cwebdir/cwebman.tex
@@ -35,7 +35,7 @@
\def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill}
\def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno}
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.5)}
+\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.6)}
% This verbatim mode assumes that ! marks are !! in the text being copied.
\def\verbatim{\begingroup
@@ -49,7 +49,7 @@
\null\vfill
\centerline{\titlefont The {\ttitlefont CWEB} System of
Structured Documentation}
-\vskip 18pt\centerline{(Version 4.5 --- July 2021)}
+\vskip 18pt\centerline{(Version 4.6 --- December 2021)}
\vskip 24pt
\centerline{\authorfont Donald E. Knuth and Silvio Levy}
\vfill
@@ -1241,7 +1241,7 @@ while(true) {
if (!!input_ln(change_file)) return;
if (limit<buffer+2) continue;
if (buffer[0]!!='@@') continue;
- if (xisupper(buffer[1])) buffer[1]=tolower((eight_bits)buffer[1]);
+ if (xisupper(buffer[1])) buffer[1]=tolower((int)buffer[1]);
if (buffer[1]=='x') break;
if (buffer[1]=='y' || buffer[1]=='z' || buffer[1]=='i') {
loc=buffer+2;
@@ -1293,7 +1293,7 @@ change_line++;
if(!!input_ln(change_file))return;
if(limit<buffer+2)continue;
if(buffer[0]!!='@')continue;
-if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]);
+if(xisupper(buffer[1]))buffer[1]= tolower((int)buffer[1]);
if(buffer[1]=='x')break;
if(buffer[1]=='y'||buffer[1]=='z'||buffer[1]=='i'){
loc= buffer+2;
@@ -1385,7 +1385,7 @@ ${}\\{change\_line}\PP;{}$\6
\&{if} ${}(\\{buffer}[\T{0}]\I\.{'@'}){}$\1\5
\&{continue};\2\6
\&{if} (\\{xisupper}(\\{buffer}[\T{1}]))\1\5
-${}\\{buffer}[\T{1}]\K\\{tolower}{}$((\&{eight\_bits}) \\{buffer}[\T{1}]);\2\6
+${}\\{buffer}[\T{1}]\K\\{tolower}{}$((\&{int}) \\{buffer}[\T{1}]);\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'x'}){}$\1\5
\&{break};\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'y'}\V\\{buffer}[\T{1}]\E\.{'z'}\V\\{buffer}[%
@@ -1592,7 +1592,7 @@ $$\lpile{\.{\\def\\topofcontents\{\\null\\vfill}\cr
\.{ { }\\titlefalse \% include headline on the contents page}\cr
\.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr
\.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.5)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.6)\}{ }\\vfill\}}\cr}$$
Redefining \.{\\rheader}, which is the headline for right-hand pages,
suffices in this case to put the desired information at the top of the
contents page.
diff --git a/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot b/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot
index 994ba97bd5c..ebe4e39c57d 100644
--- a/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot
+++ b/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: CWEBbin 2021\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-14 14:19+0100\n"
+"POT-Creation-Date: 2021-12-25 14:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,15 +30,15 @@ msgid "%s: Need one to three file arguments.\n"
msgstr ""
#: ctang-texlive.ch:39
-msgid "This is CTANGLE, Version 4.5"
+msgid "This is CTANGLE, Version 4.6"
msgstr ""
#: ctwill-texlive.ch:39
-msgid "This is CTWILL, Version 4.5"
+msgid "This is CTWILL, Version 4.6"
msgstr ""
#: cweav-texlive.ch:39
-msgid "This is CWEAVE, Version 4.5"
+msgid "This is CWEAVE, Version 4.6"
msgstr ""
#: comm-texlive.ch:512
diff --git a/Build/source/texk/web2c/cwebdir/po/cweb.pot b/Build/source/texk/web2c/cwebdir/po/cweb.pot
index 2eb7fcdf06c..69fc6de6c53 100644
--- a/Build/source/texk/web2c/cwebdir/po/cweb.pot
+++ b/Build/source/texk/web2c/cwebdir/po/cweb.pot
@@ -523,15 +523,15 @@ msgid "Sorting:"
msgstr ""
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTANGLE (Version 4.6 [CWEBbin 2021.6])"
msgstr ""
#: cweav-twill.ch:61
-msgid "This is CTWILL (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTWILL (Version 4.6 [CWEBbin 2021.6])"
msgstr ""
#: cweav-i18n.ch:17 cweav-twill.ch:42
-msgid "This is CWEAVE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CWEAVE (Version 4.6 [CWEBbin 2021.6])"
msgstr ""
#: cweav-i18n.ch:301 cweav-i18n.ch:309
diff --git a/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po b/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po
index ddac850fc2a..8a85d159920 100644
--- a/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po
+++ b/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: CWEBbin 2021\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-14 14:19+0100\n"
-"PO-Revision-Date: 2021-11-14 14:21+0100\n"
+"POT-Creation-Date: 2021-12-25 14:12+0100\n"
+"PO-Revision-Date: 2021-12-25 14:13+0100\n"
"Last-Translator: Andreas Scherer <andreas_github@freenet.de>\n"
"Language-Team: German\n"
"Language: de\n"
@@ -33,16 +33,16 @@ msgid "%s: Need one to three file arguments.\n"
msgstr "%s: Benötige ein bis drei Dateiargumente.\n"
#: ctang-texlive.ch:39
-msgid "This is CTANGLE, Version 4.5"
-msgstr "Dies ist CTANGLE, Version 4.5"
+msgid "This is CTANGLE, Version 4.6"
+msgstr "Dies ist CTANGLE, Version 4.6"
#: ctwill-texlive.ch:39
-msgid "This is CTWILL, Version 4.5"
-msgstr "Dies ist CTWILL, Version 4.5"
+msgid "This is CTWILL, Version 4.6"
+msgstr "Dies ist CTWILL, Version 4.6"
#: cweav-texlive.ch:39
-msgid "This is CWEAVE, Version 4.5"
-msgstr "Dies ist CWEAVE, Version 4.5"
+msgid "This is CWEAVE, Version 4.6"
+msgstr "Dies ist CWEAVE, Version 4.6"
#: comm-texlive.ch:512
#, c-format
diff --git a/Build/source/texk/web2c/cwebdir/po/de/cweb.po b/Build/source/texk/web2c/cwebdir/po/de/cweb.po
index d6ef8d4fbaf..6eaea78c13f 100644
--- a/Build/source/texk/web2c/cwebdir/po/de/cweb.po
+++ b/Build/source/texk/web2c/cwebdir/po/de/cweb.po
@@ -603,16 +603,16 @@ msgid "Sorting:"
msgstr "Sortieren:"
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Dies ist CTANGLE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTANGLE (Version 4.6 [CWEBbin 2021.6])"
+msgstr "Dies ist CTANGLE (Version 4.6 [CWEBbin 2021.6])"
#: cweav-twill.ch:61
-msgid "This is CTWILL (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Dies ist CTWILL (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CTWILL (Version 4.6 [CWEBbin 2021.6])"
+msgstr "Dies ist CTWILL (Version 4.6 [CWEBbin 2021.6])"
#: cweav-i18n.ch:17 cweav-twill.ch:42
-msgid "This is CWEAVE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Dies ist CWEAVE (Version 4.5 [CWEBbin 2021.5])"
+msgid "This is CWEAVE (Version 4.6 [CWEBbin 2021.6])"
+msgstr "Dies ist CWEAVE (Version 4.6 [CWEBbin 2021.6])"
#: cweav-i18n.ch:301 cweav-i18n.ch:309
msgid "buffer"
diff --git a/Build/source/texk/web2c/cwebdir/po/it/cweb.po b/Build/source/texk/web2c/cwebdir/po/it/cweb.po
index 5d1c5f5198d..705038b1544 100644
--- a/Build/source/texk/web2c/cwebdir/po/it/cweb.po
+++ b/Build/source/texk/web2c/cwebdir/po/it/cweb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: CWEBbin 2021\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-06 11:08+0200\n"
-"PO-Revision-Date: 2021-06-06 11:10+0200\n"
+"POT-Creation-Date: 2021-02-06 15:25+0100\n"
+"PO-Revision-Date: 2021-12-25 14:14+0100\n"
"Last-Translator: Andreas Scherer <andreas_github@freenet.de>\n"
"Language-Team: Italian\n"
"Language: it\n"
@@ -598,16 +598,16 @@ msgid "Sorting:"
msgstr "Ordinamento:"
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Questo è CTANGLE (Versione 4.5 [CWEBbin 2021])"
+msgid "This is CTANGLE (Version 4.6 [CWEBbin 2021.6])"
+msgstr "Questo è CTANGLE (Versione 4.6 [CWEBbin 2021])"
#: cweav-i18n.ch:17
-msgid "This is CWEAVE (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Questo è CWEAVE (Versione 4.5 [CWEBbin 2021])"
+msgid "This is CWEAVE (Version 4.6 [CWEBbin 2021.6])"
+msgstr "Questo è CWEAVE (Versione 4.6 [CWEBbin 2021])"
#: cweav-twill.ch:68
-msgid "This is CTWILL (Version 4.5 [CWEBbin 2021.5])"
-msgstr "Questo è CTWILL (Versione 4.5 [CWEBbin 2021])"
+msgid "This is CTWILL (Version 4.6 [CWEBbin 2021.6])"
+msgstr "Questo è CTWILL (Versione 4.6 [CWEBbin 2021])"
#: cweav-i18n.ch:301 cweav-i18n.ch:309
msgid "buffer"
diff --git a/Build/source/texk/web2c/cwebdir/prod-cweave.w b/Build/source/texk/web2c/cwebdir/prod-cweave.w
index ea4ddf89f8e..1ba650b1c4e 100644
--- a/Build/source/texk/web2c/cwebdir/prod-cweave.w
+++ b/Build/source/texk/web2c/cwebdir/prod-cweave.w
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.6 --- December 2021
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
diff --git a/Build/source/texk/web2c/cwebdir/prod-twill.w b/Build/source/texk/web2c/cwebdir/prod-twill.w
index 48a985465b3..5decc89ece7 100644
--- a/Build/source/texk/web2c/cwebdir/prod-twill.w
+++ b/Build/source/texk/web2c/cwebdir/prod-twill.w
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.6 --- December 2021
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
diff --git a/Build/source/texk/web2c/cwebdir/prod.w b/Build/source/texk/web2c/cwebdir/prod.w
index e8311b12d6a..cba9473fd05 100644
--- a/Build/source/texk/web2c/cwebdir/prod.w
+++ b/Build/source/texk/web2c/cwebdir/prod.w
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.5 --- July 2021
+% Version 4.6 --- December 2021
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 804481ce251..b4d7b50c744 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,7 @@
+2021-12-26 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill.man: CWEB 4.6 release.
+
2021-11-13 Andreas Scherer <https://ascherer.github.io>
* ctwill.man,
diff --git a/Build/source/texk/web2c/man/ctwill.man b/Build/source/texk/web2c/man/ctwill.man
index 11fbe491d72..db182ab7277 100644
--- a/Build/source/texk/web2c/man/ctwill.man
+++ b/Build/source/texk/web2c/man/ctwill.man
@@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc
.\"
-.TH "CTWILL" "1" "July 27, 2021" "Web2c @VERSION@" "General Commands Manual"
+.TH "CTWILL" "1" "December 25, 2021" "Web2c @VERSION@" "General Commands Manual"
.hy
.SH NAME
.PP
@@ -111,7 +111,7 @@ The present incarnation of \f[B]ctwill\f[R] and its utilities tries hard
to be a drop-in replacement for the original package.
There are, however, a few differences worth noting:
.IP \[bu] 2
-This version is based on the most recent version of CWEB (4.5).
+This version is based on the most recent version of CWEB (4.6).
.IP \[bu] 2
In TeX\ Live the utility programs are prefixed with \f[B]ctwill-\f[R]
and the macro files with \f[B]ct\f[R] for technical reasons.