texlive[68901] Build/source/texk/web2c/cwebdir: [CWEB] Make
commits+ascherer at tug.org
commits+ascherer at tug.org
Sun Nov 19 17:35:51 CET 2023
Revision: 68901
https://tug.org/svn/texlive?view=revision&revision=68901
Author: ascherer
Date: 2023-11-19 17:35:51 +0100 (Sun, 19 Nov 2023)
Log Message:
-----------
[CWEB] Make 'k_section' block-local.
This merges sections 249 and 250 in CWEAVE.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch
trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
trunk/Build/source/texk/web2c/cwebdir/cweave.w
Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2023-11-19 16:03:33 UTC (rev 68900)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2023-11-19 16:35:51 UTC (rev 68901)
@@ -1,5 +1,13 @@
2023-11-19 Andreas Scherer <https://ascherer.github.io>
+ * ctwill-hint.ch,
+ * ctwill-mini.ch,
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch,
+ * cweave.w: Make 'k_section' block-local.
+
+2023-11-19 Andreas Scherer <https://ascherer.github.io>
+
* common.c,
* common.w,
* ctangle.c,
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch 2023-11-19 16:03:33 UTC (rev 68900)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-hint.ch 2023-11-19 16:35:51 UTC (rev 68901)
@@ -707,7 +707,7 @@
@-phase_three@>
@z
-Section 251.
+Section 250.
@x
@ A left-to-right radix sorting method is used, since this makes it easy to
@@ -716,7 +716,7 @@
@-c@>
@z
-Section 253.
+Section 252.
@x
@<Rest of |trans_plus| union@>=
@@ -726,7 +726,7 @@
@-k@>
@z
-Section 254.
+Section 253.
@x
@ @d depth cat /* reclaims memory that is no longer needed for parsing */
@@ -736,12 +736,12 @@
@-head@>
@-sort_ptr@>
@-max_sorts@>
-@$depth {CTWILL}254 =\\{cat}@>
-@$head {CTWILL}254 =\\{trans\_plus}.\\{Head}@>
-@$sort_ptr {CTWILL}254 =\\{scrap\_ptr}@>
+@$depth {CTWILL}253 =\\{cat}@>
+@$head {CTWILL}253 =\\{trans\_plus}.\\{Head}@>
+@$sort_ptr {CTWILL}253 =\\{scrap\_ptr}@>
@z
-Section 258.
+Section 257.
@x
@ Procedure |unbucket| goes through the buckets and adds nonempty lists
@@ -748,10 +748,10 @@
@y
@ Procedure |unbucket| goes through the buckets and adds nonempty lists
@-unbucket@>
-@$unbucket {CTWILL}258 \&{static} \&{void} (\,)@>
+@$unbucket {CTWILL}257 \&{static} \&{void} (\,)@>
@z
-Section 259.
+Section 258.
@x
@ @<Predecl...@>=@+static void unbucket(eight_bits);
@@ -760,7 +760,7 @@
@-unbucket@>
@z
-Section 261.
+Section 260.
@x
next_name=sort_ptr->head;
@@ -768,7 +768,7 @@
next_name=sort_ptr->head;@/
@z
-Section 262.
+Section 261.
@x
cur_name=sort_ptr->head;
@@ -776,7 +776,7 @@
cur_name=sort_ptr->head;@/
@z
-Section 268.
+Section 267.
@x
@ @<Predecl...@>=@+static void section_print(name_pointer);
@@ -785,7 +785,7 @@
@-section_print@>
@z
-Section 270.
+Section 269.
@x
puts(_("\nMemory usage statistics:"));
@@ -849,10 +849,10 @@
@t\5\5\5\5@>(long)max_scraps);
@z
-Section 272.
+Section 271.
@x
- at q Section 2->272. @>
+ at q Section 2->271. @>
@* {\tentex CTWILL} user manual.
@y
@* {\tentex CTWILL} user manual.
@@ -862,7 +862,7 @@
@-printf@>
@z
-Section 274.
+Section 273.
@x
static struct perm_meaning {
@@ -869,10 +869,10 @@
@y
static struct perm_meaning {
@-perm_meaning@>
-@$perm_meaning {CTWILL}274 \&{static} \&{struct}@>
+@$perm_meaning {CTWILL}273 \&{static} \&{struct}@>
@z
-Section 283.
+Section 282.
@x
@ @<Predec...@>=@+static boolean app_supp(text_pointer);
@@ -881,7 +881,7 @@
@-app_supp@>
@z
-Section 284.
+Section 283.
@x
@ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|,
@@ -892,10 +892,10 @@
@-c@>
@-l@>
@-make_ministring@>
-@$make_ministring {CTWILL}284 \&{static} \&{void} (\,)@>
+@$make_ministring {CTWILL}283 \&{static} \&{void} (\,)@>
@z
-Section 285.
+Section 284.
@x
@ @<Predec...@>=@+static void make_ministring(scrap_pointer);
@@ -904,7 +904,7 @@
@-make_ministring@>
@z
-Section 293.
+Section 292.
@x
@ @<Write the new meaning to the \.{.aux} file@>=
@@ -911,11 +911,11 @@
@y
@ @<Write the new meaning to the \.{.aux} file@>=
@%
-@$p {CTWILL}277 \&{name\_pointer}@>
-@$q {CTWILL}277 \&{struct perm\_meaning} ${}{*}{}$@>
+@$p {CTWILL}276 \&{name\_pointer}@>
+@$q {CTWILL}276 \&{struct perm\_meaning} ${}{*}{}$@>
@z
-Section 294.
+Section 293.
@x
@<Flag the usage of this identifier, for the mini-index@>=
@@ -925,7 +925,7 @@
@$p {CTWILL}202 \&{name\_pointer}@>
@z
-Section 297.
+Section 296.
@x
@ @<Predec...@>=@+static void out_mini(meaning_struct *);
@@ -934,7 +934,7 @@
@-out_mini@>
@z
-Section 300.
+Section 299.
@x
@ @<Predec...@>=@+static sixteen_bits title_lookup(void);
@@ -943,7 +943,7 @@
@-title_lookup@>
@z
-Section 303.
+Section 302.
@x
@d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */
@@ -950,10 +950,10 @@
@y
@d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */
@-indent_param_decl@>
-@$indent_param_decl {CTWILL}303 =\\{flags}[\.{'i'}]@>
+@$indent_param_decl {CTWILL}302 =\\{flags}[\.{'i'}]@>
@z
-Section 304.
+Section 303.
@x
@d order_decl_stmt flags['o'] /* should declarations and statements be separated? */
@@ -960,10 +960,10 @@
@y
@d order_decl_stmt flags['o'] /* should declarations and statements be separated? */
@-order_decl_stmt@>
-@$order_decl_stmt {CTWILL}304 =\\{flags}[\.{'o'}]@>
+@$order_decl_stmt {CTWILL}303 =\\{flags}[\.{'o'}]@>
@z
-Section 310.
+Section 309.
@x l.102 of CTWILL-TEXLIVE.CH
@d kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true)
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch 2023-11-19 16:03:33 UTC (rev 68900)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch 2023-11-19 16:35:51 UTC (rev 68901)
@@ -32,7 +32,7 @@
@x
A kind of ``user manual'' for \.{CTWILL} can be found in the appendix
-\X271:Mogrify \.{CWEAVE} into \.{CTWILL}\X~and beyond, together with
+\X270:Mogrify \.{CWEAVE} into \.{CTWILL}\X~and beyond, together with
additional material specific to \.{CTWILL}. % FIXME
Until then, \.{CWEAVE}'s sequence of sections will be preserved.
@@ -39,7 +39,7 @@
The ``banner line'' defined here should be changed whenever \.{CTWILL} is
@y
A kind of ``user manual'' for \.{CTWILL} can be found in section~%
-\X288:Mogrify {\tentex CWEAVE} into {\tentex CTWILL}\X~and beyond,
+\X287:Mogrify {\tentex CWEAVE} into {\tentex CTWILL}\X~and beyond,
together with additional material specific to \.{CTWILL}. % FIXME
\bigskip
{\font\itt=cmitt10 \font\bit=cmbxti10
@@ -1909,7 +1909,7 @@
@-phase_three@>
@z
-Section 268.
+Section 267.
@x
@ A left-to-right radix sorting method is used, since this makes it easy to
@@ -1918,8 +1918,15 @@
@-c@>
@z
-Section 270.
+ at x l.4596
+the |blink| array.
+ at y
+the |blink| array.
+\vadjust{\goodbreak}%
+ at z
+Section 269.
+
@x
@<Rest of |trans_plus| union@>=
@y
@@ -1928,7 +1935,7 @@
@-k@>
@z
-Section 271.
+Section 270.
@x
@ @d depth cat /* reclaims memory that is no longer needed for parsing */
@@ -1938,12 +1945,12 @@
@-head@>
@-sort_ptr@>
@-max_sorts@>
-@$depth {CTWILL}271 =\\{cat}@>
-@$head {CTWILL}271 =\\{trans\_plus}.\\{Head}@>
-@$sort_ptr {CTWILL}271 =\\{scrap\_ptr}@>
+@$depth {CTWILL}270 =\\{cat}@>
+@$head {CTWILL}270 =\\{trans\_plus}.\\{Head}@>
+@$sort_ptr {CTWILL}270 =\\{scrap\_ptr}@>
@z
-Section 273.
+Section 272.
@x
$|collate|[0]<|collate|[1]<\cdots<|collate|[100]$.
@@ -1951,7 +1958,7 @@
|collate[0]| ${}<{}$|collate[1]|${}<\cdots<{}$|collate[100]|.
@z
-Section 275.
+Section 274.
@x
@ Procedure |unbucket| goes through the buckets and adds nonempty lists
@@ -1958,10 +1965,10 @@
@y
@ Procedure |unbucket| goes through the buckets and adds nonempty lists
@-unbucket@>
-@$unbucket {CTWILL}275 \&{static} \&{void} (\,)@>
+@$unbucket {CTWILL}274 \&{static} \&{void} (\,)@>
@z
-Section 276.
+Section 275.
@x
@ @<Predecl...@>=@+static void unbucket(eight_bits);
@@ -1970,7 +1977,7 @@
@-unbucket@>
@z
-Section 278.
+Section 277.
@x
@ @<Split the list...@>= {
@@ -1982,7 +1989,7 @@
next_name=sort_ptr->head;@/
@z
-Section 279.
+Section 278.
@x
@ @<Output index...@>= {
@@ -1992,7 +1999,7 @@
cur_name=sort_ptr->head;@/
@z
-Section 281.
+Section 280.
@x
else {out_str("\\["); out_section(cur_val-def_flag); out(']');}
@@ -2000,7 +2007,7 @@
else {@+out_str("\\["); out_section(cur_val-def_flag); out(']');@+}
@z
-Section 285.
+Section 284.
@x
@ @<Predecl...@>=@+static void section_print(name_pointer);
@@ -2009,7 +2016,7 @@
@-section_print@>
@z
-Section 287.
+Section 286.
@x
puts(_("\nMemory usage statistics:"));
@@ -2073,7 +2080,7 @@
@t\5\5\5\5@>(long)max_scraps);
@z
-Section 288.
+Section 287.
@x
@** Mogrify {\tentex CWEAVE} into {\tentex CTWILL}. The following sections
@@ -2081,9 +2088,9 @@
Care has been taken to keep the original section numbering of \.{CWEAVE}
up to this point intact, so this new material should nicely integrate
-with the original ``\&{271.~Index}.''
+with the original ``\&{270.~Index}.''
- at q Section 2->272. @>
+ at q Section 2->271. @>
@* {\tentex CTWILL} user manual.
Here is a sort of user manual for \.{CTWILL}---which is exactly like
@y
@@ -2101,7 +2108,7 @@
@-x@>
@z
-Section 289--290.
+Section 288--289.
@x
The current meaning of every identifier is initially `\.{\\uninitialized}'.
@@ -2126,7 +2133,7 @@
@y
@z
-Section 292.
+Section 291.
@x
static struct perm_meaning {
@@ -2133,10 +2140,10 @@
@y
static struct perm_meaning {
@-perm_meaning@>
-@$perm_meaning {CTWILL}292 \&{static} \&{struct}@>
+@$perm_meaning {CTWILL}291 \&{static} \&{struct}@>
@z
-Section 301.
+Section 300.
@x
@ @<Predec...@>=@+static boolean app_supp(text_pointer);
@@ -2145,7 +2152,7 @@
@-app_supp@>
@z
-Section 302.
+Section 301.
@x
@ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|,
@@ -2156,10 +2163,10 @@
@-c@>
@-l@>
@-make_ministring@>
-@$make_ministring {CTWILL}302 \&{static} \&{void} (\,)@>
+@$make_ministring {CTWILL}301 \&{static} \&{void} (\,)@>
@z
-Section 303.
+Section 302.
@x
@ @<Predec...@>=@+static void make_ministring(scrap_pointer);
@@ -2168,7 +2175,7 @@
@-make_ministring@>
@z
-Section 306.
+Section 305.
@x
@ @<Append tokens for type |q|@>=
@@ -2182,7 +2189,7 @@
@|&& *(*r+1)=='{') app(**q); /* |struct_like| identifier */
@z
-Section 311.
+Section 310.
@x
@ @<Write the new meaning to the \.{.aux} file@>=
@@ -2189,11 +2196,11 @@
@y
@ @<Write the new meaning to the \.{.aux} file@>=
@%
-@$p {CTWILL}295 \&{name\_pointer}@>
-@$q {CTWILL}295 \&{struct perm\_meaning} ${}{*}{}$@>
+@$p {CTWILL}293 \&{name\_pointer}@>
+@$q {CTWILL}293 \&{struct perm\_meaning} ${}{*}{}$@>
@z
-Section 312.
+Section 311.
@x
@<Flag the usage of this identifier, for the mini-index@>=
@@ -2200,10 +2207,10 @@
@y
@<Flag the usage of this identifier, for the mini-index@>=
@%
-@$p {CTWILL}218 \&{name\_pointer}@>
+@$p {CTWILL}217 \&{name\_pointer}@>
@z
-Section 315.
+Section 314.
@x
@ @<Predec...@>=@+static void out_mini(meaning_struct *);
@@ -2212,7 +2219,7 @@
@-out_mini@>
@z
-Section 318.
+Section 317.
@x
@ @<Predec...@>=@+static sixteen_bits title_lookup(void);
@@ -2221,7 +2228,7 @@
@-title_lookup@>
@z
-Section 321.
+Section 320.
@x
@d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */
@@ -2228,10 +2235,10 @@
@y
@d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */
@-indent_param_decl@>
-@$indent_param_decl {CTWILL}321 =\\{flags}[\.{'i'}]@>
+@$indent_param_decl {CTWILL}320 =\\{flags}[\.{'i'}]@>
@z
-Section 322.
+Section 321.
@x
@d order_decl_stmt flags['o'] /* should declarations and statements be separated? */
@@ -2238,10 +2245,10 @@
@y
@d order_decl_stmt flags['o'] /* should declarations and statements be separated? */
@-order_decl_stmt@>
-@$order_decl_stmt {CTWILL}322 =\\{flags}[\.{'o'}]@>
+@$order_decl_stmt {CTWILL}321 =\\{flags}[\.{'o'}]@>
@z
-Section 328.
+Section 327.
@x l.102 of CTWILL-TEXLIVE.CH
@d kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true)
@@ -2250,7 +2257,7 @@
@-name@>
@z
-Section 330.
+Section 329.
@x
@** Index.
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch 2023-11-19 16:03:33 UTC (rev 68900)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch 2023-11-19 16:35:51 UTC (rev 68901)
@@ -94,7 +94,7 @@
reprinted in {\sl Digital Typography\/} (1999), 225--245.
A kind of ``user manual'' for \.{CTWILL} can be found in the appendix
-\X271:Mogrify \.{CWEAVE} into \.{CTWILL}\X~and beyond, together with
+\X270:Mogrify \.{CWEAVE} into \.{CTWILL}\X~and beyond, together with
additional material specific to \.{CTWILL}. % FIXME
Until then, \.{CWEAVE}'s sequence of sections will be preserved.
@@ -1154,16 +1154,9 @@
@x
the index section itself.
-@<Private...@>=
-static sixteen_bits k_section; /* runs through the sections */
- at y
-the index section itself---NOT!
- at z
-
- at x
-@ @<Tell about changed sections@>=
+@<Tell about changed sections@>=
/* remember that the index is already marked as changed */
-k_section=0;
+sixteen_bits k_section=0; /* runs through the sections */
while (!changed_section[++k_section]);
out_str("\\ch ");
@.\\ch@>
@@ -1174,7 +1167,7 @@
}
out('.');
@y
-@ No need to tell about changed sections.
+the index section itself---NOT!
@z
@x
@@ -1280,15 +1273,15 @@
@x
@** Index.
@y
- at q Section 271. @>
+ at q Section 270. @>
@** Mogrify {\tentex CWEAVE} into {\tentex CTWILL}. The following sections
introduce material that is specific to \.{CTWILL}.
Care has been taken to keep the original section numbering of \.{CWEAVE}
up to this point intact, so this new material should nicely integrate
-with the original ``\&{271.~Index}.''
+with the original ``\&{270.~Index}.''
- at q Section 2->272. @>
+ at q Section 2->271. @>
@* {\tentex CTWILL} user manual.
Here is a sort of user manual for \.{CTWILL}---which is exactly like
\.{CWEAVE} except that it produces much better documentation, for which you
@@ -1449,7 +1442,7 @@
@d max_tex_chars 80 /* limit on the \TeX\ part of a meaning */
- at q Section 25->273. @>
+ at q Section 25->272. @>
@* Temporary and permanent meanings.
\.{CTWILL} has special data structures to keep track of current
and temporary meanings. These structures were not designed for maximum
@@ -1467,7 +1460,7 @@
char tex_part[max_tex_chars]; /* \TeX\ part of meaning */
} meaning_struct;
- at q Section 26->274. @>
+ at q Section 26->273. @>
@ @<Private...@>=
static struct perm_meaning {
meaning_struct perm; /* current meaning of an identifier */
@@ -1490,16 +1483,16 @@
static char *ministring_ptr; /* first available slot in |ministring_buf| */
static boolean ms_mode; /* are we outputting to |ministring_buf|? */
- at q Section 27->275. @>
+ at q Section 27->274. @>
@ @<Set init...@>=
max_temp_meaning_ptr=temp_meaning_stack;
title_code_ptr=title_code;
ms_mode=false;
- at q Section 276. @>
+ at q Section 275. @>
@ @<Predec...@>=@+static void new_meaning(name_pointer);
- at q Section 30->277. @>
+ at q Section 30->276. @>
@ The |new_meaning| routine changes the current ``permanent meaning''
when an identifier is redeclared. It gets the |tex_part| from
|ministring_buf|.
@@ -1523,7 +1516,7 @@
@<Write the new meaning to the \.{.aux} file@>@;
}
- at q Section 75->278. @>
+ at q Section 75->277. @>
@ @<Process a user-generated meaning@>=
{ char *first=id_first;
while (xisspace(*first)) first++;
@@ -1544,7 +1537,7 @@
loc=id_loc+2;
}
- at q Section 76->279. @>
+ at q Section 76->278. @>
@ @<Suppress mini-index entry@>=
{ char *first=id_first,*last=id_loc;
while (xisspace(*first)) first++;
@@ -1555,7 +1548,7 @@
}
}
- at q Section 77->280. @>
+ at q Section 77->279. @>
@ @<Digest...@>=
{ meaning_struct *m;
struct perm_meaning *q=get_meaning(p);
@@ -1578,7 +1571,7 @@
}
}
- at q Section 141->281/2. @>
+ at q Section 141->280/1. @>
@* Make ministrings.
\.{CTWILL} needs the following procedure, which appends tokens of a
translated text until coming to |tok_loc|, then suppresses text that may
@@ -1608,10 +1601,10 @@
catch14: return *(*(p+1)-1)=='9'; /* was production 14 used? */
}
- at q Section 283. @>
+ at q Section 282. @>
@ @<Predec...@>=@+static boolean app_supp(text_pointer);
- at q Section 142->284. @>
+ at q Section 142->283. @>
@ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|,
with offset $l\in\{0,1,2\}$, which tries to figure out a symbolic form of
definition after |make_underlined(pp+l)| has been called. We rely heavily
@@ -1639,14 +1632,14 @@
cur_mathness=maybe_math; /* restore it */
}
- at q Section 285. @>
+ at q Section 284. @>
@ @<Predec...@>=@+static void make_ministring(scrap_pointer);
- at q Section 43->286. @>
+ at q Section 43->285. @>
@ @<Private...@>=
static sixteen_bits int_loc, ext_loc; /* locations of special reserved words */
- at q Section 143->287. @>
+ at q Section 143->286. @>
@ Here we use the fact that a |decl_head| comes from |int_like| only in
production~27, whose translation is fairly easy to recognize. (Well,
production 28 has been added for \CPLUSPLUS/, but we hope that doesn't
@@ -1687,7 +1680,7 @@
@<Append tokens for type |q|@>@;
}
- at q Section 144->288. @>
+ at q Section 144->287. @>
@ @<Append tokens for type |q|@>=
cur_mathness=no_math; /* it was |maybe_math| */
if (*(q+1)==*q+8 && *(*q+1)==' ' && *(*q+3)==' ') {
@@ -1699,13 +1692,13 @@
big_app('{');@+app('*');@+app('}');@+ast_count--;
}
- at q Section 253->289. @>
+ at q Section 253->288. @>
@ @<Private...@>=
static boolean is_macro; /* it's a macro def, not a format def */
static boolean def_diff; /* |false| iff the current macro has parameters */
static name_pointer id_being_defined; /* the definee */
- at q Section 257->290. @>
+ at q Section 257->289. @>
@ @<Make ministring for a new macro@>=
{
ms_mode=true; ministring_ptr=ministring_buf;
@@ -1723,7 +1716,7 @@
new_meaning(id_being_defined);
}
- at q Section 246->291. @>
+ at q Section 246->290. @>
@* Process {\tentex .aux} files.
@<Private...@>=
@@ -1730,7 +1723,7 @@
static FILE *aux_file;
static char aux_file_name[max_file_name_length]; /* name of \.{.aux} file */
- at q Section 247->292. @>
+ at q Section 247->291. @>
@ @<Read the \.{.aux} file, if present; then open it for output@>=
memcpy(aux_file_name,tex_file_name,strlen(tex_file_name)-4);
strcat(aux_file_name,".bux");
@@ -1759,7 +1752,7 @@
if ((aux_file=fopen(aux_file_name,"wb"))==NULL)
fatal(_("! Cannot open aux output file "),aux_file_name);
- at q Section 31->293. @>
+ at q Section 31->292. @>
@ @<Write the new meaning to the \.{.aux} file@>=
{@+int n=q->perm.prog_no;
ms_mode=false;@/
@@ -1770,7 +1763,7 @@
fprintf(aux_file," %s@@>\n",q->perm.tex_part);
}
- at q Section 268->294. @>
+ at q Section 268->293. @>
@* Usage of identifiers.
The following code is performed for each identifier parsed during
a section. Variable |top_usage| is always nonzero; it has the sentinel
@@ -1789,7 +1782,7 @@
}
}
- at q Section 269->295. @>
+ at q Section 269->294. @>
@ @<Output information about usage of id's defined in other sections@>=
{ struct perm_meaning *q;
while (temp_meaning_ptr>temp_meaning_stack) {
@@ -1805,7 +1798,7 @@
}
}
- at q Section 270->296. @>
+ at q Section 270->295. @>
@ @c static void
out_mini(
meaning_struct *m)
@@ -1824,10 +1817,10 @@
out(' '); out_str(m->tex_part); finish_line();
}
- at q Section 271->297. @>
+ at q Section 270->296. @>
@ @<Predec...@>=@+static void out_mini(meaning_struct *);
- at q Section 272->298. @>
+ at q Section 271->297. @>
@ Compare this code with section |@<Output the name...@>|.
@<Mini-output...@>=
@@ -1862,7 +1855,7 @@
out_name(cur_name,true);
name_done:@;
- at q Section 28->299. @>
+ at q Section 28->298. @>
@* Handle program title.
Here's a routine that converts a program title from the buffer
into an internal number for the |prog_no| field of a meaning.
@@ -1892,10 +1885,10 @@
return p-title_code;
}
- at q Section 300. @>
+ at q Section 299. @>
@ @<Predec...@>=@+static sixteen_bits title_lookup(void);
- at q Section 29->301. @>
+ at q Section 29->300. @>
@ @<Give a default title to the program, if necessary@>=
if (title_code_ptr==title_code) { /* no \.{\\def\\title} found in limbo */
char *saveloc=loc,*savelimit=limit; /* save */
@@ -1908,7 +1901,7 @@
loc=saveloc; limit=savelimit; /* restore */
}
- at q Section 302. @>
+ at q Section 301. @>
@** Extensions to {\tentex CWEB}. The following sections introduce new or
improved features that have been created by numerous contributors over the
course of a quarter century.
Modified: trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch 2023-11-19 16:03:33 UTC (rev 68900)
+++ trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch 2023-11-19 16:35:51 UTC (rev 68901)
@@ -603,7 +603,7 @@
course of a quarter century.
Care has been taken to keep the original section numbering intact, so this new
-material should nicely integrate with the original ``\&{271.~Index}.''
+material should nicely integrate with the original ``\&{270.~Index}.''
@* Formatting alternatives.
\.{CWEAVE} indents declarations after old-style function definitions and
Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w 2023-11-19 16:03:33 UTC (rev 68900)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w 2023-11-19 16:35:51 UTC (rev 68901)
@@ -4573,12 +4573,9 @@
@ Just before the index comes a list of all the changed sections, including
the index section itself.
-@<Private...@>=
-static sixteen_bits k_section; /* runs through the sections */
-
-@ @<Tell about changed sections@>=
+@<Tell about changed sections@>=
/* remember that the index is already marked as changed */
-k_section=0;
+sixteen_bits k_section=0; /* runs through the sections */
while (!changed_section[++k_section]);
out_str("\\ch ");
@.\\ch@>
More information about the tex-live-commits
mailing list.