diff options
Diffstat (limited to 'Build/source/texk/web2c/cwebdir')
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 8 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-hint.ch | 64 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-mini.ch | 89 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/ctwill-w2c.ch | 79 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/cweav-w2c.ch | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/cwebdir/cweave.w | 7 |
6 files changed, 127 insertions, 122 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 437c2b6e755..0bb9d9bb58c 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -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, diff --git a/Build/source/texk/web2c/cwebdir/ctwill-hint.ch b/Build/source/texk/web2c/cwebdir/ctwill-hint.ch index 59366ed8c13..f78891cd858 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-hint.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-hint.ch @@ -707,7 +707,7 @@ Section 248. @-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 @@ Section 251. @-c@> @z -Section 253. +Section 252. @x @<Rest of |trans_plus| union@>= @@ -726,7 +726,7 @@ Section 253. @-k@> @z -Section 254. +Section 253. @x @ @d depth cat /* reclaims memory that is no longer needed for parsing */ @@ -736,22 +736,22 @@ Section 254. @-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 @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 @@ Section 259. @-unbucket@> @z -Section 261. +Section 260. @x next_name=sort_ptr->head; @@ -768,7 +768,7 @@ Section 261. next_name=sort_ptr->head;@/ @z -Section 262. +Section 261. @x cur_name=sort_ptr->head; @@ -776,7 +776,7 @@ Section 262. cur_name=sort_ptr->head;@/ @z -Section 268. +Section 267. @x @ @<Predecl...@>=@+static void section_print(name_pointer); @@ -785,7 +785,7 @@ Section 268. @-section_print@> @z -Section 270. +Section 269. @x puts(_("\nMemory usage statistics:")); @@ -849,10 +849,10 @@ Section 270. @t\5\5\5\5@>(long)max_scraps); @z -Section 272. +Section 271. @x -@q Section 2->272. @> +@q Section 2->271. @> @* {\tentex CTWILL} user manual. @y @* {\tentex CTWILL} user manual. @@ -862,17 +862,17 @@ Section 272. @-printf@> @z -Section 274. +Section 273. @x static struct perm_meaning { @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 @@ Section 283. @-app_supp@> @z -Section 284. +Section 283. @x @ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|, @@ -892,10 +892,10 @@ Section 284. @-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,18 +904,18 @@ Section 285. @-make_ministring@> @z -Section 293. +Section 292. @x @ @<Write the new meaning to the \.{.aux} file@>= @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 @@ Section 294. @$p {CTWILL}202 \&{name\_pointer}@> @z -Section 297. +Section 296. @x @ @<Predec...@>=@+static void out_mini(meaning_struct *); @@ -934,7 +934,7 @@ Section 297. @-out_mini@> @z -Section 300. +Section 299. @x @ @<Predec...@>=@+static sixteen_bits title_lookup(void); @@ -943,27 +943,27 @@ Section 300. @-title_lookup@> @z -Section 303. +Section 302. @x @d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */ @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? */ @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) diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch index d08f0c6b8d3..7de0573f3e2 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch @@ -32,14 +32,14 @@ Section 1. @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. 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 @@ Section 265. @-phase_three@> @z -Section 268. +Section 267. @x @ A left-to-right radix sorting method is used, since this makes it easy to @@ -1918,7 +1918,14 @@ Section 268. @-c@> @z -Section 270. +@x l.4596 +the |blink| array. +@y +the |blink| array. +\vadjust{\goodbreak}% +@z + +Section 269. @x @<Rest of |trans_plus| union@>= @@ -1928,7 +1935,7 @@ Section 270. @-k@> @z -Section 271. +Section 270. @x @ @d depth cat /* reclaims memory that is no longer needed for parsing */ @@ -1938,12 +1945,12 @@ Section 271. @-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,17 +1958,17 @@ $|collate|[0]<|collate|[1]<\cdots<|collate|[100]$. |collate[0]| ${}<{}$|collate[1]|${}<\cdots<{}$|collate[100]|. @z -Section 275. +Section 274. @x @ Procedure |unbucket| goes through the buckets and adds nonempty lists @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 @@ Section 276. @-unbucket@> @z -Section 278. +Section 277. @x @ @<Split the list...@>= { @@ -1982,7 +1989,7 @@ Section 278. next_name=sort_ptr->head;@/ @z -Section 279. +Section 278. @x @ @<Output index...@>= { @@ -1992,7 +1999,7 @@ Section 279. 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 @@ Section 281. 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 285. @-section_print@> @z -Section 287. +Section 286. @x puts(_("\nMemory usage statistics:")); @@ -2073,7 +2080,7 @@ Section 287. @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 @@ 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}.'' -@q Section 2->272. @> +@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 @@ give it the necessary hints in other places via your change file. @-x@> @z -Section 289--290. +Section 288--289. @x The current meaning of every identifier is initially `\.{\\uninitialized}'. @@ -2126,17 +2133,17 @@ must have fewer than 80 characters. @y @z -Section 292. +Section 291. @x static struct perm_meaning { @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 @@ Section 301. @-app_supp@> @z -Section 302. +Section 301. @x @ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|, @@ -2156,10 +2163,10 @@ Section 302. @-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 @@ Section 303. @-make_ministring@> @z -Section 306. +Section 305. @x @ @<Append tokens for type |q|@>= @@ -2182,28 +2189,28 @@ Section 306. @|&& *(*r+1)=='{') app(**q); /* |struct_like| identifier */ @z -Section 311. +Section 310. @x @ @<Write the new meaning to the \.{.aux} file@>= @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@>= @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 @@ Section 315. @-out_mini@> @z -Section 318. +Section 317. @x @ @<Predec...@>=@+static sixteen_bits title_lookup(void); @@ -2221,27 +2228,27 @@ Section 318. @-title_lookup@> @z -Section 321. +Section 320. @x @d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */ @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? */ @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 @@ Section 328. @-name@> @z -Section 330. +Section 329. @x @** Index. diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch index 40e571d0d55..358bfa62640 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch @@ -94,7 +94,7 @@ can be found in Knuth's article ``Mini-indexes for literate programs,'' 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 @@ if (check_for_change) @<Update the result when it has changed@>@; @x the index section itself. -@<Private...@>= -static sixteen_bits k_section; /* runs through the sections */ -@y -the index section itself---NOT! -@z - -@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 @@ while (k_section<section_count) { } out('.'); @y -@ No need to tell about changed sections. +the index section itself---NOT! @z @x @@ -1280,15 +1273,15 @@ out_name(cur_name,proofing); @x @** Index. @y -@q Section 271. @> +@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}.'' -@q Section 2->272. @> +@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 @@ which are quite different from the change files you set up for tangling. @d max_tex_chars 80 /* limit on the \TeX\ part of a meaning */ -@q Section 25->273. @> +@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 @@ typedef struct { char tex_part[max_tex_chars]; /* \TeX\ part of meaning */ } meaning_struct; -@q Section 26->274. @> +@q Section 26->273. @> @ @<Private...@>= static struct perm_meaning { meaning_struct perm; /* current meaning of an identifier */ @@ -1490,16 +1483,16 @@ static char *ministring_buf_end=ministring_buf+max_tex_chars-1; static char *ministring_ptr; /* first available slot in |ministring_buf| */ static boolean ms_mode; /* are we outputting to |ministring_buf|? */ -@q Section 27->275. @> +@q Section 27->274. @> @ @<Set init...@>= max_temp_meaning_ptr=temp_meaning_stack; title_code_ptr=title_code; ms_mode=false; -@q Section 276. @> +@q Section 275. @> @ @<Predec...@>=@+static void new_meaning(name_pointer); -@q Section 30->277. @> +@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 @@ new_meaning( @<Write the new meaning to the \.{.aux} file@>@; } -@q Section 75->278. @> +@q Section 75->277. @> @ @<Process a user-generated meaning@>= { char *first=id_first; while (xisspace(*first)) first++; @@ -1544,7 +1537,7 @@ new_meaning( loc=id_loc+2; } -@q Section 76->279. @> +@q Section 76->278. @> @ @<Suppress mini-index entry@>= { char *first=id_first,*last=id_loc; while (xisspace(*first)) first++; @@ -1555,7 +1548,7 @@ new_meaning( } } -@q Section 77->280. @> +@q Section 77->279. @> @ @<Digest...@>= { meaning_struct *m; struct perm_meaning *q=get_meaning(p); @@ -1578,7 +1571,7 @@ new_meaning( } } -@q Section 141->281/2. @> +@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 @@ static boolean app_supp( catch14: return *(*(p+1)-1)=='9'; /* was production 14 used? */ } -@q Section 283. @> +@q Section 282. @> @ @<Predec...@>=@+static boolean app_supp(text_pointer); -@q Section 142->284. @> +@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 @@ make_ministring(scrap_pointer p) cur_mathness=maybe_math; /* restore it */ } -@q Section 285. @> +@q Section 284. @> @ @<Predec...@>=@+static void make_ministring(scrap_pointer); -@q Section 43->286. @> +@q Section 43->285. @> @ @<Private...@>= static sixteen_bits int_loc, ext_loc; /* locations of special reserved words */ -@q Section 143->287. @> +@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 @@ else { @<Append tokens for type |q|@>@; } -@q Section 144->288. @> +@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 @@ while (ast_count) { big_app('{');@+app('*');@+app('}');@+ast_count--; } -@q Section 253->289. @> +@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 */ -@q Section 257->290. @> +@q Section 257->289. @> @ @<Make ministring for a new macro@>= { ms_mode=true; ministring_ptr=ministring_buf; @@ -1723,14 +1716,14 @@ static name_pointer id_being_defined; /* the definee */ new_meaning(id_being_defined); } -@q Section 246->291. @> +@q Section 246->290. @> @* Process {\tentex .aux} files. @<Private...@>= static FILE *aux_file; static char aux_file_name[max_file_name_length]; /* name of \.{.aux} file */ -@q Section 247->292. @> +@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 (include_depth) { /* at least one new file was opened */ if ((aux_file=fopen(aux_file_name,"wb"))==NULL) fatal(_("! Cannot open aux output file "),aux_file_name); -@q Section 31->293. @> +@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 @@ if ((aux_file=fopen(aux_file_name,"wb"))==NULL) fprintf(aux_file," %s@@>\n",q->perm.tex_part); } -@q Section 268->294. @> +@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 @@ placed on the list, unless they are reserved and their current } } -@q Section 269->295. @> +@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 @@ placed on the list, unless they are reserved and their current } } -@q Section 270->296. @> +@q Section 270->295. @> @ @c static void out_mini( meaning_struct *m) @@ -1824,10 +1817,10 @@ out_mini( out(' '); out_str(m->tex_part); finish_line(); } -@q Section 271->297. @> +@q Section 270->296. @> @ @<Predec...@>=@+static void out_mini(meaning_struct *); -@q Section 272->298. @> +@q Section 271->297. @> @ Compare this code with section |@<Output the name...@>|. @<Mini-output...@>= @@ -1862,7 +1855,7 @@ switch (cur_name->ilk) {@+char *p; /* index into |byte_mem| */@+@t}\6{\4@> out_name(cur_name,true); name_done:@; -@q Section 28->299. @> +@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 @@ It advances |loc| past the title found. return p-title_code; } -@q Section 300. @> +@q Section 299. @> @ @<Predec...@>=@+static sixteen_bits title_lookup(void); -@q Section 29->301. @> +@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 @@ if (title_code_ptr==title_code) { /* no \.{\\def\\title} found in limbo */ loc=saveloc; limit=savelimit; /* restore */ } -@q Section 302. @> +@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. diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch index 4a1526462f4..0316fef2665 100644 --- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch @@ -603,7 +603,7 @@ improved features that have been created by numerous contributors over the 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 diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index f3e24eb483f..4e788f6a73e 100644 --- a/Build/source/texk/web2c/cwebdir/cweave.w +++ b/Build/source/texk/web2c/cwebdir/cweave.w @@ -4573,12 +4573,9 @@ check_complete(); /* was all of the change file used? */ @ 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@> |