pdftex[934] branches/stable/source/src/texk/web2c: sync from tl 71901

commits+karl at tug.org commits+karl at tug.org
Fri Jul 26 18:51:39 CEST 2024 

Revision: 934
          https://tug.org/svn/pdftex?view=revision&revision=934
Author:   karl
Date:     2024-07-26 18:51:39 +0200 (Fri, 26 Jul 2024)
Log Message:
-----------
sync from tl 71901

Modified Paths:
--------------
    branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
    branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
    branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
    branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
    branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
    branches/stable/source/src/texk/web2c/pdftexdir/pdftex.ch

Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2024-07-21 17:12:46 UTC (rev 933)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog	2024-07-26 16:51:39 UTC (rev 934)
@@ -1,3 +1,27 @@
+2024-07-26  Andreas Scherer  <https://ascherer.github.io>
+
+	* cwebmac.tex: Reshuffle '\note' macro.
+
+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,
+	* cwebman.tex: Adjust typewriter font size in page headers.
+
+2024-07-23  Andreas Scherer  <https://ascherer.github.io>
+
+	* cwebman.tex: Purge header for Appendix C.
+
+2024-07-22  Andreas Scherer  <https://ascherer.github.io>
+
+	* cwebman-w2c.ch,
+	* cwebman.tex: Purge unused '\font's.
+
 2024-07-17  Andreas Scherer  <https://ascherer.github.io>
 
 	* twinx.ch: Compile CWEB with G++-14.

Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex	2024-07-21 17:12:46 UTC (rev 933)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex	2024-07-26 16:51:39 UTC (rev 934)
@@ -1,5 +1,5 @@
 % standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.12 --- May 2024
+% Version 4.12 --- July 2024
 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
 \xdef\fmtversion{\fmtversion+CWEB4.12}
 \chardef\cwebversion=4 \chardef\cwebrevision=12
@@ -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
@@ -112,8 +113,6 @@
 \let\yskip=\smallskip
 \def\?{\mathrel?}
 \def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi}
-\def\note#1#2.{\Y\noindent{\hangindent2em%
-    \baselineskip10pt\eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}}
 
 \newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
 \newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
@@ -159,6 +158,8 @@
       [ @thispage /FitH @ypos ]}\fi}}\fi}
 \let\startsection=\stsec
 \def\defin#1{\global\advance\ind by 2 \1\&{#1 }} % begin `define' or `format'
+\def\note#1#2.{\Y\noindent{\hangindent2em\baselineskip10pt%
+  \eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}}
 \def\A{\note{See also section}} % xref for doubly defined section name
 \def\As{\note{See also sections}} % xref for multiply defined section name
 \def\B{\rightskip=0pt plus 100pt minus 10pt % go into C mode

Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch	2024-07-21 17:12:46 UTC (rev 933)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch	2024-07-26 16:51:39 UTC (rev 934)
@@ -33,7 +33,7 @@
   \advance\footnotecount by 1\relax}
 @z
 
- at x l.32
+ at 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,14 +93,14 @@
   \fi}
 @z
 
- at x l.38
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.11)}
+ at x l.34
+\def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.11)}
 @y
 \def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
-\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.11 [\TeX~Live])}
+\def\runninghead{{\ninett CWEB} USER MANUAL (Version 4.11 [\TeX~Live])}
 @z
 
- at x l.52
+ at x l.48
 \vskip 18pt\centerline{(Version 4.11 --- December 2023)}
 @y
 \vskip 18pt\centerline{(Version 4.11 --- December 2023)%
@@ -107,7 +107,7 @@
 \footnote*{This document describes the extended \.{CWEB} (Version 4.11 [\TeX~Live]).}}
 @z
 
