texlive[71951] Build/source/texk/web2c/cwebdir: [CWEB] Remove unused
commits+ascherer at tug.org
commits+ascherer at tug.org
Fri Aug 2 16:57:51 CEST 2024
Revision: 71951
https://tug.org/svn/texlive?view=revision&revision=71951
Author: ascherer
Date: 2024-08-02 16:57:51 +0200 (Fri, 02 Aug 2024)
Log Message:
-----------
[CWEB] Remove unused 'kludge'.
This might rather be documented in 'cwebman.tex' together with '\def\9'.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
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 2024-08-01 23:42:08 UTC (rev 71950)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2024-08-02 14:57:51 UTC (rev 71951)
@@ -1,3 +1,9 @@
+2024-08-02 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch,
+ * cweave.w: Remove unused 'kludge'.
+
2024-07-26 Andreas Scherer <https://ascherer.github.io>
* cwebmac.tex: Reshuffle '\note' macro.
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch 2024-08-01 23:42:08 UTC (rev 71950)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch 2024-08-02 14:57:51 UTC (rev 71951)
@@ -34,7 +34,7 @@
\datethis % Put timestamp before section 1
@z
- at x [0.0] l.35
+ at x [0.0] l.34
\def\title{CWEAVE (Version 4.11)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
@@ -41,31 +41,31 @@
\def\title{CTWILL (Version 4.11 [\TeX~Live])}
@z
- at x [0.0] l.37
+ at x [0.0] l.36
\centerline{\titlefont The {\ttitlefont CWEAVE} processor}
@y
\centerline{\titlefont The {\ttitlefont CTWILL} processor}
@z
- at x [0.0] l.39
+ at x [0.0] l.38
\centerline{(Version 4.11)}
@y
\centerline{(Version 4.11 [\TeX~Live])}
@z
- at x [0.0] l.41
+ at x [0.0] l.40
\def\botofcontents{\vfill
@y
\def\covernote{\vbox{%
@z
- at x [0.0] l.54
+ at x [0.0] l.53
}
@y
}}
@z
- at x [1.1] l.59
+ at x [1.1] l.58
This is the \.{CWEAVE} program by Silvio Levy and Donald E. Knuth,
based on \.{WEAVE} by Knuth.
We are thankful to Steve Avery,
@@ -105,25 +105,25 @@
/* will be extended by the \TeX~Live |versionstring| */
@z
- at x [1.2] l.94
+ at x [1.2] l.93
program=cweave;
@y
program=ctwill;
@z
- at x [1.2] l.98
+ at x [1.2] l.97
if (show_banner) puts(banner); /* print a ``banner line'' */
@y
if (show_banner) cb_show_banner(); /* print a ``banner line'' */
@z
- at x [1.3] l.112
+ at x [1.3] l.111
@i common.h
@y
@i comm-w2c.h
@z
- at x [2.21] l.183
+ at x [2.21] l.182
turned on during the first phase.
@<Private...@>=
@@ -132,19 +132,19 @@
turned on during the first phase---NOT!
@z
- at x [2.23] l.217
+ at x [2.23] l.216
@ @d max_refs 30000 /* number of cross-references; must be less than 65536 */
@y
@ @d max_refs 65535 /* number of cross-references; must be less than 65536 */
@z
- at x [2.25] l.246
+ at x [2.25] l.245
@d append_xref(c) if (xref_ptr==xmem_end) overflow("cross-reference");
@y
@d append_xref(c) if (xref_ptr==xmem_end) overflow(_("cross-reference"));
@z
- at x [2.30] l.337
+ at x [2.30] l.336
@d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
@d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
@@ -156,7 +156,7 @@
must be less than 10240 */
@z
- at x [2.32] l.357
+ at x [2.32] l.356
@ Here are the two procedures needed to complete |id_lookup|:
@y
@ Here are the two procedures needed to complete |id_lookup|:
@@ -163,7 +163,7 @@
@s perm_meaning int
@z
- at x [2.32] l.374
+ at x [2.32] l.373
p->xref=(void *)xmem;
@y
p->xref=(void *)xmem;
@@ -177,7 +177,7 @@
}
@z
- at x [2.33] l.377
+ at x [2.33] l.376
@ And here's a small helper function to simplify the code.
@d update_node(p) (p)->xref=(void *)xref_ptr
@@ -188,7 +188,7 @@
@d get_meaning(p) (p)-name_dir+cur_meaning
@z
- at x [2.34] l.436
+ at x [2.34] l.435
id_lookup("extern",NULL,int_like);
@y
@#
@@ -196,7 +196,7 @@
@#
@z
- at x [2.34] l.449
+ at x [2.34] l.448
id_lookup("int",NULL,raw_int);
@y
@#
@@ -204,7 +204,7 @@
@#
@z
- at x [3.36] l.544
+ at x [3.36] l.543
@d ord 0207 /* control code for `\.{@@'}' */
@d join 0210 /* control code for `\.{@@\&}' */
@d thin_space 0211 /* control code for `\.{@@,}' */
@@ -248,7 +248,7 @@
@d new_section 0235 /* control code for `\.{@@\ }' and `\.{@@*}' */
@z
- at x [3.38] l.587
+ at x [3.38] l.586
ccode['\'']=ord;
@y
ccode['\'']=ord;
@@ -256,7 +256,7 @@
ccode['r']=ccode['R']=right_start;
@z
- at x [3.40] l.608
+ at x [3.40] l.607
static eight_bits skip_TeX(void);
@ @c
@@ -269,7 +269,7 @@
@c
@z
- at x [3.41] l.614
+ at x [3.41] l.613
if (loc>limit && get_line()==false) return;
@y
if (loc>limit && get_line()==false) return;
@@ -279,7 +279,7 @@
}
@z
- at x [4.43] l.670
+ at x [4.43] l.669
\yskip\hang |xref_roman|, |xref_wildcard|, |xref_typewriter|, |TeX_string|,
@y
\yskip\hang |xref_roman|, |xref_wildcard|, |xref_typewriter|, |TeX_string|,
@@ -286,37 +286,37 @@
|meaning|, |suppress|,
@z
- at x [4.46] l.731
+ at x [4.46] l.730
@d right_preproc 0217 /* ends a preprocessor command */
@y
@d right_preproc 0223 /* ends a preprocessor command */
@z
- at x [4.57] l.888
+ at x [4.57] l.887
err_print("! String didn't end"); loc=limit; break;
@y
err_print(_("! String didn't end")); loc=limit; break;
@z
- at x [4.57] l.892
+ at x [4.57] l.891
err_print("! Input ended in middle of string"); loc=buffer; break;
@y
err_print(_("! Input ended in middle of string")); loc=buffer; break;
@z
- at x [4.57] l.911
+ at x [4.57] l.910
printf("%s","\n! String too long: ");
@y
printf("%s",_("\n! String too long: "));
@z
- at x [4.59] l.930
+ at x [4.59] l.929
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x [4.59] l.932
+ at x [4.59] l.931
case underline: xref_switch=def_flag; continue;
@y
case underline: xref_switch=def_flag; continue;
@@ -324,7 +324,7 @@
case right_start: right_start_switch=true; continue;
@z
- at x [4.59] l.938
+ at x [4.59] l.937
case xref_roman: case xref_wildcard: case xref_typewriter: case noop:
@y
case xref_roman: case xref_wildcard: case xref_typewriter: case noop:
@@ -331,31 +331,31 @@
case meaning: case suppress:
@z
- at x [4.62] l.968
+ at x [4.62] l.967
err_print("! Input ended in section name");
@y
err_print(_("! Input ended in section name"));
@z
- at x [4.62] l.981
+ at x [4.62] l.980
printf("%s","\n! Section name too long: ");
@y
printf("%s",_("\n! Section name too long: "));
@z
- at x [4.63] l.995
+ at x [4.63] l.994
err_print("! Section name didn't end"); break;
@y
err_print(_("! Section name didn't end")); break;
@z
- at x [4.63] l.999
+ at x [4.63] l.998
err_print("! Control codes are forbidden in section name"); break;
@y
err_print(_("! Control codes are forbidden in section name")); break;
@z
- at x [4.64] l.1009
+ at x [4.64] l.1008
skip_restricted(void)
{
@y
@@ -363,19 +363,19 @@
{ int c=ccode[(eight_bits)*(loc-1)];
@z
- at x [4.64] l.1016
+ at x [4.64] l.1015
err_print("! Control text didn't end"); loc=limit;
@y
err_print(_("! Control text didn't end")); loc=limit;
@z
- at x [4.64] l.1021
+ at x [4.64] l.1020
err_print("! Control codes are forbidden in control text");
@y
err_print(_("! Control codes are forbidden in control text"));
@z
- at x [4.64] l.1022
+ at x [4.64] l.1021
@.Control codes are forbidden...@>
@y
@.Control codes are forbidden...@>
@@ -383,13 +383,13 @@
else if (c==suppress && phase==2) @<Suppress mini-index entry@>@;
@z
- at x [4.66] l.1036
+ at x [4.66] l.1035
if (loc>=limit) err_print("! Verbatim string didn't end");
@y
if (loc>=limit) err_print(_("! Verbatim string didn't end"));
@z
- at x [5.68] l.1061
+ at x [5.68] l.1060
skip_limbo(); change_exists=false;
@y
skip_limbo();
@@ -396,36 +396,36 @@
@<Give a default title to the program, if necessary@>@;
@z
- at x [5.68] l.1064
+ at x [5.68] l.1063
changed_section[section_count]=change_exists;
/* the index changes if anything does */
@y
@z
- at x [5.70] l.1073
+ at x [5.70] l.1072
if (++section_count==max_sections) overflow("section number");
@y
if (++section_count==max_sections) overflow(_("section number"));
@z
- at x [5.70] l.1074
+ at x [5.70] l.1073
changed_section[section_count]=changing;
/* it will become |true| if any line changes */
@y
@z
- at x [5.70] l.1083
+ at x [5.70] l.1082
if (changed_section[section_count]) change_exists=true;
@y
@z
- at x [5.74] l.1162
+ at x [5.74] l.1161
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x [5.74] l.1167
+ at x [5.74] l.1166
case xref_roman: case xref_wildcard: case xref_typewriter:
@y
case xref_roman: case xref_wildcard: case xref_typewriter:
@@ -432,19 +432,19 @@
case meaning: case suppress:
@z
- at x [5.79] l.1249
+ at x [5.79] l.1248
err_print("! Missing left identifier of @@s");
@y
err_print(_("! Missing left identifier of @@s"));
@z
- at x [5.79] l.1254
+ at x [5.79] l.1253
err_print("! Missing right identifier of @@s");
@y
err_print(_("! Missing right identifier of @@s"));
@z
- at x [5.82] l.1302
+ at x [5.82] l.1301
printf("%s","\n! Never defined: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -452,7 +452,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x [5.82] l.1308
+ at x [5.82] l.1307
printf("%s","\n! Never used: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -460,7 +460,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x [6.89] l.1397
+ at x [6.89] l.1396
@ In particular, the |finish_line| procedure is called near the very
beginning of phase two. We initialize the output variables in a slightly
tricky way so that the first line of the output file will be
@@ -494,7 +494,7 @@
*out_ptr='c';
@z
- at x [6.90] l.1414
+ at x [6.90] l.1413
@d out(c) {if (out_ptr>=out_buf_end) break_out(); *(++out_ptr)=c;}
@y
@d out(c)
@@ -508,13 +508,13 @@
}
@z
- at x [6.94] l.1462
+ at x [6.94] l.1461
printf("\n! Line had to be broken (output l. %d):\n",out_line);
@y
printf(_("\n! Line had to be broken (output l. %d):\n"),out_line);
@z
- at x [6.95] l.1471
+ at x [6.95] l.1470
|def_flag|, so it cannot have more than five decimal digits. If
the section is changed, we output `\.{\\*}' just after the number.
@y
@@ -521,13 +521,13 @@
|def_flag|, so it cannot have more than five decimal digits.
@z
- at x [6.96] l.1485
+ at x [6.96] l.1484
if (changed_section[n]) out_str("\\*");
@.\\*@>
@y
@z
- at x [7.99] l.1543
+ at x [7.99] l.1542
default: err_print("! Double @@ should be used in limbo");
@y
case right_start: right_start_switch=true; break;
@@ -534,43 +534,43 @@
default: err_print(_("! Double @@ should be used in limbo"));
@z
- at x [7.101] l.1585
+ at x [7.101] l.1584
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow("token"); *(tok_ptr++)=c;}
@y
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow(_("token")); *(tok_ptr++)=c;}
@z
- at x [7.101] l.1597
+ at x [7.101] l.1596
err_print("! Input ended in mid-comment");
@y
err_print(_("! Input ended in mid-comment"));
@z
- at x [7.101] l.1602
+ at x [7.101] l.1601
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x [7.101] l.1618
+ at x [7.101] l.1617
else {err_print("! Extra } in comment");
@y
else {err_print(_("! Extra } in comment"));
@z
- at x [7.102] l.1630
+ at x [7.102] l.1629
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x [7.103] l.1638
+ at x [7.103] l.1637
err_print("! Illegal use of @@ in comment");
@y
err_print(_("! Illegal use of @@ in comment"));
@z
- at x [8.106] l.1755
+ at x [8.106] l.1754
@d attr_head 69 /* denotes beginning of attribute */
@y
@d attr_head 69 /* denotes beginning of attribute */
@@ -577,13 +577,13 @@
@d title 70 /* program name or header name in a ``meaning'' */
@z
- at x [8.110] l.2129
+ at x [8.110] l.2128
@i prod.w
@y
@i prod-twill.w
@z
- at x [9.113] l.2179
+ at x [9.113] l.2178
static scrap scrap_info[max_scraps]; /* memory array for scraps */
@y
static scrap scrap_info[max_scraps]; /* memory array for scraps */
@@ -590,7 +590,7 @@
static scrap null_scrap; /* a scrap with empty translation */
@z
- at x [9.114] l.2188
+ at x [9.114] l.2187
@ @<Set init...@>=
@y
@ @<Set init...@>=
@@ -597,13 +597,13 @@
null_scrap.trans=&tok_start[0];
@z
- at x [9.116] l.2249
+ at x [9.116] l.2248
update_terminal();
@y
puts("|"); update_terminal();
@z
- at x [9.124] l.2560
+ at x [9.124] l.2559
the |for| loop below.
@c
@@ -618,7 +618,7 @@
@#
@z
- at x [9.124] l.2568
+ at x [9.124] l.2567
token_pointer tok_loc; /* pointer to |tok_value| */
if ((tok_loc=find_first_ident(p->trans))<=operator_found)
return; /* this should not happen */
@@ -626,12 +626,12 @@
if (tok_loc<=operator_found) return; /* this should not happen */
@z
- at x [9.125] l.2597
+ at x [9.125] l.2596
token_pointer tok_loc; /* where the first identifier appears */
@y
@z
- at x [9.128] l.2651
+ at x [9.128] l.2650
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
make_underlined(pp); big_app(dindent); big_app1(pp);
@@ -646,7 +646,7 @@
}
@z
- at x [9.128] l.2666
+ at x [9.128] l.2665
make_underlined (pp); squash(pp,2,tag,-1,7);
@y
make_underlined (pp);
@@ -657,7 +657,7 @@
squash(pp,2,tag,-1,7);
@z
- at x [9.138] l.2755
+ at x [9.138] l.2754
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
@@ -700,7 +700,7 @@
else if (cat1==semi) squash(pp,2,decl,-1,39);
@z
- at x [9.139] l.2777
+ at x [9.139] l.2776
@ @<Cases for |decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,decl,-1,40);
@@ -719,13 +719,13 @@
}
@z
- at x [9.141] l.2803
+ at x [9.141] l.2802
make_underlined(pp+1); make_reserved(pp+1);
@y
make_underlined(pp+1); make_reserved(pp+1); make_ministring(pp+1);
@z
- at x [9.143] l.2834
+ at x [9.143] l.2833
@ @<Cases for |fn_decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,fn_decl,0,51);
@@ -748,7 +748,7 @@
}
@z
- at x [9.153] l.2938
+ at x [9.153] l.2937
big_app1_insert(pp,dindent); reduce(pp,2,fn_decl,0,73);
@y
big_app1(pp); if (indent_param_decl) big_app(dindent);
@@ -755,7 +755,7 @@
big_app1(pp+1); reduce(pp,2,fn_decl,0,73);
@z
- at x [9.156] l.2964
+ at x [9.156] l.2963
big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
@y
@@ -764,7 +764,7 @@
( force_lines ? force : break_space ) ); reduce(pp,2,cat1,-1,76);
@z
- at x [9.158] l.2972
+ at x [9.158] l.2971
if (cat1==define_like) make_underlined(pp+2);
@y
if (cat1==define_like) { /* \#\&{define} is analogous to \&{extern} */
@@ -776,7 +776,7 @@
}
@z
- at x [9.167] l.3069
+ at x [9.167] l.3068
if (cat1==prelangle) reduce(pp+1,0,langle,1,100);
else reduce(pp,0,exp,-2,101);
@y
@@ -784,13 +784,13 @@
else reduce(pp,0,exp,-2,122);
@z
- at x [9.168] l.3074
+ at x [9.168] l.3073
big_app1_insert(pp,' '); reduce(pp,2,else_like,-2,102);
@y
big_app1_insert(pp,' '); reduce(pp,2,else_like,-2,123);
@z
- at x [9.173] l.3106
+ at x [9.173] l.3105
@ @<Cases for |typedef_like|@>=
if ((cat1==int_like || cat1==cast) && (cat2==comma || cat2==semi))
reduce(pp+1,0,exp,-1,115);
@@ -826,37 +826,37 @@
(cat3==semi || cat3==comma)) reduce(pp+2,0,exp,1,202);
@z
- at x [9.186] l.3293
+ at x [9.186] l.3292
overflow("token");
@y
overflow(_("token"));
@z
- at x [9.186] l.3297
+ at x [9.186] l.3296
overflow("text");
@y
overflow(_("text"));
@z
- at x [9.190] l.3352
+ at x [9.190] l.3351
if (tok_ptr+6>tok_mem_end) overflow("token");
@y
if (tok_ptr+6>tok_mem_end) overflow(_("token"));
@z
- at x [9.191] l.3358
+ at x [9.191] l.3357
printf("\nIrreducible scrap sequence in section %d:",(int)section_count);
@y
printf(_("\nIrreducible scrap sequence in section %d:"),(int)section_count);
@z
- at x [9.192] l.3368
+ at x [9.192] l.3367
printf("\nTracing after l. %d:\n",cur_line); mark_harmless();
@y
printf(_("\nTracing after l. %d:\n"),cur_line); mark_harmless();
@z
- at x [10.196] l.3454
+ at x [10.196] l.3453
case ignore: case xref_roman: case xref_wildcard:
@y
case ignore: case xref_roman: case xref_wildcard:
@@ -863,19 +863,19 @@
case meaning: case suppress:
@z
- at x [10.197] l.3500
+ at x [10.197] l.3499
overflow("scrap/token/text");
@y
overflow(_("scrap/token/text"));
@z
- at x [10.199] l.3585
+ at x [10.199] l.3584
else err_print("! Double @@ should be used in strings");
@y
else err_print(_("! Double @@ should be used in strings"));
@z
- at x [10.202] l.3650
+ at x [10.202] l.3649
else app_scrap(p->ilk,maybe_math);
}
}
@@ -886,19 +886,19 @@
@<Flag the usage of this identifier, for the mini-index@>@;
@z
- at x [10.203] l.3668
+ at x [10.203] l.3667
if (next_control!='|') err_print("! Missing '|' after C text");
@y
if (next_control!='|') err_print(_("! Missing '|' after C text"));
@z
- at x [10.204] l.3683
+ at x [10.204] l.3682
to \.{\\PB}. Although \.{cwebmac} ignores \.{\\PB}, other macro packages
@y
to \.{\\PB}. Although \.{ctwimac} ignores \.{\\PB}, other macro packages
@z
- at x [10.205] l.3713
+ at x [10.205] l.3712
app(tok_flag+(int)(p-tok_start));
@y
app(tok_flag+(int)(p-tok_start));
@@ -905,43 +905,43 @@
app(inserted);
@z
- at x [11.211] l.3809
+ at x [11.211] l.3808
if (stack_ptr==stack_end) overflow("stack");
@y
if (stack_ptr==stack_end) overflow(_("stack"));
@z
- at x [11.224] l.4132
+ at x [11.224] l.4131
printf("%s","\n! Illegal control code in section name: <");
@y
printf("%s",_("\n! Illegal control code in section name: <"));
@z
- at x [11.225] l.4147
+ at x [11.225] l.4146
printf("%s","\n! C text in section name didn't end: <");
@y
printf("%s",_("\n! C text in section name didn't end: <"));
@z
- at x [11.225] l.4159
+ at x [11.225] l.4158
if (j>buffer+long_buf_size-3) overflow("buffer");
@y
if (j>buffer+long_buf_size-3) overflow(_("buffer"));
@z
- at x [11.226] l.4167
+ at x [11.226] l.4166
if (j>buffer+long_buf_size-4) overflow("buffer");
@y
if (j>buffer+long_buf_size-4) overflow(_("buffer"));
@z
- at x [12.227] l.4182
+ at x [12.227] l.4181
if (show_progress) printf("%s","\nWriting the output file...");
@y
if (show_progress) printf("%s",_("\nWriting the output file..."));
@z
- at x [12.227] l.4184
+ at x [12.227] l.4183
section_count=0; format_visible=true; copy_limbo();
@y
temp_switch=false; temp_meaning_ptr=temp_meaning_stack;
@@ -949,7 +949,7 @@
section_count=0; format_visible=true; right_start_switch=false; copy_limbo();
@z
- at x [12.229] l.4213
+ at x [12.229] l.4212
static boolean group_found=false; /* has a starred section occurred? */
@ @<Translate the current section@>= {
@@ -966,12 +966,12 @@
top_usage=usage_sentinel;
@z
- at x [12.231] l.4231
+ at x [12.231] l.4230
If the section has changed, we put \.{\\*} just after the section number.
@y
@z
- at x [12.231] l.4234
+ at x [12.231] l.4233
if (*(loc-1)!='*') out_str("\\M");
@y
if (*(loc-1)!='*') {
@@ -983,7 +983,7 @@
}
@z
- at x [12.231] l.4249
+ at x [12.231] l.4248
@.\\N@>
@y
@.\\N@>
@@ -993,7 +993,7 @@
}
@z
- at x [12.231] l.4256
+ at x [12.231] l.4255
out('{'); out_section(section_count); out('}');
@y
out('{'); out_section(section_count); out('}');
@@ -1000,7 +1000,7 @@
flush_buffer(out_ptr,false,false);
@z
- at x [12.232] l.4264
+ at x [12.232] l.4263
case '@@': out('@@'); break;
@y
case '@@': out('@@'); break;
@@ -1008,7 +1008,7 @@
case right_start: right_start_switch=true; break;
@z
- at x [12.232] l.4267
+ at x [12.232] l.4266
case section_name: loc-=2; next_control=get_next(); /* skip to \.{@@>} */
@y
case meaning: case suppress:
@@ -1015,19 +1015,19 @@
case section_name: loc-=2; next_control=get_next(); /* reprocess */
@z
- at x [12.232] l.4269
+ at x [12.232] l.4268
err_print("! TeX string should be in C text only"); break;
@y
err_print(_("! TeX string should be in C text only")); break;
@z
- at x [12.232] l.4275
+ at x [12.232] l.4274
err_print("! You can't do that in TeX text"); break;
@y
err_print(_("! You can't do that in TeX text")); break;
@z
- at x [12.233] l.4289
+ at x [12.233] l.4288
outer_parse(); finish_C(format_visible); format_visible=true;
doing_format=false;
}
@@ -1039,7 +1039,7 @@
}
@z
- at x [12.236] l.4341
+ at x [12.236] l.4340
@<Start a macro...@>= {
@y
@<Start a macro...@>= {
@@ -1046,13 +1046,13 @@
is_macro=true;
@z
- at x [12.236] l.4347
+ at x [12.236] l.4346
err_print("! Improper macro definition");
@y
err_print(_("! Improper macro definition"));
@z
- at x [12.236] l.4348
+ at x [12.236] l.4347
@.Improper macro definition@>
else {
app('$'); app_cur_id(false);
@@ -1064,7 +1064,7 @@
def_diff=(*loc!='(');
@z
- at x [12.236] l.4360
+ at x [12.236] l.4359
} @=/* otherwise fall through */@>@;
default: err_print("! Improper macro definition"); break;
@y
@@ -1072,7 +1072,7 @@
default: err_print(_("! Improper macro definition")); break;
@z
- at x [12.237] l.4370
+ at x [12.237] l.4369
@ @<Start a format...@>= {
doing_format=true;
@y
@@ -1081,25 +1081,25 @@
is_macro=false;
@z
- at x [12.237] l.4387
+ at x [12.237] l.4386
if (scrap_ptr!=scrap_info+2) err_print("! Improper format definition");
@y
if (scrap_ptr!=scrap_info+2) err_print(_("! Improper format definition"));
@z
- at x [12.240] l.4422
+ at x [12.240] l.4421
err_print("! You need an = sign after the section name");
@y
err_print(_("! You need an = sign after the section name"));
@z
- at x [12.241] l.4444
+ at x [12.241] l.4443
err_print("! You can't do that in C text");
@y
err_print(_("! You can't do that in C text"));
@z
- at x [12.246] l.4514
+ at x [12.246] l.4513
out_str("\\fi"); finish_line();
@.\\fi@>
@y
@@ -1110,13 +1110,13 @@
@.\\FI@>
@z
- at x [13.247] l.4535
+ at x [13.247] l.4534
if (show_progress) printf("%s","\nWriting the index...");
@y
if (show_progress) printf("%s",_("\nWriting the index..."));
@z
- at x [13.247] l.4537
+ at x [13.247] l.4536
if (change_exists) {
@<Tell about changed sections@>@;
finish_line(); flush_buffer(out_buf,false,false);
@@ -1125,19 +1125,19 @@
@y
@z
- at x [13.247] l.4546
+ at x [13.247] l.4545
fatal("! Cannot open index file ",idx_file_name);
@y
fatal(_("! Cannot open index file "),idx_file_name);
@z
- at x [13.247] l.4558
+ at x [13.247] l.4557
fatal("! Cannot open section file ",scn_file_name);
@y
fatal(_("! Cannot open section file "),scn_file_name);
@z
- at x [13.247] l.4570
+ at x [13.247] l.4569
fclose(active_file);
@y
fclose(active_file); active_file=tex_file=NULL;
@@ -1144,13 +1144,13 @@
if (check_for_change) @<Update the result when it has changed@>@;
@z
- at x [13.247] l.4573
+ at x [13.247] l.4572
printf("%s","Done.");
@y
printf("%s",_("Done."));
@z
- at x [13.249] l.4581
+ at x [13.249] l.4580
the index section itself.
@<Tell about changed sections@>=
@@ -1169,13 +1169,13 @@
the index section itself---NOT!
@z
- at x [13.257] l.4725
+ at x [13.257] l.4724
if (sort_ptr>=scrap_info_end) overflow("sorting");
@y
if (sort_ptr>=scrap_info_end) overflow(_("sorting"));
@z
- at x [13.262] l.4770
+ at x [13.262] l.4769
@ @<Output the name...@>=
switch (cur_name->ilk) {@+char *p; /* index into |byte_mem| */@+ at t}\6{\4@>
@y
@@ -1186,13 +1186,13 @@
switch (cur_name->ilk) {
@z
- at x [13.262] l.4772
+ at x [13.262] l.4771
case normal: case func_template:
@y
case normal:
@z
- at x [13.262] l.4774
+ at x [13.262] l.4773
else {@+boolean all_caps=true;@+ at t}\6{@>
@y
else {@+boolean all_caps=true;@+char *p;
@@ -1199,7 +1199,7 @@
/* index into |byte_mem| */ @+ at t}\6{@>
@z
- at x [13.262] l.4789
+ at x [13.262] l.4788
case roman: not_an_identifier: out_name(cur_name,false); goto name_done;
case custom:
out_str("$\\");
@@ -1214,13 +1214,13 @@
@.\\\$@>
@z
- at x [13.262] l.4799
+ at x [13.262] l.4798
out_name(cur_name,true);
@y
out_name(cur_name,proofing);
@z
- at x [13.269] l.4862
+ at x [13.269] l.4861
puts("\nMemory usage statistics:");
@.Memory usage statistics:@>
printf("%td names (out of %ld)\n",@^system dependencies@>
@@ -1269,7 +1269,7 @@
(ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps);
@z
- at x [14.270] l.4884
+ at x [14.270] l.4883
@** Index.
@y
@q Section 270. @>
Modified: trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch 2024-08-01 23:42:08 UTC (rev 71950)
+++ trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch 2024-08-02 14:57:51 UTC (rev 71951)
@@ -16,31 +16,31 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
- at x [0.0] l.35
+ at x [0.0] l.34
\def\title{CWEAVE (Version 4.11)}
@y
\def\title{CWEAVE (Version 4.11 [\TeX~Live])}
@z
- at x [0.0] l.39
+ at x [0.0] l.38
\centerline{(Version 4.11)}
@y
\centerline{(Version 4.11 [\TeX~Live])}
@z
- at x [0.0] l.41
+ at x [0.0] l.40
\def\botofcontents{\vfill
@y
\def\covernote{\vbox{%
@z
- at x [0.0] l.54
+ at x [0.0] l.53
}
@y
}}\datecontentspage
@z
- at x [1.1] l.70
+ at x [1.1] l.69
@d banner "This is CWEAVE (Version 4.11)"
@y
@d banner "This is CWEAVE, Version 4.11"
@@ -47,31 +47,31 @@
/* will be extended by the \TeX~Live |versionstring| */
@z
- at x [1.2] l.98
+ at x [1.2] l.97
if (show_banner) puts(banner); /* print a ``banner line'' */
@y
if (show_banner) cb_show_banner(); /* print a ``banner line'' */
@z
- at x [1.3] l.112
+ at x [1.3] l.111
@i common.h
@y
@i comm-w2c.h
@z
- at x [2.23] l.217
+ at x [2.23] l.216
@ @d max_refs 30000 /* number of cross-references; must be less than 65536 */
@y
@ @d max_refs 65535 /* number of cross-references; must be less than 65536 */
@z
- at x [2.25] l.246
+ at x [2.25] l.245
@d append_xref(c) if (xref_ptr==xmem_end) overflow("cross-reference");
@y
@d append_xref(c) if (xref_ptr==xmem_end) overflow(_("cross-reference"));
@z
- at x [2.30] l.337
+ at x [2.30] l.336
@d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
@d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
@@ -83,97 +83,97 @@
must be less than 10240 */
@z
- at x [4.57] l.888
+ at x [4.57] l.887
err_print("! String didn't end"); loc=limit; break;
@y
err_print(_("! String didn't end")); loc=limit; break;
@z
- at x [4.57] l.892
+ at x [4.57] l.891
err_print("! Input ended in middle of string"); loc=buffer; break;
@y
err_print(_("! Input ended in middle of string")); loc=buffer; break;
@z
- at x [4.57] l.911
+ at x [4.57] l.910
printf("%s","\n! String too long: ");
@y
printf("%s",_("\n! String too long: "));
@z
- at x [4.59] l.930
+ at x [4.59] l.929
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x [4.62] l.968
+ at x [4.62] l.967
err_print("! Input ended in section name");
@y
err_print(_("! Input ended in section name"));
@z
- at x [4.62] l.981
+ at x [4.62] l.980
printf("%s","\n! Section name too long: ");
@y
printf("%s",_("\n! Section name too long: "));
@z
- at x [4.63] l.995
+ at x [4.63] l.994
err_print("! Section name didn't end"); break;
@y
err_print(_("! Section name didn't end")); break;
@z
- at x [4.63] l.999
+ at x [4.63] l.998
err_print("! Control codes are forbidden in section name"); break;
@y
err_print(_("! Control codes are forbidden in section name")); break;
@z
- at x [4.64] l.1016
+ at x [4.64] l.1015
err_print("! Control text didn't end"); loc=limit;
@y
err_print(_("! Control text didn't end")); loc=limit;
@z
- at x [4.64] l.1021
+ at x [4.64] l.1020
err_print("! Control codes are forbidden in control text");
@y
err_print(_("! Control codes are forbidden in control text"));
@z
- at x [4.66] l.1036
+ at x [4.66] l.1035
if (loc>=limit) err_print("! Verbatim string didn't end");
@y
if (loc>=limit) err_print(_("! Verbatim string didn't end"));
@z
- at x [5.70] l.1073
+ at x [5.70] l.1072
if (++section_count==max_sections) overflow("section number");
@y
if (++section_count==max_sections) overflow(_("section number"));
@z
- at x [5.74] l.1162
+ at x [5.74] l.1161
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x [5.79] l.1249
+ at x [5.79] l.1248
err_print("! Missing left identifier of @@s");
@y
err_print(_("! Missing left identifier of @@s"));
@z
- at x [5.79] l.1254
+ at x [5.79] l.1253
err_print("! Missing right identifier of @@s");
@y
err_print(_("! Missing right identifier of @@s"));
@z
- at x [5.82] l.1302
+ at x [5.82] l.1301
printf("%s","\n! Never defined: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -181,7 +181,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x [5.82] l.1308
+ at x [5.82] l.1307
printf("%s","\n! Never used: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -189,7 +189,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x [6.89] l.1397
+ at x [6.89] l.1396
@ In particular, the |finish_line| procedure is called near the very
beginning of phase two. We initialize the output variables in a slightly
tricky way so that the first line of the output file will be
@@ -218,61 +218,61 @@
*out_ptr='c';
@z
- at x [6.94] l.1462
+ at x [6.94] l.1461
printf("\n! Line had to be broken (output l. %d):\n",out_line);
@y
printf(_("\n! Line had to be broken (output l. %d):\n"),out_line);
@z
- at x [7.99] l.1543
+ at x [7.99] l.1542
default: err_print("! Double @@ should be used in limbo");
@y
default: err_print(_("! Double @@ should be used in limbo"));
@z
- at x [7.101] l.1585
+ at x [7.101] l.1584
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow("token"); *(tok_ptr++)=c;}
@y
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow(_("token")); *(tok_ptr++)=c;}
@z
- at x [7.101] l.1597
+ at x [7.101] l.1596
err_print("! Input ended in mid-comment");
@y
err_print(_("! Input ended in mid-comment"));
@z
- at x [7.101] l.1602
+ at x [7.101] l.1601
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x [7.101] l.1618
+ at x [7.101] l.1617
else {err_print("! Extra } in comment");
@y
else {err_print(_("! Extra } in comment"));
@z
- at x [7.102] l.1630
+ at x [7.102] l.1629
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x [7.103] l.1638
+ at x [7.103] l.1637
err_print("! Illegal use of @@ in comment");
@y
err_print(_("! Illegal use of @@ in comment"));
@z
- at x [8.110] l.2129
+ at x [8.110] l.2128
@i prod.w
@y
@i prod-cweave.w
@z
- at x [9.128] l.2651
+ at x [9.128] l.2650
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
make_underlined(pp); big_app(dindent); big_app1(pp);
@@ -286,7 +286,7 @@
}
@z
- at x [9.138] l.2755
+ at x [9.138] l.2754
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
@@ -328,7 +328,7 @@
else if (cat1==semi) squash(pp,2,decl,-1,39);
@z
- at x [9.139] l.2777
+ at x [9.139] l.2776
@ @<Cases for |decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,decl,-1,40);
@@ -347,7 +347,7 @@
}
@z
- at x [9.143] l.2834
+ at x [9.143] l.2833
@ @<Cases for |fn_decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,fn_decl,0,51);
@@ -370,7 +370,7 @@
}
@z
- at x [9.153] l.2938
+ at x [9.153] l.2937
big_app1_insert(pp,dindent); reduce(pp,2,fn_decl,0,73);
@y
big_app1(pp); if (indent_param_decl) big_app(dindent);
@@ -377,7 +377,7 @@
big_app1(pp+1); reduce(pp,2,fn_decl,0,73);
@z
- at x [9.156] l.2964
+ at x [9.156] l.2963
big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
@y
@@ -386,109 +386,109 @@
( force_lines ? force : break_space ) ); reduce(pp,2,cat1,-1,76);
@z
- at x [9.186] l.3293
+ at x [9.186] l.3292
overflow("token");
@y
overflow(_("token"));
@z
- at x [9.186] l.3297
+ at x [9.186] l.3296
overflow("text");
@y
overflow(_("text"));
@z
- at x [9.190] l.3352
+ at x [9.190] l.3351
if (tok_ptr+6>tok_mem_end) overflow("token");
@y
if (tok_ptr+6>tok_mem_end) overflow(_("token"));
@z
- at x [9.191] l.3358
+ at x [9.191] l.3357
printf("\nIrreducible scrap sequence in section %d:",(int)section_count);
@y
printf(_("\nIrreducible scrap sequence in section %d:"),(int)section_count);
@z
- at x [9.192] l.3368
+ at x [9.192] l.3367
printf("\nTracing after l. %d:\n",cur_line); mark_harmless();
@y
printf(_("\nTracing after l. %d:\n"),cur_line); mark_harmless();
@z
- at x [10.197] l.3500
+ at x [10.197] l.3499
overflow("scrap/token/text");
@y
overflow(_("scrap/token/text"));
@z
- at x [10.199] l.3585
+ at x [10.199] l.3584
else err_print("! Double @@ should be used in strings");
@y
else err_print(_("! Double @@ should be used in strings"));
@z
- at x [10.203] l.3668
+ at x [10.203] l.3667
if (next_control!='|') err_print("! Missing '|' after C text");
@y
if (next_control!='|') err_print(_("! Missing '|' after C text"));
@z
- at x [11.211] l.3809
+ at x [11.211] l.3808
if (stack_ptr==stack_end) overflow("stack");
@y
if (stack_ptr==stack_end) overflow(_("stack"));
@z
- at x [11.224] l.4132
+ at x [11.224] l.4131
printf("%s","\n! Illegal control code in section name: <");
@y
printf("%s",_("\n! Illegal control code in section name: <"));
@z
- at x [11.225] l.4147
+ at x [11.225] l.4146
printf("%s","\n! C text in section name didn't end: <");
@y
printf("%s",_("\n! C text in section name didn't end: <"));
@z
- at x [11.225] l.4159
+ at x [11.225] l.4158
if (j>buffer+long_buf_size-3) overflow("buffer");
@y
if (j>buffer+long_buf_size-3) overflow(_("buffer"));
@z
- at x [11.226] l.4167
+ at x [11.226] l.4166
if (j>buffer+long_buf_size-4) overflow("buffer");
@y
if (j>buffer+long_buf_size-4) overflow(_("buffer"));
@z
- at x [12.227] l.4182
+ at x [12.227] l.4181
if (show_progress) printf("%s","\nWriting the output file...");
@y
if (show_progress) printf("%s",_("\nWriting the output file..."));
@z
- at x [12.232] l.4269
+ at x [12.232] l.4268
err_print("! TeX string should be in C text only"); break;
@y
err_print(_("! TeX string should be in C text only")); break;
@z
- at x [12.232] l.4275
+ at x [12.232] l.4274
err_print("! You can't do that in TeX text"); break;
@y
err_print(_("! You can't do that in TeX text")); break;
@z
- at x [12.236] l.4347
+ at x [12.236] l.4346
err_print("! Improper macro definition");
@y
err_print(_("! Improper macro definition"));
@z
- at x [12.236] l.4360
+ at x [12.236] l.4359
} @=/* otherwise fall through */@>@;
default: err_print("! Improper macro definition"); break;
@y
@@ -496,43 +496,43 @@
default: err_print(_("! Improper macro definition")); break;
@z
- at x [12.237] l.4387
+ at x [12.237] l.4386
if (scrap_ptr!=scrap_info+2) err_print("! Improper format definition");
@y
if (scrap_ptr!=scrap_info+2) err_print(_("! Improper format definition"));
@z
- at x [12.240] l.4422
+ at x [12.240] l.4421
err_print("! You need an = sign after the section name");
@y
err_print(_("! You need an = sign after the section name"));
@z
- at x [12.241] l.4444
+ at x [12.241] l.4443
err_print("! You can't do that in C text");
@y
err_print(_("! You can't do that in C text"));
@z
- at x [13.247] l.4535
+ at x [13.247] l.4534
if (show_progress) printf("%s","\nWriting the index...");
@y
if (show_progress) printf("%s",_("\nWriting the index..."));
@z
- at x [13.247] l.4546
+ at x [13.247] l.4545
fatal("! Cannot open index file ",idx_file_name);
@y
fatal(_("! Cannot open index file "),idx_file_name);
@z
- at x [13.247] l.4558
+ at x [13.247] l.4557
fatal("! Cannot open section file ",scn_file_name);
@y
fatal(_("! Cannot open section file "),scn_file_name);
@z
- at x [13.247] l.4570
+ at x [13.247] l.4569
fclose(active_file);
@y
fclose(active_file); active_file=tex_file=NULL;
@@ -539,19 +539,19 @@
if (check_for_change) @<Update the result when it has changed@>@;
@z
- at x [13.247] l.4573
+ at x [13.247] l.4572
printf("%s","Done.");
@y
printf("%s",_("Done."));
@z
- at x [13.257] l.4725
+ at x [13.257] l.4724
if (sort_ptr>=scrap_info_end) overflow("sorting");
@y
if (sort_ptr>=scrap_info_end) overflow(_("sorting"));
@z
- at x [13.269] l.4862
+ at x [13.269] l.4861
puts("\nMemory usage statistics:");
@.Memory usage statistics:@>
printf("%td names (out of %ld)\n",@^system dependencies@>
@@ -595,7 +595,7 @@
(ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps);
@z
- at x [14.270] l.4884
+ at x [14.270] l.4883
@** Index.
@y
@** Extensions to {\tentex CWEB}. The following sections introduce new or
Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w 2024-08-01 23:42:08 UTC (rev 71950)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w 2024-08-02 14:57:51 UTC (rev 71951)
@@ -27,7 +27,6 @@
\def\dleft{[\![} \def\dright{]\!]} % double brackets
\mathchardef\RA="3221 % right arrow
\mathchardef\BA="3224 % double arrow
-\def\({} % ) kludge for alphabetizing certain section names
\def\TeXxstring{\\{\TEX/\_string}}
\def\skipxTeX{\\{skip\_\TEX/}}
\def\copyxTeX{\\{copy\_\TEX/}}
More information about the tex-live-commits
mailing list.