From 4d435df3faff5acb9f1c0f0b94944c4285980c9e Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Sun, 5 Jun 2022 14:27:22 +0000 Subject: [CWEB] Release 4.8. This new release provides the following features: * @ can be used freely in any #if -- #elif -- #else -- #endif preprocessor branches without bashing the debugger * The GCC compiler can be invoked with option -Wimplicit-fallthrough=2 on all CWEB code modules and will acknowledge /* fall through */ comments in the tangled C code * Simple C casts like '(double)x' are formatted with non-breaking small spaces as '(double)\,x' in the woven TeX output * The HINT boolean macros are now in lowercase (as in ifhint.tex) * Comma-separated lists of variable declarations are formatted in accordance with function parameter lists and enumerations, i.e., comma is handled in math-mode with associated small spacing and it fixes these bugs: * Section @ isn't overprinted (in PDF) * Trivial CWEB code is formatted correctly (issue #36) * Nested type definitions are recognized (issue #34) Major remaining bug (as of CWEB 4.3.1): * Issue #38 as described earlier git-svn-id: svn://tug.org/texlive/trunk@63490 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 +++ Build/source/texk/web2c/ctangleboot.cin | 2 +- Build/source/texk/web2c/cwebdir/ChangeLog | 38 ++++++++++++++++++++++++ Build/source/texk/web2c/cwebdir/Makefile | 2 +- Build/source/texk/web2c/cwebdir/comm-mac.ch | 4 +-- Build/source/texk/web2c/cwebdir/comm-mini.ch | 4 +-- Build/source/texk/web2c/cwebdir/comm-ql.ch | 8 ++--- Build/source/texk/web2c/cwebdir/comm-w2c.ch | 8 ++--- Build/source/texk/web2c/cwebdir/comm-w2c.h | 2 +- Build/source/texk/web2c/cwebdir/common.h | 2 +- Build/source/texk/web2c/cwebdir/common.w | 6 ++-- Build/source/texk/web2c/cwebdir/ctang-bs.ch | 4 +-- Build/source/texk/web2c/cwebdir/ctang-pc.ch | 4 +-- Build/source/texk/web2c/cwebdir/ctang-ql.ch | 8 ++--- Build/source/texk/web2c/cwebdir/ctang-vms.ch | 4 +-- Build/source/texk/web2c/cwebdir/ctang-w2c.ch | 12 ++++---- Build/source/texk/web2c/cwebdir/ctang-w32.ch | 4 +-- Build/source/texk/web2c/cwebdir/ctangle.c | 2 +- Build/source/texk/web2c/cwebdir/ctangle.w | 8 ++--- Build/source/texk/web2c/cwebdir/ctwill-w2c.ch | 12 ++++---- Build/source/texk/web2c/cwebdir/cweav-bs.ch | 4 +-- Build/source/texk/web2c/cwebdir/cweav-pc.ch | 4 +-- Build/source/texk/web2c/cwebdir/cweav-ql.ch | 8 ++--- Build/source/texk/web2c/cwebdir/cweav-vms.ch | 4 +-- Build/source/texk/web2c/cwebdir/cweav-w2c.ch | 12 ++++---- Build/source/texk/web2c/cwebdir/cweav-w32.ch | 4 +-- Build/source/texk/web2c/cwebdir/cweave.w | 8 ++--- Build/source/texk/web2c/cwebdir/cwebmac.tex | 4 +-- Build/source/texk/web2c/cwebdir/cwebman-w2c.ch | 14 ++++----- Build/source/texk/web2c/cwebdir/cwebman.tex | 6 ++-- Build/source/texk/web2c/cwebdir/po/cweb-tl.pot | 6 ++-- Build/source/texk/web2c/cwebdir/po/cweb.pot | 6 ++-- Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po | 12 ++++---- Build/source/texk/web2c/cwebdir/po/de/cweb.po | 12 ++++---- Build/source/texk/web2c/cwebdir/po/it/cweb.po | 12 ++++---- Build/source/texk/web2c/cwebdir/prod-cweave.w | 2 +- Build/source/texk/web2c/cwebdir/prod-twill.w | 2 +- Build/source/texk/web2c/cwebdir/prod.w | 2 +- Build/source/texk/web2c/man/ChangeLog | 4 +++ Build/source/texk/web2c/man/ctwill.man | 4 +-- 40 files changed, 157 insertions(+), 111 deletions(-) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index bb65d6800cd..70602c8d3db 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2022-06-05 Andreas Scherer + + * ctangleboot.cin: CWEB 4.8 release. + 2022-05-06 TANAKA Takuji * bibtex.ch: diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin index 18ba68505ce..9b2c18acc46 100644 --- a/Build/source/texk/web2c/ctangleboot.cin +++ b/Build/source/texk/web2c/ctangleboot.cin @@ -28,7 +28,7 @@ /*:4*/ #line 67 "cwebdir/ctangle.w" -#define banner "This is CTANGLE, Version 4.7" \ +#define banner "This is CTANGLE, Version 4.8" \ \ #define _(s) gettext(s) \ diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 4587b65777d..bb350bdfc4a 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,41 @@ +2022-06-05 Andreas Scherer + + * Makefile, + * comm-mac.ch, + * comm-mini.ch, + * comm-ql.ch, + * comm-w2c.ch, + * comm-w2c.h, + * common.h, + * common.w, + * ctang-bs.ch, + * ctang-pc.ch, + * ctang-ql.ch, + * ctang-vms.ch, + * ctang-w2c.ch, + * ctang-w32.ch, + * ctangle.c, + * ctangle.w, + * ctwill-w2c.ch, + * cweav-bs.ch, + * cweav-pc.ch, + * cweav-ql.ch, + * cweav-vms.ch, + * cweav-w2c.ch, + * cweav-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.w, + * prod-twill.w, + * prod.w: CWEB 4.8 release. + 2022-06-05 Andreas Scherer * cweave.w, diff --git a/Build/source/texk/web2c/cwebdir/Makefile b/Build/source/texk/web2c/cwebdir/Makefile index e3df1dcd1a6..e3db8819c69 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.7 --- February 2022 +# Version 4.8 --- June 2022 # 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 6d795ff4e8e..6bad610d1bd 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.7)} + \centerline{(Version 4.8)} @y - \centerline{(Version 4.7 for MacOS)} + \centerline{(Version 4.8 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 56bde3dc8de..5b59ea706f7 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.7 [CWEBbin 2022])} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.8 [CWEBbin 2022])} @y -\def\title{COMMON (Version 4.7 [CWEBbin 2022])} +\def\title{COMMON (Version 4.8 [CWEBbin 2022])} \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 aa451c74556..52c4834bedf 100644 --- a/Build/source/texk/web2c/cwebdir/comm-ql.ch +++ b/Build/source/texk/web2c/cwebdir/comm-ql.ch @@ -10,24 +10,24 @@ ex 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.7)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} \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.7)} +\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.8)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} \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 fea407efbeb..01f79d97b79 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.7)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)} @y \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi -\def\title{Common code for CTANGLE and CWEAVE (4.7 [\TeX~Live])} +\def\title{Common code for CTANGLE and CWEAVE (4.8 [\TeX~Live])} @z @x - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} @y - \centerline{(Version 4.7 [\TeX~Live])} + \centerline{(Version 4.8 [\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 e0c23709fcd..922e4aaee95 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.7 --- February 2022 (works also with later versions) +% Version 4.8 --- June 2022 (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 4d2caba05d7..186e87fd63f 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.7 --- February 2022 (works also with later versions) +% Version 4.8 --- June 2022 (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 23e2b08661b..4ec17241c3b 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.7 --- February 2022 +% Version 4.8 --- June 2022 % 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.7)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} \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 ecdb4be591c..911d7d5dcf2 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.7)" +@d banner "This is CTANGLE (Version 4.8)" @y The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.7pc/big)" +@d banner "This is CTANGLE (Version 4.8pc/big)" @z diff --git a/Build/source/texk/web2c/cwebdir/ctang-pc.ch b/Build/source/texk/web2c/cwebdir/ctang-pc.ch index 459356a59ee..00c19373070 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.7)" +@d banner "This is CTANGLE (Version 4.8)" @y -@d banner "This is CTANGLE (Version 4.7pc)" +@d banner "This is CTANGLE (Version 4.8pc)" @z @x section 17 @d max_bytes 100000 /* 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 727b20ea9c8..809dff497db 100644 --- a/Build/source/texk/web2c/cwebdir/ctang-ql.ch +++ b/Build/source/texk/web2c/cwebdir/ctang-ql.ch @@ -7,15 +7,15 @@ ex cc;"-v -h -c -=500000 ctangle_c" @x -\def\title{CTANGLE (Version 4.7)} +\def\title{CTANGLE (Version 4.8)} @y -\def\title{CTANGLE (QL Version 4.7)} +\def\title{CTANGLE (QL Version 4.8)} @z @x section 1 -@d banner "This is CTANGLE (Version 4.7)" +@d banner "This is CTANGLE (Version 4.8)" @y -@d banner "This is CTANGLE (QL Version 4.7)" +@d banner "This is CTANGLE (QL Version 4.8)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/ctang-vms.ch b/Build/source/texk/web2c/cwebdir/ctang-vms.ch index e494b86f4fa..a928d912cfd 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.7)" +@d banner "This is CTANGLE (Version 4.8)" @y -@d banner "This is CTANGLE (VAX/VMS Version 4.7)" +@d banner "This is CTANGLE (VAX/VMS Version 4.8)" @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 6d74d1997a6..9b115568f4f 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.7)} +\def\title{CTANGLE (Version 4.8)} @y -\def\title{CTANGLE (Version 4.7 [\TeX~Live])} +\def\title{CTANGLE (Version 4.8 [\TeX~Live])} @z @x - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} @y - \centerline{(Version 4.7 [\TeX~Live])} + \centerline{(Version 4.8 [\TeX~Live])} @z @x @@ -41,9 +41,9 @@ @z @x -@d banner "This is CTANGLE (Version 4.7)" +@d banner "This is CTANGLE (Version 4.8)" @y -@d banner "This is CTANGLE, Version 4.7" +@d banner "This is CTANGLE, Version 4.8" /* 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 d54b84b9f9d..ab76415410f 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.7)" +@d banner "This is CTANGLE (Version 4.8)" @y -@d banner "This is CTANGLE (Version 4.7win32)" +@d banner "This is CTANGLE (Version 4.8win32)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/ctangle.c b/Build/source/texk/web2c/cwebdir/ctangle.c index bc00c0cf7f3..262469d6119 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.7)" \ +#define banner "This is CTANGLE (Version 4.8)" \ #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 039f337865a..0c372e59ed8 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.7 --- February 2022 +% Version 4.8 --- June 2022 % 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.7)} +\def\title{CTANGLE (Version 4.8)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CTANGLE} processor} \vskip 15pt - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} \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.7)" +@d banner "This is CTANGLE (Version 4.8)" @c @@/ diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch index a4a8dc2b3b7..8f44b5dffd9 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.7)} +\def\title{CWEAVE (Version 4.8)} @y -\def\title{CTWILL (Version 4.7 [\TeX~Live])} +\def\title{CTWILL (Version 4.8 [\TeX~Live])} @z @x @@ -47,9 +47,9 @@ @z @x - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} @y - \centerline{(Version 4.7 [\TeX~Live])} + \centerline{(Version 4.8 [\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.7)" +@d banner "This is CWEAVE (Version 4.8)" @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.7" +@d banner "This is CTWILL, Version 4.8" /* 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 c0fc3981ae5..5a53a8ad0ae 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.7)" +@d banner "This is CWEAVE (Version 4.8)" @y The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.7pc/big)" +@d banner "This is CWEAVE (Version 4.8pc/big)" @z diff --git a/Build/source/texk/web2c/cwebdir/cweav-pc.ch b/Build/source/texk/web2c/cwebdir/cweav-pc.ch index 101b4d8a7ae..eb2e3942659 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.7)" +@d banner "This is CWEAVE (Version 4.8)" @y -@d banner "This is CWEAVE (Version 4.7pc)" +@d banner "This is CWEAVE (Version 4.8pc)" @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 041cba0a830..94e1f54304f 100644 --- a/Build/source/texk/web2c/cwebdir/cweav-ql.ch +++ b/Build/source/texk/web2c/cwebdir/cweav-ql.ch @@ -7,15 +7,15 @@ ex cc;"-v -h -c =500000 cweave_c" @x -\def\title{CWEAVE (Version 4.7)} +\def\title{CWEAVE (Version 4.8)} @y -\def\title{CWEAVE (QL Version 4.7)} +\def\title{CWEAVE (QL Version 4.8)} @z @x section 1 -@d banner "This is CWEAVE (Version 4.7)" +@d banner "This is CWEAVE (Version 4.8)" @y -@d banner "This is CWEAVE (QL Version 4.7)" +@d banner "This is CWEAVE (QL Version 4.8)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/cweav-vms.ch b/Build/source/texk/web2c/cwebdir/cweav-vms.ch index 5078c16541d..5debd4bd92e 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.7)" +@d banner "This is CWEAVE (Version 4.8)" @y -@d banner "This is CWEAVE (VAX/VMS Version 4.7)" +@d banner "This is CWEAVE (VAX/VMS Version 4.8)" @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 5e8cf7d1faf..d7cb2065ec1 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.7)} +\def\title{CWEAVE (Version 4.8)} @y -\def\title{CWEAVE (Version 4.7 [\TeX~Live])} +\def\title{CWEAVE (Version 4.8 [\TeX~Live])} @z @x - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} @y - \centerline{(Version 4.7 [\TeX~Live])} + \centerline{(Version 4.8 [\TeX~Live])} @z @x @@ -41,9 +41,9 @@ @z @x -@d banner "This is CWEAVE (Version 4.7)" +@d banner "This is CWEAVE (Version 4.8)" @y -@d banner "This is CWEAVE, Version 4.7" +@d banner "This is CWEAVE, Version 4.8" /* 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 84e6a321a57..f40d6e31958 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.7)" +@d banner "This is CWEAVE (Version 4.8)" @y -@d banner "This is CWEAVE (Version 4.7win32)" +@d banner "This is CWEAVE (Version 4.8win32)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index fbc7881a13b..7de3b4d1d9f 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.7 --- February 2022 +% Version 4.8 --- June 2022 % 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.7)} +\def\title{CWEAVE (Version 4.8)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CWEAVE} processor} \vskip 15pt - \centerline{(Version 4.7)} + \centerline{(Version 4.8)} \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.7)" +@d banner "This is CWEAVE (Version 4.8)" @c @@/ diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex index 7b3163efd85..e2d2ecb3a24 100644 --- a/Build/source/texk/web2c/cwebdir/cwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex @@ -1,7 +1,7 @@ % standard macros for CWEB listings (in addition to plain.tex) -% Version 4.7--- January 2022 +% Version 4.8--- June 2022 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros -\xdef\fmtversion{\fmtversion+CWEB4.7} +\xdef\fmtversion{\fmtversion+CWEB4.8} \chardef\cwebversion=4 \chardef\cwebrevision=7 \newif\ifpdf \ifx\pdf+\pdftrue\fi diff --git a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch index 7d16bed97ea..5620f64052f 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.7)} +\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.8)} @y \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} -\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.7 [\TeX~Live])} +\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.8 [\TeX~Live])} @z @x -\vskip 18pt\centerline{(Version 4.7 --- February 2022)} +\vskip 18pt\centerline{(Version 4.8 --- June 2022)} @y -\vskip 18pt\centerline{(Version 4.7 --- February 2022)% -\footnote*{This document describes the extended \.{CWEB} (Version 4.7 [\TeX~Live]).}} +\vskip 18pt\centerline{(Version 4.8 --- June 2022)% +\footnote*{This document describes the extended \.{CWEB} (Version 4.8 [\TeX~Live]).}} @z @x @@ -321,9 +321,9 @@ And here's what the same excerpt looks like when typeset. @z @x - \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$ @y - \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$ @z @x diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex index 388c3be2261..87523dbcedb 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.7)} +\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.8)} % 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.7 --- February 2022)} +\vskip 18pt\centerline{(Version 4.8 --- June 2022)} \vskip 24pt \centerline{\authorfont Donald E. Knuth and Silvio Levy} \vfill @@ -1598,7 +1598,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.7)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\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 39c6460d8c6..34835e1224e 100644 --- a/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot +++ b/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot @@ -30,15 +30,15 @@ msgid "%s: Need one to three file arguments.\n" msgstr "" #: ctang-texlive.ch:39 -msgid "This is CTANGLE, Version 4.7" +msgid "This is CTANGLE, Version 4.8" msgstr "" #: ctwill-texlive.ch:39 -msgid "This is CTWILL, Version 4.7" +msgid "This is CTWILL, Version 4.8" msgstr "" #: cweav-texlive.ch:39 -msgid "This is CWEAVE, Version 4.7" +msgid "This is CWEAVE, Version 4.8" 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 d75d0d221c5..acda111ba43 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.7 [CWEBbin 2022.1])" +msgid "This is CTANGLE (Version 4.8 [CWEBbin 2022.2])" msgstr "" #: cweav-twill.ch:61 -msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])" +msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])" msgstr "" #: cweav-i18n.ch:17 cweav-twill.ch:42 -msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])" +msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])" 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 de63175f1dd..6dac6a36685 100644 --- a/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po +++ b/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po @@ -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.7" -msgstr "Dies ist CTANGLE, Version 4.7" +msgid "This is CTANGLE, Version 4.8" +msgstr "Dies ist CTANGLE, Version 4.8" #: ctwill-texlive.ch:39 -msgid "This is CTWILL, Version 4.7" -msgstr "Dies ist CTWILL, Version 4.7" +msgid "This is CTWILL, Version 4.8" +msgstr "Dies ist CTWILL, Version 4.8" #: cweav-texlive.ch:39 -msgid "This is CWEAVE, Version 4.7" -msgstr "Dies ist CWEAVE, Version 4.7" +msgid "This is CWEAVE, Version 4.8" +msgstr "Dies ist CWEAVE, Version 4.8" #: 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 839942ce105..d8872fa33fc 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.7 [CWEBbin 2022.1])" -msgstr "Dies ist CTANGLE (Version 4.7 [CWEBbin 2022.1])" +msgid "This is CTANGLE (Version 4.8 [CWEBbin 2022.2])" +msgstr "Dies ist CTANGLE (Version 4.8 [CWEBbin 2022.2])" #: cweav-twill.ch:61 -msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])" -msgstr "Dies ist CTWILL (Version 4.7 [CWEBbin 2022.1])" +msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])" +msgstr "Dies ist CTWILL (Version 4.8 [CWEBbin 2022.2])" #: cweav-i18n.ch:17 cweav-twill.ch:42 -msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])" -msgstr "Dies ist CWEAVE (Version 4.7 [CWEBbin 2022.1])" +msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])" +msgstr "Dies ist CWEAVE (Version 4.8 [CWEBbin 2022.2])" #: 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 be50735ad8e..a6f263950c5 100644 --- a/Build/source/texk/web2c/cwebdir/po/it/cweb.po +++ b/Build/source/texk/web2c/cwebdir/po/it/cweb.po @@ -598,16 +598,16 @@ msgid "Sorting:" msgstr "Ordinamento:" #: ctang-i18n.ch:17 -msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])" -msgstr "Questo è CTANGLE (Versione 4.7 [CWEBbin 2022.1])" +msgid "This is CTANGLE (Version 4.8 [CWEBbin 2022.2])" +msgstr "Questo è CTANGLE (Versione 4.8 [CWEBbin 2022.2])" #: cweav-i18n.ch:17 -msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])" -msgstr "Questo è CWEAVE (Versione 4.7 [CWEBbin 2022.1])" +msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])" +msgstr "Questo è CWEAVE (Versione 4.8 [CWEBbin 2022.2])" #: cweav-twill.ch:68 -msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])" -msgstr "Questo è CTWILL (Versione 4.7 [CWEBbin 2022.1])" +msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])" +msgstr "Questo è CTWILL (Versione 4.8 [CWEBbin 2022.2])" #: 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 606fb7cef20..09af310e61d 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.7 --- February 2022 +% Version 4.8 --- June 2022 % @ 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 faf1c34a741..0a3e3d86167 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.7 --- February 2022 +% Version 4.8 --- June 2022 % @ 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 3cc95c42566..1e6cb6194ca 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.7 --- February 2022 +% Version 4.8 --- June 2022 % @ 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 9453f6cca14..95a11e7d444 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,7 @@ +2022-06-05 Andreas Scherer + + * ctwill.man: CWEB 4.8 release. + 2022-03-27 Andreas Scherer * tangle.man, diff --git a/Build/source/texk/web2c/man/ctwill.man b/Build/source/texk/web2c/man/ctwill.man index 0965faa9d5c..ed7a3757cad 100644 --- a/Build/source/texk/web2c/man/ctwill.man +++ b/Build/source/texk/web2c/man/ctwill.man @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "CTWILL" "1" "February 5, 2022" "Web2c @VERSION@" "General Commands Manual" +.TH "CTWILL" "1" "June 5, 2022" "Web2c @VERSION@" "General Commands Manual" .hy .SH NAME .PP @@ -125,7 +125,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.7). +This version is based on the most recent version of CWEB (4.8). .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. -- cgit v1.2.3