4 files changed, 47 insertions, 41 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index dbfba96a73d..3a23a67014f 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,9 @@
+2024-07-24  Andreas Scherer  <https://ascherer.github.io>
+
+	* cwebmac.tex,
+	* cwebman-w2c.ch,
+	* cwebman.tex: Recollect '\font' declarations.
+
 2024-07-23  Andreas Scherer  <https://ascherer.github.io>
 
 	* cwebman-w2c.ch,
diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex
index 99e899476ce..8685608528b 100644
--- a/Build/source/texk/web2c/cwebdir/cwebmac.tex
+++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex
@@ -12,15 +12,6 @@
 
 \font\ninerm=cmr9
 \let\mc=\ninerm % medium caps
-\def\CEE/{{\mc C\spacefactor1000}}
-\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
-\def\TEX/{\TeX}
-\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
-\def\Cee{\CEE/} % for backward compatibility
-\def\Cpp{\CPLUSPLUS/} % for backward compatibility
-\def\9#1{}
- % with this definition of \9 you can say @:sort key}{TeX code@>
- % to alphabetize an index entry by the sort key but format with the TeX code
 \font\eightrm=cmr8
 \let\sc=\eightrm % for smallish caps (NOT a caps-and-small-caps font)
 \let\mainfont=\tenrm
@@ -31,6 +22,16 @@
 \font\tentex=cmtex10 % TeX extended character set (used in strings)
 \fontdimen7\tentex=0pt % no double space after sentences
 
+\def\CEE/{{\mc C\spacefactor1000}}
+\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
+\def\TEX/{\TeX}
+\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
+\def\Cee{\CEE/} % for backward compatibility
+\def\Cpp{\CPLUSPLUS/} % for backward compatibility
+\def\9#1{}
+ % with this definition of \9 you can say @:sort key}{TeX code@>
+ % to alphabetize an index entry by the sort key but format with the TeX code
+
 \def\\#1{\leavevmode\hbox{\it#1\/\kern.05em}} % italic type for identifiers
 \def\|#1{\leavevmode\hbox{$#1$}} % one-letter identifiers look better this way
 \def\&#1{\leavevmode\hbox{\bf
diff --git a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch
index 30e21842f09..9e7bceb20e2 100644
--- a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch
@@ -33,7 +33,7 @@
   \advance\footnotecount by 1\relax}
 @z
 
-@x l.29
+@x l.28
 \outer\def\section #1.{\penalty-500\bigskip
         \centerline{\sectionfont\def\.##1{{\twelvett##1}} #1}\nobreak\vskip 6pt
         \everypar{\hskip-\parindent\everypar{}}}
@@ -93,21 +93,21 @@
   \fi}
 @z
 
-@x l.35
+@x l.34
 \def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.11)}
 @y
 \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
 \def\runninghead{{\ninett CWEB} USER MANUAL (Version 4.11 [\TeX~Live])}
 @z
 
-@x l.49
+@x l.48
 \vskip 18pt\centerline{(Version 4.11 --- December 2023)}
 @y
 \vskip 18pt\centerline{(Version 4.11 --- December 2023)%
 \footnote*{This document describes the extended \.{CWEB} (Version 4.11 [\TeX~Live]).}}
 @z
 