- at x l.83
+ at x l.79
 Internet page \.{http://www-cs-faculty.stanford.edu/\char`\~knuth/cweb.html}
 @y
 Internet page
@@ -115,7 +115,7 @@
           {http://www-cs-faculty.stanford.edu/\TILDE/knuth/cweb.html}
 @z
 
- at x l.88
+ at x l.84
 \.{https://github.com/ascherer/cweb} with the really current news.
 @y
 \pdfURL{\.{https://github.com/ascherer/cweb}}%
@@ -123,7 +123,7 @@
 with the really current news.
 @z
 
- at x l.106
+ at x l.102
 should be sent to the \TeX-related mailing list \.{tex-k at tug.org}.
 @y
 should be sent to the \TeX-related mailing list
@@ -131,7 +131,7 @@
    {mailto:tex-k at tug.org}.
 @z
 
- at x l.108
+ at 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 @@
 Structured Documentation}{../web/webman.pdf}'' will be able
 @z
 
- at x l.527
+ at 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 @@
    {mailto:tex-k at tug.org}).
 @z
 
- at x l.922
+ at x l.918
 it cannot find them in the current directory.
 @y
 it cannot find them in the current directory.%
@@ -160,7 +160,7 @@
 (This is true for any other input or change file lookup.)}
 @z
 
- at x l.1029
+ at x l.1025
 except for error messages.
 @y
 except for error messages.%
@@ -168,7 +168,7 @@
 options `\.{b}', `\.{h}', and `\.{p}' are `off' by default.}
 @z
 
- at x l.1035
+ at x l.1031
 options are currently implemented:
 
 \yskip
@@ -202,15 +202,17 @@
 \yskip
 @z
 
- at x l.1071
+ at 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
 \option x Include indexes and a table of contents in the \TEX/ file
 output by \.{CWEAVE}. (On by default.) (\.{CWEAVE} only.)
+
+\vfill\eject
 @z
 
- at x l.1127
+ at x l.1123
 Sometimes things don't work as smoothly, and you get a bunch of
 @y
 \pdffalse\acrohintfalse
@@ -217,7 +219,7 @@
 Sometimes things don't work as smoothly, and you get a bunch of
 @z
 
- at x l.1135
+ at x l.1131
 `$\\{main}(\\{argc},\39\\{argv}{}$)'.
 @y
 `$\\{main}(\\{argc},\39\\{argv}{}$)'.
@@ -226,7 +228,7 @@
 \ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
 @z
 
- at x l.1145
+ at x l.1141
 the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.
 @y
 the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.%
@@ -234,7 +236,7 @@
 to suppress the extra space globally.}
 @z
 
- at x l.1147
+ at x l.1143
 \section Hypertext and hyperdocumentation.
 @y
 \vfill\eject
@@ -241,7 +243,7 @@
 \section Hypertext and hyperdocumentation.
 @z
 
- at x l.1171
+ at x l.1167
 from \.{https://hint.userweb.mwn.de/hint/hintview.html}.
 @y
 from
@@ -249,7 +251,7 @@
           {https://hint.userweb.mwn.de/hint/hintview.html}.%
 @z
 
- at x l.1180
+ at x l.1176
 the program sources at \.{ftp://ftp.cs.stanford.edu/pub/ctwill}.
 @y
 the program sources at
@@ -259,13 +261,13 @@
 \.{ctwill} executable -- and its associated helpers -- out of the box.}
 @z
 
- at x l.1184
+ at 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
 
- at x l.1189
+ at 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
@@ -273,7 +275,7 @@
 the output of \.{CWEAVE}, and \Appendix C discusses how to use some of those
 @z
 
- at x l.1195
+ at x l.1191
 appendices D, E, and~F, which exhibit the complete source code for
 \.{CTANGLE} and \.{CWEAVE}.
 
@@ -286,10 +288,10 @@
 code for \.{COMMON}, and the additional \pdfURL{Appendix~G}{ctwill.pdf}
 exhibits the source code for \.{CTWILL}, which is based on \.{CWEAVE}.}
 
-\eject\titletrue
+\vfill\eject\titletrue
 @z
 
- at x l.1201
+ at x l.1197
 \section Appendix A: Excerpts from a \.{CWEB} Program.
 @y
 \def\subsections{4}
@@ -297,7 +299,7 @@
 \subsection CWEB file format.
 @z
 
- at x l.1205
+ at x l.1201
 generated sections 27--31 of the file \.{common.w}, which contains
 @y
 generated sections 27--31 of the file
@@ -304,21 +306,21 @@
 \pdfURL{\.{common.w}}{common.pdf}, which contains
 @z
 
- at x l.1276
-\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CTANGLE}}
+ at x l.1272
+\def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CTANGLE}}
 @y
-\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CTANGLE}}
+\def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CTANGLE}}
 \subsection Translation by CTANGLE.
 @z
 
- at x l.1344
-\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
+ at x l.1340
+\def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CWEAVE}}
 @y
-\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
+\def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CWEAVE}}
 \subsection Translation by CWEAVE.
 @z
 
- at x l.1433
+ at x l.1429
 \def\runninghead{APPENDIX A --- FINAL DOCUMENT}
 
 And here's what the same excerpt looks like when typeset.
@@ -335,22 +337,22 @@
 \def\C#1{\5\5\quad$\triangleright\,${\cmntfont#1}$\,\triangleleft$}
 @z
 
- at x l.1515
+ at x l.1511
 \vfil\eject\titletrue
 @y
-\vfil\eject\titletrue
+\vfill\eject\titletrue
 \ifx\pdf+\pdftrue\fi \ifxetex\pdftrue\fi
 \ifpdflua\ifnum\pdfoutput>0 \pdftrue\fi\fi
 \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi
 @z
 
- at x l.1617
+ at x l.1613
   \.{ { }\\vskip 15pt \\centerline\{(Version 4.11)\}{ }\\vfill\}}\cr}$$
 @y
   \.{ { }\\vskip 15pt \\centerline\{(Version 4.11)\}{ }\\vfill\}}\cr}$$
 @z
 
- at x l.1732
+ at 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
@@ -364,7 +366,7 @@
 Looking at those
 @z
 
- at x l.1784
+ at x l.1780
 \point 20. Furthermore, group titles can be converted to an arbitrary
 @y
 \vfill\eject
@@ -371,8 +373,8 @@
 \point 20. Furthermore, group titles can be converted to an arbitrary
 @z
 
- at x l.1796
-\vfill\end
+ at x l.1791
+\bye
 @y
 \point 21. With modern \TeX\ engines like `\.{luatex}', `\.{pdftex}', and
 `\.{xetex}' (but \\{not} with classic `\.{tex}') you can say `\.{\\input
@@ -379,7 +381,5 @@
 pdfwebtocfront}' as the last command in the limbo section and run \TeX\
 \\{twice} on your woven \.{CWEB} document, in order to shift the
 table-of-contents to the front of the {\mc PDF} output.
-
-\vfill\end
+\bye
 @z
-

Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex	2024-07-21 17:12:46 UTC (rev 933)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex	2024-07-26 16:51:39 UTC (rev 934)
@@ -7,13 +7,9 @@
 \parskip 0pt plus 1pt
 \def\RA{\char'31 } % right arrow
 \def\hang{\hangindent 4em\ignorespaces}
-\font\eightrm=cmr8
-\font\ninerm=cmr9
+\font\eighttt=cmtt8
 \font\ninett=cmtt9
-\font\eighttt=cmtt8
 \font\twelvett=cmtt12
-\font\quoterm=cmssq8
-\font\quoteit=cmssqi8
 \font\authorfont=cmr12
 \font\sectionfont=cmbx12
 
@@ -35,7 +31,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.11)}
+\def\runninghead{{\ninett CWEB} USER MANUAL (VERSION 4.11)}
 
 % This verbatim mode assumes that ! marks are !! in the text being copied.
 \def\verbatim{\begingroup
@@ -1197,7 +1193,7 @@
 
 \vfil\eject\titletrue
 
-\def\runninghead{APPENDIX A --- {\tentt CWEB} FILE FORMAT}
+\def\runninghead{APPENDIX A --- {\ninett CWEB} FILE FORMAT}
 \section Appendix A: Excerpts from a \.{CWEB} Program.
 
 This appendix consists
@@ -1271,9 +1267,9 @@
 strncpy(change_buffer,buffer,(size_t)(limit-buffer+1));
 !endgroup
 \endgroup
-\vfill\eject
+\vfil\eject
 
-\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CTANGLE}}
+\def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CTANGLE}}
 
 Here's the portion of the \CEE/ code generated by \.{CTANGLE} that corresponds
 to the source on the preceding page.  Notice that sections~29, 30 and~31
