diff options
author | Andreas Scherer <andreas_tex@freenet.de> | 2023-05-15 15:10:44 +0000 |
---|---|---|
committer | Andreas Scherer <andreas_tex@freenet.de> | 2023-05-15 15:10:44 +0000 |
commit | 9e2a37db6688201f4f9e40cd978841b8791c4ee0 (patch) | |
tree | c0238f4ed11d345af3393fb2b2c378d24f5d2ba2 /Build/source/texk | |
parent | 5abcd0658a482dbc9145d8a15d169768f7b5c19c (diff) |
[CWEB] Release 4.9.
This commit bumps the version number to 4.9.
And it reverts a few occurrences of '\ifacro' as synonym for '\ifpdf'.
All other changes since CWEB 4.8 were committed as rolling releases.
git-svn-id: svn://tug.org/texlive/trunk@67119 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
42 files changed, 178 insertions, 147 deletions
diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin index cdfa9cbd733..bf92f400178 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.8" \ +#define banner "This is CTANGLE, Version 4.9" \ \ #define _(s) gettext(s) \ diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 606c5c13f17..0f242f42a28 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,5 +1,31 @@ 2023-05-14 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,ctwill}.w, + * prod.w, + * texinputs/dcwebmac.tex, + * texinputs/pdfctwimac.tex: CWEB 4.9 release. + +2023-05-14 Andreas Scherer <https://ascherer.github.io> + * ctwill-mini.ch, * ctwill-w2c.ch: Reshuffle fix for CTWILL; permit '$' in C identifiers (from ctangle.w); diff --git a/Build/source/texk/web2c/cwebdir/Makefile b/Build/source/texk/web2c/cwebdir/Makefile index 08effe531d3..6556815d74a 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.8 --- June 2022 +# Version 4.9 --- May 2023 # Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth @@ -205,6 +205,6 @@ tarball: tar zcvhf /tmp/cweb.tgz $(ALL) examples ctan: - git archive -o ~/cweb-4.8.zip --prefix=cweb/ cweb-4.8 + git archive -o ~/cweb-4.9.zip --prefix=cweb/ cweb-4.9 make PDF=pdf usermanual - cd ..; zip -r ~/cweb-4.8.zip cweb/cwebman.pdf + cd ..; zip -r ~/cweb-4.9.zip cweb/cwebman.pdf diff --git a/Build/source/texk/web2c/cwebdir/comm-mac.ch b/Build/source/texk/web2c/cwebdir/comm-mac.ch index 7bf7151dd23..2fe2dcb2a98 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.8)} + \centerline{(Version 4.9)} @y - \centerline{(Version 4.8 for MacOS)} + \centerline{(Version 4.9 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 5b59ea706f7..3f809f9de9b 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.8 [CWEBbin 2022])} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.9 [CWEBbin 2023])} @y -\def\title{COMMON (Version 4.8 [CWEBbin 2022])} +\def\title{COMMON (Version 4.9 [CWEBbin 2023])} \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 52c4834bedf..1e15fd49755 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.8)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.9)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} \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.8)} +\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.9)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} \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 951d8063d69..ef6e867c0ab 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.8)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.9)} @y -\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifpdf\sanitizecommand\Kpathsea{KPATHSEA}\fi -\def\title{Common code for CTANGLE and CWEAVE (4.8 [\TeX~Live])} +\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi +\def\title{Common code for CTANGLE and CWEAVE (4.9 [\TeX~Live])} @z @x - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} @y - \centerline{(Version 4.8 [\TeX~Live])} + \centerline{(Version 4.9 [\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 922e4aaee95..1046149331c 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.8 --- June 2022 (works also with later versions) +% Version 4.9 --- May 2023 (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 186e87fd63f..914c04f1436 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.8 --- June 2022 (works also with later versions) +% Version 4.9 --- May 2023 (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 5d7d5f50d01..0a7b9616a05 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.8 --- June 2022 +% Version 4.9 --- May 2023 % 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.8)} +\def\title{Common code for CTANGLE and CWEAVE (Version 4.9)} \def\topofcontents{\null\vfill \centerline{\titlefont Common code for {\ttitlefont CTANGLE} and {\ttitlefont CWEAVE}} \vskip 15pt - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} \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 911d7d5dcf2..e3966f64584 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.8)" +@d banner "This is CTANGLE (Version 4.9)" @y The ``banner line'' defined here should be changed whenever \.{CTANGLE} is modified. -@d banner "This is CTANGLE (Version 4.8pc/big)" +@d banner "This is CTANGLE (Version 4.9pc/big)" @z diff --git a/Build/source/texk/web2c/cwebdir/ctang-pc.ch b/Build/source/texk/web2c/cwebdir/ctang-pc.ch index 00c19373070..6c8c9085eb1 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.8)" +@d banner "This is CTANGLE (Version 4.9)" @y -@d banner "This is CTANGLE (Version 4.8pc)" +@d banner "This is CTANGLE (Version 4.9pc)" @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 809dff497db..56eb681b3dc 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.8)} +\def\title{CTANGLE (Version 4.9)} @y -\def\title{CTANGLE (QL Version 4.8)} +\def\title{CTANGLE (QL Version 4.9)} @z @x section 1 -@d banner "This is CTANGLE (Version 4.8)" +@d banner "This is CTANGLE (Version 4.9)" @y -@d banner "This is CTANGLE (QL Version 4.8)" +@d banner "This is CTANGLE (QL Version 4.9)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/ctang-vms.ch b/Build/source/texk/web2c/cwebdir/ctang-vms.ch index a928d912cfd..ea58b89a5a1 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.8)" +@d banner "This is CTANGLE (Version 4.9)" @y -@d banner "This is CTANGLE (VAX/VMS Version 4.8)" +@d banner "This is CTANGLE (VAX/VMS Version 4.9)" @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 d12ffd85066..312c2be8988 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.8)} +\def\title{CTANGLE (Version 4.9)} @y -\def\title{CTANGLE (Version 4.8 [\TeX~Live])} +\def\title{CTANGLE (Version 4.9 [\TeX~Live])} @z @x - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} @y - \centerline{(Version 4.8 [\TeX~Live])} + \centerline{(Version 4.9 [\TeX~Live])} @z @x @@ -41,9 +41,9 @@ @z @x -@d banner "This is CTANGLE (Version 4.8)" +@d banner "This is CTANGLE (Version 4.9)" @y -@d banner "This is CTANGLE, Version 4.8" +@d banner "This is CTANGLE, Version 4.9" /* 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 ab76415410f..76311d0b65d 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.8)" +@d banner "This is CTANGLE (Version 4.9)" @y -@d banner "This is CTANGLE (Version 4.8win32)" +@d banner "This is CTANGLE (Version 4.9win32)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/ctangle.c b/Build/source/texk/web2c/cwebdir/ctangle.c index 8f6b14e260c..35c1ed709a2 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.8)" \ +#define banner "This is CTANGLE (Version 4.9)" \ #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 af4f4e92811..ee3f9199681 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.8 --- June 2022 +% Version 4.9 --- May 2023 % 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.8)} +\def\title{CTANGLE (Version 4.9)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CTANGLE} processor} \vskip 15pt - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} \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.8)" +@d banner "This is CTANGLE (Version 4.9)" @c @<Include files@>@/ diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch index bc37a0726f8..78531c036d0 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch @@ -3,7 +3,7 @@ Section 1. @x @** Introduction. @y -\ifpdf \ifx\undefined\pdfpagewidth\else +\ifacro \ifx\undefined\pdfpagewidth\else \pdfpagewidth=\pagewd \advance\pdfpagewidth by 2cm \pdfpageheight=\pageht \advance\pdfpageheight by 5cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch index 5abf1c5c95c..93ebf3f40a4 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.8)} +\def\title{CWEAVE (Version 4.9)} @y -\def\title{CTWILL (Version 4.8 [\TeX~Live])} +\def\title{CTWILL (Version 4.9 [\TeX~Live])} @z @x @@ -47,9 +47,9 @@ @z @x - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} @y - \centerline{(Version 4.8 [\TeX~Live])} + \centerline{(Version 4.9 [\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.8)" +@d banner "This is CWEAVE (Version 4.9)" @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.8" +@d banner "This is CTWILL, Version 4.9" /* 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 5a53a8ad0ae..46c6f6c01c1 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.8)" +@d banner "This is CWEAVE (Version 4.9)" @y The ``banner line'' defined here should be changed whenever \.{CWEAVE} is modified. -@d banner "This is CWEAVE (Version 4.8pc/big)" +@d banner "This is CWEAVE (Version 4.9pc/big)" @z diff --git a/Build/source/texk/web2c/cwebdir/cweav-pc.ch b/Build/source/texk/web2c/cwebdir/cweav-pc.ch index eb2e3942659..cd8367fe29c 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.8)" +@d banner "This is CWEAVE (Version 4.9)" @y -@d banner "This is CWEAVE (Version 4.8pc)" +@d banner "This is CWEAVE (Version 4.9pc)" @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 94e1f54304f..89cbea1efd8 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.8)} +\def\title{CWEAVE (Version 4.9)} @y -\def\title{CWEAVE (QL Version 4.8)} +\def\title{CWEAVE (QL Version 4.9)} @z @x section 1 -@d banner "This is CWEAVE (Version 4.8)" +@d banner "This is CWEAVE (Version 4.9)" @y -@d banner "This is CWEAVE (QL Version 4.8)" +@d banner "This is CWEAVE (QL Version 4.9)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/cweav-vms.ch b/Build/source/texk/web2c/cwebdir/cweav-vms.ch index 5debd4bd92e..3e9488ab2b9 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.8)" +@d banner "This is CWEAVE (Version 4.9)" @y -@d banner "This is CWEAVE (VAX/VMS Version 4.8)" +@d banner "This is CWEAVE (VAX/VMS Version 4.9)" @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 d7cb2065ec1..a0d4a243bd8 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.8)} +\def\title{CWEAVE (Version 4.9)} @y -\def\title{CWEAVE (Version 4.8 [\TeX~Live])} +\def\title{CWEAVE (Version 4.9 [\TeX~Live])} @z @x - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} @y - \centerline{(Version 4.8 [\TeX~Live])} + \centerline{(Version 4.9 [\TeX~Live])} @z @x @@ -41,9 +41,9 @@ @z @x -@d banner "This is CWEAVE (Version 4.8)" +@d banner "This is CWEAVE (Version 4.9)" @y -@d banner "This is CWEAVE, Version 4.8" +@d banner "This is CWEAVE, Version 4.9" /* 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 f40d6e31958..0392dd3a921 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.8)" +@d banner "This is CWEAVE (Version 4.9)" @y -@d banner "This is CWEAVE (Version 4.8win32)" +@d banner "This is CWEAVE (Version 4.9win32)" @z @x diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index b2677d166dc..61fdc0a0889 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.8 --- June 2022 +% Version 4.9 --- May 2023 % 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.8)} +\def\title{CWEAVE (Version 4.9)} \def\topofcontents{\null\vfill \centerline{\titlefont The {\ttitlefont CWEAVE} processor} \vskip 15pt - \centerline{(Version 4.8)} + \centerline{(Version 4.9)} \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.8)" +@d banner "This is CWEAVE (Version 4.9)" @c @<Include files@>@/ diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex index 3f058c5435a..dda61c5891d 100644 --- a/Build/source/texk/web2c/cwebdir/cwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex @@ -1,5 +1,5 @@ % standard macros for CWEB listings (in addition to plain.tex) -% Version 4.9 --- June 2022 +% Version 4.9 --- May 2023 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros \xdef\fmtversion{\fmtversion+CWEB4.9} \chardef\cwebversion=4 \chardef\cwebrevision=9 @@ -134,7 +134,7 @@ \newif\iftokprocessed \newif\ifTnum \newif\ifinstr {\def\\{\global\let\spacechar= }\\ } -\ifacro % The following are pdf macros +\ifpdf % The following are pdf macros \def\thewidth{\the\wd0 \space} \def\theheight{\the\ht\strutbox\space} \def\thedepth{\the\dp\strutbox\space} @@ -262,7 +262,7 @@ \let\pdflink=\HINTlink \fi % End of HINT macros -% Common macros for \ifacro and \ifhint +% Common macros for \ifpdf and \ifhint \ifacrohint \def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA} \def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}% @@ -305,7 +305,7 @@ \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50 \ifhint\HINTlabel\fi% Start page before section \noindent{\let\*=\lapstar\bf\secstar.\quad}% - \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty + \ifpdf \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty \ifpdftex \pdfdest num \secstar fith% \else \special{pdf: dest (\romannumeral\secstar) [ @thispage /FitH @ypos ]}\fi}}\fi} @@ -338,7 +338,7 @@ \outer\def\M#1{\MN{#1}\ifon\vfil\penalty-100\vfilneg % beginning of section \vskip\intersecskip\startsection\ignorespaces} \outer\def\N#1#2#3.{% beginning of starred section - \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi + \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi \gdepth=#1\gtitle={#3}\MN{#2}% \ifon\ifnum#1<\secpagedepth \vfil\eject % force page break if depth is small \else\vfil\penalty-100\vfilneg\vskip\intersecskip\fi\fi @@ -504,7 +504,7 @@ \def\U{\note{Used in section}} % crossref for use of a section \def\Us{\note{Used in sections}} % crossref for uses of a section \def\I{\par\hangindent 2em}\let\*=* - \ifacro \def\outsecname{Names of the sections} \let\Xpdf\X + \ifpdf \def\outsecname{Names of the sections} \let\Xpdf\X % \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68 \ifpdftex \pdfdest name {NOS} fith % changed in version 3.69 \pdfoutline goto name {NOS} count -\the\countD {\outsecname} @@ -551,7 +551,7 @@ \ \ifhint \HINTlink{#3}{\romannumeral#3}% No page numbers in HINT \HINTcontents{#1}{#2}{#3}% - \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi + \else\ifpdf\pdflink{#3}{\romannumeral#3}\else#3\fi \hbox to3em{\hss#4}\fi}} \def\consetup#1{\ifcase#1 \bf % depth -1 (@**) \or % depth 0 (@*) diff --git a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch index 73a907deb5e..0d6e400de5a 100644 --- a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch @@ -37,7 +37,7 @@ \centerline{\sectionfont\def\.##1{{\twelvett##1}} #1}\nobreak\vskip 6pt \everypar{\hskip-\parindent\everypar{}}} @y -\ifpdf +\ifacro \pdfpagewidth=\pagewidth \advance\pdfpagewidth by 2cm \pdfpageheight=\pageheight \advance\pdfpageheight by 3cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm @@ -50,7 +50,7 @@ \def\subsections{0} \outer\def\section #1.{\penalty-500\bigskip \centerline{\sectionfont\def\.##1{{\twelvett##1}} - \ifpdf\vbox to 0pt{\kern-2.5ex\relax + \ifacro\vbox to 0pt{\kern-2.5ex\relax \ifpdftex\pdfdest num \destcount fitbh\relax \else\special{pdf: dest (\the\destcount) [ @thispage /FitBH @ypos ]}\fi \def\.##1{##1}\def\TeX{TeX}% @@ -69,7 +69,7 @@ \def\appC{17} \def\Appendix#1{\leavevmode - \ifpdf\ifpdftex + \ifacro\ifpdftex \pdfstartlink attr{/Border[0 0 0]} goto num\csname app#1\endcsname\relax \Blue\hbox{Appendix}~#1\Black \pdfendlink @@ -82,7 +82,7 @@ \newcount\subdestcount \subdestcount=151\relax -\outer\def\subsection #1.{\ifpdf +\outer\def\subsection #1.{\ifacro \ifpdftex\pdfdest num \subdestcount fitbh\relax \pdfoutline goto num \subdestcount {#1}\relax \else\special{pdf: dest (\the\subdestcount) [ @thispage /FitBH @ypos ]}% @@ -93,17 +93,17 @@ @z @x -\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.8)} +\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.9)} @y \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} -\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.8 [\TeX~Live])} +\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.9 [\TeX~Live])} @z @x -\vskip 18pt\centerline{(Version 4.8 --- June 2022)} +\vskip 18pt\centerline{(Version 4.9 --- May 2023)} @y -\vskip 18pt\centerline{(Version 4.8 --- June 2022)% -\footnote*{This document describes the extended \.{CWEB} (Version 4.8 [\TeX~Live]).}} +\vskip 18pt\centerline{(Version 4.9 --- May 2023)% +\footnote*{This document describes the extended \.{CWEB} (Version 4.9 [\TeX~Live]).}} @z @x @@ -316,13 +316,13 @@ And here's what the same excerpt looks like when typeset. \vfil\eject\titletrue \ifx\pdf+\pdftrue\fi \ifxetex\pdftrue\fi \ifpdftex\ifnum\pdfoutput>0 \pdftrue\fi\fi -\ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi +\ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi @z @x - \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.9)\}{ }\\vfill\}}\cr}$$ @y - \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.9)\}{ }\\vfill\}}\cr}$$ @z @x diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex index 218a85b5894..66e1f8d8a3d 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.8)} +\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.9)} % 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.8 --- June 2022)} +\vskip 18pt\centerline{(Version 4.9 --- May 2023)} \vskip 24pt \centerline{\authorfont Donald E. Knuth and Silvio Levy} \vfill @@ -1607,7 +1607,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.8)\}{ }\\vfill\}}\cr}$$ + \.{ { }\\vskip 15pt \\centerline\{(Version 4.9)\}{ }\\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 34835e1224e..ad045d25177 100644 --- a/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot +++ b/Build/source/texk/web2c/cwebdir/po/cweb-tl.pot @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2021 Andreas Scherer et al. +# Copyright (C) 2023 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. -# Andreas Scherer <https://ascherer.github.io>, 2021. +# Andreas Scherer <https://ascherer.github.io>. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2021\n" +"Project-Id-Version: CWEBbin 2023\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 14:12+0100\n" +"POT-Creation-Date: 2023-05-15 16:11+0200\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.8" +msgid "This is CTANGLE, Version 4.9" msgstr "" #: ctwill-texlive.ch:39 -msgid "This is CTWILL, Version 4.8" +msgid "This is CTWILL, Version 4.9" msgstr "" #: cweav-texlive.ch:39 -msgid "This is CWEAVE, Version 4.8" +msgid "This is CWEAVE, Version 4.9" 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 acda111ba43..c67ceadc421 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.8 [CWEBbin 2022.2])" +msgid "This is CTANGLE (Version 4.9 [CWEBbin 2023])" msgstr "" #: cweav-twill.ch:61 -msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])" +msgid "This is CTWILL (Version 4.9 [CWEBbin 2023])" msgstr "" #: cweav-i18n.ch:17 cweav-twill.ch:42 -msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])" +msgid "This is CWEAVE (Version 4.9 [CWEBbin 2023])" 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 6dac6a36685..da6f725f60f 100644 --- a/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po +++ b/Build/source/texk/web2c/cwebdir/po/de/cweb-tl.po @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2021 Andreas Scherer et al. +# Copyright (C) 2023 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. -# Andreas Scherer <https://ascherer.github.io>, 2021. +# Andreas Scherer <https://ascherer.github.io>. # msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2021\n" +"Project-Id-Version: CWEBbin 2023\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 14:12+0100\n" -"PO-Revision-Date: 2021-12-25 14:13+0100\n" +"POT-Creation-Date: 2023-05-15 16:13+0200\n" +"PO-Revision-Date: 2023-05-15 16:13+0200\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.8" -msgstr "Dies ist CTANGLE, Version 4.8" +msgid "This is CTANGLE, Version 4.9" +msgstr "Dies ist CTANGLE, Version 4.9" #: ctwill-texlive.ch:39 -msgid "This is CTWILL, Version 4.8" -msgstr "Dies ist CTWILL, Version 4.8" +msgid "This is CTWILL, Version 4.9" +msgstr "Dies ist CTWILL, Version 4.9" #: cweav-texlive.ch:39 -msgid "This is CWEAVE, Version 4.8" -msgstr "Dies ist CWEAVE, Version 4.8" +msgid "This is CWEAVE, Version 4.9" +msgstr "Dies ist CWEAVE, Version 4.9" #: 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 d8872fa33fc..0767166f681 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.8 [CWEBbin 2022.2])" -msgstr "Dies ist CTANGLE (Version 4.8 [CWEBbin 2022.2])" +msgid "This is CTANGLE (Version 4.9 [CWEBbin 2023])" +msgstr "Dies ist CTANGLE (Version 4.9 [CWEBbin 2023])" #: cweav-twill.ch:61 -msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])" -msgstr "Dies ist CTWILL (Version 4.8 [CWEBbin 2022.2])" +msgid "This is CTWILL (Version 4.9 [CWEBbin 2023])" +msgstr "Dies ist CTWILL (Version 4.9 [CWEBbin 2023])" #: cweav-i18n.ch:17 cweav-twill.ch:42 -msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])" -msgstr "Dies ist CWEAVE (Version 4.8 [CWEBbin 2022.2])" +msgid "This is CWEAVE (Version 4.9 [CWEBbin 2023])" +msgstr "Dies ist CWEAVE (Version 4.9 [CWEBbin 2023])" #: 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 a6f263950c5..a107bbede7d 100644 --- a/Build/source/texk/web2c/cwebdir/po/it/cweb.po +++ b/Build/source/texk/web2c/cwebdir/po/it/cweb.po @@ -1,14 +1,14 @@ # International version of CWEB (CWEBbin, TeXLive). -# Copyright (C) 2021 Andreas Scherer et al. +# Copyright (C) 2023 Andreas Scherer et al. # This file is distributed under the same license as the CWEB package. -# Andreas Scherer <https://ascherer/github.io>, 2021. +# Andreas Scherer <https://ascherer/github.io>. # msgid "" msgstr "" -"Project-Id-Version: CWEBbin 2021\n" +"Project-Id-Version: CWEBbin 2023\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-06 15:25+0100\n" -"PO-Revision-Date: 2021-12-25 14:14+0100\n" +"POT-Creation-Date: 2023-05-15 16:14+0200\n" +"PO-Revision-Date: 2023-05-15 16:14+0200\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.8 [CWEBbin 2022.2])" -msgstr "Questo è CTANGLE (Versione 4.8 [CWEBbin 2022.2])" +msgid "This is CTANGLE (Version 4.9 [CWEBbin 2023])" +msgstr "Questo è CTANGLE (Versione 4.9 [CWEBbin 2023])" #: cweav-i18n.ch:17 -msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])" -msgstr "Questo è CWEAVE (Versione 4.8 [CWEBbin 2022.2])" +msgid "This is CWEAVE (Version 4.9 [CWEBbin 2023])" +msgstr "Questo è CWEAVE (Versione 4.9 [CWEBbin 2023])" #: cweav-twill.ch:68 -msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])" -msgstr "Questo è CTWILL (Versione 4.8 [CWEBbin 2022.2])" +msgid "This is CTWILL (Version 4.9 [CWEBbin 2023])" +msgstr "Questo è CTWILL (Versione 4.9 [CWEBbin 2023])" #: 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 09af310e61d..6043435ff24 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.8 --- June 2022 +% Version 4.9 --- May 2023 % @ 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 0a3e3d86167..82f0f783455 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.8 --- June 2022 +% Version 4.9 --- May 2023 % @ 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 1e6cb6194ca..5be387f13d9 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.8 --- June 2022 +% Version 4.9 --- May 2023 % @ 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/texinputs/dcwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex index 826a514e8b4..c0fc9a38999 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/dcwebmac.tex @@ -63,7 +63,7 @@ \setpage \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}} \def\I{\par\hangindent 2em}\let\*=* - \ifpdf \let\Xpdf\X + \ifacro \let\Xpdf\X \ifpdftex \pdfdest name {NOS} fith \pdfoutline goto name {NOS} count -\the\countD {\outsecname} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% diff --git a/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index 03b944cd60a..6929ffb888c 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -16,6 +16,7 @@ \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too \def\PDFlinkcolor{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}} \fi +\let\ifacro=\ifpdf \let\:=\. % preserve a way to get the dot accent % (all other accents will still work as usual) @@ -234,7 +235,7 @@ \def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi} \def\note#1#2.{\par\penalty5000 \Y\noindent{\hangindent2\em\baselineskip10pt% - \eightrm#1~\ifpdf{\pdfnote#2.}\else#2\fi.\par}} + \eightrm#1~\ifacro{\pdfnote#2.}\else#2\fi.\par}} \newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD \newtoks\toksE \newtoks\toksF \newtoks\usersanitizer @@ -243,7 +244,7 @@ \newif\iftokprocessed \newif\ifTnum \newif\ifinstr {\def\\{\global\let\spacechar= }\\ } -\ifpdf % The following are pdf macros +\ifacro % The following are pdf macros \def\thewidth{\the\wd0 \space} \def\theheight{\the\ht\strutbox\space} \def\thedepth{\the\dp\strutbox\space} @@ -392,7 +393,7 @@ \def\stsec{\tenpoint\rightskip=0pt % get out of C mode (cf. \B) \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50 \noindent\strut{\let\*=\lapstar\bf\secno.\quad}% - \ifpdf \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty + \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty \ifpdftex \pdfdest num \secstar fith% \else \special{pdf: dest (\romannumeral\secstar) [ @thispage /FitH @ypos ]}\fi}}\fi} @@ -434,7 +435,7 @@ \outer\def\NN{\ifvoid\partialpage\leftfalse \else\ifdim\ht\partialpage<\pageht \lefttrue\else\leftfalse\fi\fi\NNN} \outer\def\NNN#1#2#3.{% beginning of starred section - \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi + \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi \gdepth=#1\gtitle={#3}\def\secno{#2}\xdef\secstar{#2} \ifleft \flushout \gdef\rlhead{\let\i=I\uppercase{\ignorespaces#3}} % running left headline @@ -476,7 +477,7 @@ \let\W=\land % logical and \def\X#1:#2\X{\ifmmode\gdef\XX{\null$\null}\else\gdef\XX{}\fi %$% section name \XX$\langle\,${\let\I=\ne#2\sevenrm\kern.5em - \ifpdf{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX} + \ifacro{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX} \def\Y{\par\yskip} \let\Z=\le \let\ZZ=\let % now you can \write the control sequence \ZZ @@ -608,7 +609,7 @@ {\obeylines\gdef\makeinref#1 #2 #3 {\ifsorted\else\ttoks={\[#1 #2 #3}\immediate\write\reffile{+ \the\ttoks}\fi % \hangindent=1em \noindent #2\miniform#3, %<== space! - \S\ifpdf{\pdfnote#1.}\else{#1}\fi.\par}} + \S\ifacro{\pdfnote#1.}\else{#1}\fi.\par}} {\obeylines\gdef\makeoutref#1 #2 #3 {\ifsorted\else\ttoks={\]#1 #2 #3}\immediate\write\reffile{+ \the\ttoks}\fi % \hangindent=1em \noindent #2\miniform#3, \extref#1.\par}} @@ -672,7 +673,7 @@ \immediate\write\cont{\catcode `\noexpand\@=12\relax} % \makeatother \immediate\closeout\cont % the contents information has been fully gathered \fi} -\def\fin{\ifpdf \message{Section names:} +\def\fin{\ifacro \message{Section names:} \def\U##1.{} \def\Us##1.{} \let\I=\relax \let\*=* \def\outsecname{Names of the sections} \ifpdftex \makebookmarks \countsections @@ -713,7 +714,7 @@ %\def\contentsline#1#2#3#4#5{\ifnum#2=0 \smallbreak\fi %\line{\consetup{#2}#1 %\rm\leaders\hbox to .5em{.\hfil}\hfil - %\ \ifpdf\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}} + %\ \ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}} %\def\consetup#1{\ifcase#1 \bf % depth -1 (@**) %\or % depth 0 (@*) %\or \hskip2em % depth 1 (@*1) diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog index 1ad750fb911..2602ea496dc 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,7 @@ +2023-05-15 Andreas Scherer <https://ascherer.github.io> + + * ctwill.man: CWEB 4.9 release. + 2023-03-09 Karl Berry <karl@tug.org> * TL'23 release. diff --git a/Build/source/texk/web2c/man/ctwill.man b/Build/source/texk/web2c/man/ctwill.man index ed7a3757cad..46b710a0f04 100644 --- a/Build/source/texk/web2c/man/ctwill.man +++ b/Build/source/texk/web2c/man/ctwill.man @@ -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.8). +This version is based on the most recent version of CWEB (4.9). .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. |