-@x l.80
+@x l.79
 Internet page \.{http://www-cs-faculty.stanford.edu/\char`\~knuth/cweb.html}
 @y
 Internet page
@@ -115,7 +115,7 @@ Internet page
           {http://www-cs-faculty.stanford.edu/\TILDE/knuth/cweb.html}
 @z
 
-@x l.85
+@x l.84
 \.{https://github.com/ascherer/cweb} with the really current news.
 @y
 \pdfURL{\.{https://github.com/ascherer/cweb}}%
@@ -123,7 +123,7 @@ Internet page
 with the really current news.
 @z
 
-@x l.103
+@x l.102
 should be sent to the \TeX-related mailing list \.{tex-k@tug.org}.
 @y
 should be sent to the \TeX-related mailing list
@@ -131,7 +131,7 @@ should be sent to the \TeX-related mailing list
    {mailto:tex-k@tug.org}.
 @z
 
-@x l.105
+@x l.104
 Readers who are familiar with Knuth's memo ``The \.{WEB} System of Structured
 Documentation'' will be able
 @y
@@ -139,7 +139,7 @@ Readers who are familiar with Knuth's memo ``\pdfURL{The \.{WEB} System of
 Structured Documentation}{../web/webman.pdf}'' will be able
 @z
 
-@x l.524
+@x l.523
 email address in a \.{CWEB} file (e.g., \.{tex-k@@tug.org}).
 @y
 email address in a \.{CWEB} file (e.g.,
@@ -147,7 +147,7 @@ email address in a \.{CWEB} file (e.g.,
    {mailto:tex-k@tug.org}).
 @z
 
-@x l.919
+@x l.918
 it cannot find them in the current directory.
 @y
 it cannot find them in the current directory.%
@@ -160,7 +160,7 @@ for it.
 (This is true for any other input or change file lookup.)}
 @z
 
-@x l.1026
+@x l.1025
 except for error messages.
 @y
 except for error messages.%
@@ -168,7 +168,7 @@ except for error messages.%
 options `\.{b}', `\.{h}', and `\.{p}' are `off' by default.}
 @z
 
-@x l.1032
+@x l.1031
 options are currently implemented:
 
 \yskip
@@ -202,7 +202,7 @@ argument to switch between different user languages and macro packages.
 \yskip
 @z
 
-@x l.1068
+@x l.1067
 \option x Include indexes and a table of contents in the \TEX/ file
 output by \.{CWEAVE}. (On by default.) (Has no effect on \.{CTANGLE}.)
 @y
@@ -212,14 +212,14 @@ output by \.{CWEAVE}. (On by default.) (\.{CWEAVE} only.)
 \vfill\eject
 @z
 
-@x l.1124
+@x l.1123
 Sometimes things don't work as smoothly, and you get a bunch of
 @y
 \pdffalse\acrohintfalse
 Sometimes things don't work as smoothly, and you get a bunch of
 @z
 
-@x l.1132
+@x l.1131
 `$\\{main}(\\{argc},\39\\{argv}{}$)'.
 @y
 `$\\{main}(\\{argc},\39\\{argv}{}$)'.
@@ -228,7 +228,7 @@ Sometimes things don't work as smoothly, and you get a bunch of
 \ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
 @z
 
-@x l.1142
+@x l.1141
 the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.
 @y
 the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.%
@@ -236,14 +236,14 @@ the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.%
 to suppress the extra space globally.}
 @z
 
-@x l.1144
+@x l.1143
 \section Hypertext and hyperdocumentation.
 @y
 \vfill\eject
 \section Hypertext and hyperdocumentation.
 @z
 
-@x l.1168
+@x l.1167
 from \.{https://hint.userweb.mwn.de/hint/hintview.html}.
 @y
 from
@@ -251,7 +251,7 @@ from
           {https://hint.userweb.mwn.de/hint/hintview.html}.%
 @z
 
-@x l.1177
+@x l.1176
 the program sources at \.{ftp://ftp.cs.stanford.edu/pub/ctwill}.
 @y
 the program sources at
@@ -261,13 +261,13 @@ the program sources at
 \.{ctwill} executable -- and its associated helpers -- out of the box.}
 @z
 
-@x l.1181
+@x l.1180
 As an example of a real program written in \.{CWEB}, Appendix~A
 @y
 As an example of a real program written in \.{CWEB}, \Appendix A
 @z
 
-@x l.1186
+@x l.1185
 Appendix B displays the files that set \TEX/ up to accept
 the output of \.{CWEAVE}, and Appendix~C discusses how to use some of those
 @y
@@ -275,7 +275,7 @@ the output of \.{CWEAVE}, and Appendix~C discusses how to use some of those
 the output of \.{CWEAVE}, and \Appendix C discusses how to use some of those
 @z
 
-@x l.1192
+@x l.1191
 appendices D, E, and~F, which exhibit the complete source code for
 \.{CTANGLE} and \.{CWEAVE}.
 
@@ -291,7 +291,7 @@ exhibits the source code for \.{CTWILL}, which is based on \.{CWEAVE}.}
 \vfill\eject\titletrue
 @z
 
-@x l.1198
+@x l.1197
 \section Appendix A: Excerpts from a \.{CWEB} Program.
 @y
 \def\subsections{4}
@@ -299,28 +299,28 @@ exhibits the source code for \.{CTWILL}, which is based on \.{CWEAVE}.}
 \subsection CWEB file format.
 @z
 
-@x l.1202
+@x l.1201
 generated sections 27--31 of the file \.{common.w}, which contains
 @y
 generated sections 27--31 of the file
 \pdfURL{\.{common.w}}{common.pdf}, which contains
 @z
 
-@x l.1273
+@x l.1272
 \def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CTANGLE}}
 @y
 \def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CTANGLE}}
 \subsection Translation by CTANGLE.
 @z
 
-@x l.1341
+@x l.1340
 \def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CWEAVE}}
 @y
 \def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CWEAVE}}
 \subsection Translation by CWEAVE.
 @z
 
-@x l.1430
+@x l.1429
 \def\runninghead{APPENDIX A --- FINAL DOCUMENT}
 
 And here's what the same excerpt looks like when typeset.
@@ -337,7 +337,7 @@ And here's what the same excerpt looks like when typeset.
 \def\C#1{\5\5\quad$\triangleright\,${\cmntfont#1}$\,\triangleleft$}
 @z
 
-@x l.1512
+@x l.1511
 \vfil\eject\titletrue
 @y
 \vfill\eject\titletrue
@@ -346,13 +346,13 @@ And here's what the same excerpt looks like when typeset.
 \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi
 @z
 
-@x l.1614
+@x l.1613
   \.{ { }\\vskip 15pt \\centerline\{(Version 4.11)\}{ }\\vfill\}}\cr}$$
 @y
   \.{ { }\\vskip 15pt \\centerline\{(Version 4.11)\}{ }\\vfill\}}\cr}$$
 @z
 
-@x l.1729
+@x l.1728
 if you have a duplex printer. Appendices D, E, and F of the complete
 version of this manual are printed using a commented-out option that
 substitutes `$\gets$' for `$=$' in the program listings. Looking at those
@@ -366,14 +366,14 @@ also make use of the alternative format for \CEE/ comments.}
 Looking at those
 @z
 
-@x l.1781
+@x l.1780
 \point 20. Furthermore, group titles can be converted to an arbitrary
 @y
 \vfill\eject
 \point 20. Furthermore, group titles can be converted to an arbitrary
 @z
 
-@x l.1792
+@x l.1791
 \bye
 @y
 \point 21. With modern \TeX\ engines like `\.{luatex}', `\.{pdftex}', and
diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex
index d47c46ff166..c4bc660df3b 100644
--- a/Build/source/texk/web2c/cwebdir/cwebman.tex
+++ b/Build/source/texk/web2c/cwebdir/cwebman.tex
@@ -7,7 +7,6 @@
 \parskip 0pt plus 1pt
 \def\RA{\char'31 } % right arrow
 \def\hang{\hangindent 4em\ignorespaces}
-\font\eightrm=cmr8
 \font\eighttt=cmtt8
 \font\ninett=cmtt9
 \font\twelvett=cmtt12