@@ -1339,9 +1335,9 @@
 #line 296 "common.w"
 !endgroup
 \endgroup
-\vfill\eject
+\vfil\eject
 
-\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
+\def\runninghead{APPENDIX A --- TRANSLATION BY {\ninett CWEAVE}}
 
 Here is the corresponding excerpt from \.{common.tex}.
 \ifhint\relax\else(Code for section 31 is omitted for space reasons.)\fi
@@ -1538,7 +1534,7 @@
 \vskip6pt \baselineskip9pt
 \printmacs{acro}
 \endgroup
-\vfill\eject
+\vfil\eject\titletrue
 
 \def\runninghead{APPENDIX C --- NOTES ON FORMATTING}
 \section Appendix C: How to use \.{CWEB} macros.
@@ -1792,6 +1788,4 @@
 `Chinese foo'. The corresponding bookmark is, however, `\.{Chinese} \.{bar}'.
 And the corresponding \.{.toc} file entry is
 `\.{\\ZZ \{Chinese \\klujj bar\\\\\}\{1\}\{1\}\{1\}\{Chinese bar\}}'.
-
-\vfill\end
-
+\bye

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2024-07-21 17:12:46 UTC (rev 933)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2024-07-26 16:51:39 UTC (rev 934)
@@ -1,3 +1,7 @@
+2024-07-26  Andreas Scherer  <https://ascherer.github.io>
+
+	* pdftex.ch: Prepare for compilation with gcc-14.
+
 2024-05-24  Thanh Han The  <hanthethanh at gmail.com>
 
 	* pdftex.web (pdf_ptex_use_underscore_code),
@@ -5,7 +9,7 @@
 	(Put each ...): define it.
 	(print_param): print it.
 	(get_ptex_use_underscore): new fn to implement it.
-        (pdf_print_info): adjust Fullbanner prefix character.
+	(pdf_print_info): adjust Fullbanner prefix character.
 	* pdftoepdf.cc (getptexuseunderscore): declare fn.
 	(write_epdf): use it for FileName, PageNumber, InfoDict.
 

Modified: branches/stable/source/src/texk/web2c/pdftexdir/pdftex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/pdftex.ch	2024-07-21 17:12:46 UTC (rev 933)
+++ branches/stable/source/src/texk/web2c/pdftexdir/pdftex.ch	2024-07-26 16:51:39 UTC (rev 934)
@@ -179,7 +179,7 @@
 pdf_font_attr:=xmalloc_array(str_number, font_max);
 pdf_font_blink:=xmalloc_array(internal_font_number, font_max);
 pdf_font_elink:=xmalloc_array(internal_font_number, font_max);
-pdf_font_has_space_char:=xmalloc_array(internal_font_number, font_max);
+pdf_font_has_space_char:=xmalloc_array(boolean, font_max);
 pdf_font_stretch:=xmalloc_array(integer, font_max);
 pdf_font_shrink:=xmalloc_array(integer, font_max);
 pdf_font_step:=xmalloc_array(integer, font_max);
@@ -298,7 +298,7 @@
 pdf_font_attr:=xmalloc_array(str_number,font_max);
 pdf_font_blink:=xmalloc_array(internal_font_number,font_max);
 pdf_font_elink:=xmalloc_array(internal_font_number,font_max);
-pdf_font_has_space_char:=xmalloc_array(internal_font_number,font_max);
+pdf_font_has_space_char:=xmalloc_array(boolean,font_max);
 pdf_font_stretch:=xmalloc_array(integer,font_max);
 pdf_font_shrink:=xmalloc_array(integer,font_max);
 pdf_font_step:=xmalloc_array(integer,font_max);

More information about the pdftex-commits mailing list.