[CWEB] Adapt CTWILL to recent changes.

git-svn-id: svn://tug.org/texlive/trunk@61158 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 68 insertions, 68 deletions

diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 01b038a5861..db8e18a93c1 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,4 +1,4 @@
-2021-11-24  Andreas Scherer  <https://ascherer.github.io>
+2021-11-26  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctwill-mini.ch,
 	* cweave.w: Reshuffle code in CWEAVE.
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
index 246015bbd3a..780cfb7bca1 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
@@ -21,7 +21,7 @@ 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~\&{289}
+A kind of ``user manual'' for \.{CTWILL} can be found in section~\&{288}
 and beyond, together with additional material specific to \.{CTWILL}. % FIXME
 \bigskip
 {\font\itt=cmitt10 \font\bit=cmbxti10
@@ -1023,7 +1023,7 @@ Section 133.
 @r @ The |mathness| is an attribute of scraps that says whether they are
 @z
 
-Section 136--137.
+Section 135--136.
 
 @x
 @ Let us consider the big switch for productions now, before looking
@@ -1168,7 +1168,7 @@ pp++; /* if no match was found, we move to the right */
     case default_like: @<Cases for |default_like|@>@; @+break;
 @z
 
-Section 138.
+Section 137.
 
 @x
 should say, for example, `\.{@@!@@\^\\\&\{operator\} \$+\{=\}\$@@>}' (or,
@@ -1190,7 +1190,7 @@ should say, for example, `\.{@@!@@\^\\\&\{operator\}} \.{\$+\{=\}\$@@>}'
 @$operator_found {CTWILL}138 =\hfil\break(\&{token\_pointer}) 2@>
 @z
 
-Section 140.
+Section 139.
 
 @x
 the |for| loop below.
@@ -1213,7 +1213,7 @@ scrap_pointer p)
 @$make_reserved {CTWILL}140 \&{static} \&{void} (\,)@>
 @z
 
-Section 141.
+Section 140.
 
 @x
 @ In the following situations we want to mark the occurrence of
@@ -1239,7 +1239,7 @@ scrap_pointer p)
     return; /* this happens, for example, in \&{case} \\{found}: */
 @z
 
-Section 144.
+Section 143.
 
 @x
     strcpy(ministring_buf,"label");
@@ -1253,7 +1253,7 @@ else if (cat1==attr) {
 else @/ if (cat1==attr) {
 @z
 
-Section 158.
+Section 157.
 
 @x
 @ @<Cases for |struct_head|@>=
@@ -1261,7 +1261,7 @@ Section 158.
 @r @ @<Cases for |struct_head|@>=
 @z
 
-Section 165.
+Section 164.
 
 @x
   else reduce(pp,0,else_like,0,65);
@@ -1273,7 +1273,7 @@ else if (cat1==attr) {
 @+ else @/ if (cat1==attr) {
 @z
 
-Section 171.
+Section 170.
 
 @x
 @d force_lines flags['f'] /* should each statement be on its own line? */
@@ -1283,7 +1283,7 @@ Section 171.
 @$force_lines {CTWILL}171 =\\{flags}[\.{'f'}]@>
 @z
 
-Section 174.
+Section 173.
 
 @x
 if (cat1==else_like || cat1==if_like || cat1==define_like)
@@ -1297,7 +1297,7 @@ if (cat1==else_like || cat1==if_like || cat1==define_like) @/
 } else @/ if (cat1==exp || cat1==function) {
 @z
 
-Section 182.
+Section 181.
 
 @x
   big_app1(pp+2); reduce(pp,3,new_exp,0,96);
@@ -1309,7 +1309,7 @@ else if (cat1==raw_ubin) {
 @+ else @/ if (cat1==raw_ubin) {
 @z
 
-Section 198.
+Section 197.
 
 @x
 @ Now here's the |reduce| procedure used in our code for productions,
@@ -1317,7 +1317,7 @@ Section 198.
 @r @ Now here's the |reduce| procedure used in our code for productions,
 @z
 
-Section 203.
+Section 202.
 
 @x
 @ @<Print a snapsh...@>=
@@ -1329,7 +1329,7 @@ Section 203.
 @$n {CTWILL}199 \&{short}@>
 @z
 
-Section 205.
+Section 204.
 
 @x
 @ @<Predecl...@>=@+static text_pointer translate(void);
@@ -1338,7 +1338,7 @@ Section 205.
 @-translate@>
 @z
 
-Section 209.
+Section 208.
 
 @x
     if (next_control=='|' || next_control==begin_comment ||
@@ -1350,7 +1350,7 @@ Section 209.
         next_control==begin_short_comment) return;
 @z
 
-Section 210.
+Section 209.
 
 @x
 @ @<Predecl...@>=@+static void C_parse(eight_bits);
@@ -1359,7 +1359,7 @@ Section 210.
 @-C_parse@>
 @z
 
-Section 211.
+Section 210.
 
 @x
 @ The following macro is used to append a scrap whose tokens have just
@@ -1369,7 +1369,7 @@ Section 211.
 @-c@>
 @z
 
-Section 212.
+Section 211.
 
 @x
 @ @<Append the scr...@>=
@@ -1432,7 +1432,7 @@ Section 212.
 @#
 @z
 
-Section 213--214.
+Section 212--213.
 
 @x
   overflow(_("scrap/token/text"));
@@ -1481,7 +1481,7 @@ Section 213--214.
   case ':': app(':');@+app_scrap(colon,no_math);@+break;@/
 @z
 
-Section 216.
+Section 215.
 
 @x
 @<Append a string or...@>={@+ int count=-1; /* characters remaining before string break */
@@ -1489,7 +1489,7 @@ Section 216.
 @<Append a string or...@>={int count=-1; /* characters remaining before string break */
 @z
 
-Section 221.
+Section 220.
 
 @x
 @ The |outer_parse| routine is to |C_parse| as |outer_xref|
@@ -1505,7 +1505,7 @@ Section 221.
 @$make_pb {CTWILL}221 =\\{flags}[\.{'e'}]@>
 @z
 
-Section 225.
+Section 224.
 
 @x
 @d cur_mode cur_state.mode_field /* current mode of interpretation */
@@ -1519,7 +1519,7 @@ Section 225.
 @$cur_mode {CTWILL}225 =\\{cur\_state}.\\{mode\_field}]@>
 @z
 
-Section 228.
+Section 227.
 
 @x
 push_level( /* suspends the current level */
@@ -1531,7 +1531,7 @@ text_pointer p)
 @$push_level {CTWILL}228 \&{static} \&{void} (\,)@>
 @z
 
-Section 229.
+Section 228.
 
 @x
 force when the current level was begun. This subroutine will never be
@@ -1542,7 +1542,7 @@ force when the current level was begun.
 This subroutine will never be called when |stack_ptr==1|.
 @z
 
-Section 234--235.
+Section 233--234.
 
 @x
 @ Here is \.{CWEAVE}'s major output handler.
@@ -1629,7 +1629,7 @@ Section 234--235.
     }
 @z
 
-Section 236.
+Section 235.
 
 @x
 @ An identifier of length one does not have to be enclosed in braces, and it
@@ -1637,7 +1637,7 @@ Section 236.
 @r @ An identifier of length one does not have to be enclosed in braces, and it
 @z
 
-Section 237.
+Section 236.
 
 @x
   } else if (a==opt) b=get_output(); /* ignore digit following |opt| */
@@ -1645,7 +1645,7 @@ Section 237.
   }@+ else if (a==opt) b=get_output(); /* ignore digit following |opt| */
 @z
 
-Section 238.
+Section 237.
 
 @x
 @<Look ahead for st...@>= {
@@ -1667,7 +1667,7 @@ Section 238.
   while (true) {@+
 @z
 
-Section 241.
+Section 240.
 
 @x
     case ' ': case '\\': case '#': case '%': case '$': case '^':
@@ -1680,7 +1680,7 @@ Section 241.
       out('\\'); /* falls through */
 @z
 
-Section 243.
+Section 242.
 
 @x
   if (b=='@@' || (b=='\\' && delim!=0))
@@ -1688,7 +1688,7 @@ Section 243.
   if (b=='@@' || (b=='\\' && delim!=0)) @/
 @z
 
-Section 245.
+Section 244.
 
 @x
 phase_two(void) {
@@ -1696,7 +1696,7 @@ phase_two(void) {
 phase_two(void) {@+
 @z
 
-Section 246.
+Section 245.
 
 @x
 @ @<Predecl...@>=@+static void phase_two(void);
@@ -1705,7 +1705,7 @@ Section 246.
 @-phase_two@>
 @z
 
-Section 248.
+Section 247.
 
 @x
 @ @d usage_sentinel (struct perm_meaning *)1
@@ -1717,7 +1717,7 @@ Section 248.
 @<Translate the current section@>=@+ {
 @z
 
-Section 252.
+Section 251.
 
 @x
 finish_C( /* finishes a definition or a \CEE/ part */
@@ -1729,7 +1729,7 @@ finish_C( /* finishes a definition or a \CEE/ part */
 @$finish_C {CTWILL}252 \&{static} \&{void} (\,)@>
 @z
 
-Section 253.
+Section 252.
 
 @x
 @ @<Predecl...@>=@+static void finish_C(boolean);
@@ -1738,7 +1738,7 @@ Section 253.
 @-finish_C@>
 @z
 
-Section 255.
+Section 254.
 
 @x
 @ @<Start a format...@>= {
@@ -1746,7 +1746,7 @@ Section 255.
 @r @ @<Start a format...@>= {
 @z
 
-Section 256.
+Section 255.
 
 @x
 |next_control>=begin_C|. We will make the global variable |this_section|
@@ -1757,7 +1757,7 @@ We will make the global variable |this_section| point to
 \hfil\break the current section name, if it has a name.
 @z
 
-Section 261.
+Section 260.
 
 @x
 footnote( /* outputs section cross-references */
@@ -1769,7 +1769,7 @@ sixteen_bits flag)
 @$footnote {CTWILL}261 \&{static} \&{void} (\,)@>
 @z
 
-Section 262.
+Section 261.
 
 @x
 @ @<Predecl...@>=@+static void footnote(sixteen_bits);
@@ -1778,7 +1778,7 @@ Section 262.
 @-footnote@>
 @z
 
-Section 266.
+Section 265.
 
 @x
 @ @<Predecl...@>=@+static void phase_three(void);
@@ -1787,7 +1787,7 @@ Section 266.
 @-phase_three@>
 @z
 
-Section 269.
+Section 268.
 
 @x
 @ A left-to-right radix sorting method is used, since this makes it easy to
@@ -1796,7 +1796,7 @@ Section 269.
 @-c@>
 @z
 
-Section 271.
+Section 270.
 
 @x
 @<Rest of |trans_plus| union@>=
@@ -1806,7 +1806,7 @@ Section 271.
 @-k@>
 @z
 
-Section 272.
+Section 271.
 
 @x
 @ @d depth cat /* reclaims memory that is no longer needed for parsing */
@@ -1822,7 +1822,7 @@ Section 272.
 @$max_sorts {CTWILL}272 =\\{max_scraps}@>
 @z
 
-Section 274.
+Section 273.
 
 @x
 $|collate|[0]<|collate|[1]<\cdots<|collate|[100]$.
@@ -1830,7 +1830,7 @@ $|collate|[0]<|collate|[1]<\cdots<|collate|[100]$.
 |collate[0]| ${}<{}$|collate[1]|${}<\cdots<{}$|collate[100]|.
 @z
 
-Section 276.
+Section 275.
 
 @x
 @ Procedure |unbucket| goes through the buckets and adds nonempty lists
@@ -1840,7 +1840,7 @@ Section 276.
 @$unbucket {CTWILL}276 \&{static} \&{void} (\,)@>
 @z
 
-Section 277.
+Section 276.
 
 @x
 @ @<Predecl...@>=@+static void unbucket(eight_bits);
@@ -1849,7 +1849,7 @@ Section 277.
 @-unbucket@>
 @z
 
-Section 279.
+Section 278.
 
 @x
 @ @<Split the list...@>= {
@@ -1861,7 +1861,7 @@ Section 279.
   next_name=sort_ptr->head;@/
 @z
 
-Section 280.
+Section 279.
 
 @x
   cur_name=sort_ptr->head;
@@ -1869,7 +1869,7 @@ Section 280.
   @+cur_name=sort_ptr->head;@/
 @z
 
-Section 286.
+Section 285.
 
 @x
 @ @<Predecl...@>=@+static void section_print(name_pointer);
@@ -1878,7 +1878,7 @@ Section 286.
 @-section_print@>
 @z
 
-Section 288.
+Section 287.
 
 @x
   puts(_("\nMemory usage statistics:"));
@@ -1942,7 +1942,7 @@ Section 288.
             @t\5\5\5\5@>(long)max_scraps);
 @z
 
-Section 289.
+Section 288.
 
 @x
 @** Mogrify {\tentex CWEAVE} into {\tentex CTWILL}.  The following sections
@@ -1967,7 +1967,7 @@ give it the necessary hints in other places via your change file.
 @-x@>
 @z
 
-Section 290--291.
+Section 289--290.
 
 @x
 The current meaning of every identifier is initially `\.{\\uninitialized}'.
@@ -1992,7 +1992,7 @@ must have fewer than 50 characters.
 @y
 @z
 
-Section 293.
+Section 292.
 
 @x
 static struct perm_meaning {
@@ -2002,7 +2002,7 @@ static struct perm_meaning {
 @$perm_meaning {CTWILL}293 \&{static} \&{struct}@>
 @z
 
-Section 302.
+Section 301.
 
 @x
 @ @<Predec...@>=@+static boolean app_supp(text_pointer);
@@ -2011,7 +2011,7 @@ Section 302.
 @-app_supp@>
 @z
 
-Section 303.
+Section 302.
 
 @x
 @ The trickiest part of \.{CTWILL} is the procedure |make_ministring(pp+l)|,
@@ -2025,7 +2025,7 @@ Section 303.
 @$make_ministring {CTWILL}303 \&{static} \&{void} (\,)@>
 @z
 
-Section 304.
+Section 303.
 
 @x
 @ @<Predec...@>=@+static void make_ministring(scrap_pointer);
@@ -2034,7 +2034,7 @@ Section 304.
 @-make_ministring@>
 @z
 
-Section 307.
+Section 306.
 
 @x
 @ @<Append tokens for type |q|@>=
@@ -2048,7 +2048,7 @@ Section 307.
    @|&& *(*r+1)=='{') app(**q); /* |struct_like| identifier */
 @z
 
-Section 312.
+Section 311.
 
 @x
 @ @<Write the new meaning to the \.{.aux} file@>=
@@ -2059,7 +2059,7 @@ Section 312.
 @$q {CTWILL}296 \&{struct perm\_meaning} ${}{*}{}$@>
 @z
 
-Section 313.
+Section 312.
 
 @x
 @<Flag the usage of this identifier, for the mini-index@>=
@@ -2069,7 +2069,7 @@ Section 313.
 @$p {CTWILL}219 \&{name\_pointer}@>
 @z
 
-Section 316.
+Section 315.
 
 @x
 @ @<Predec...@>=@+static void out_mini(meaning_struct *);
@@ -2078,7 +2078,7 @@ Section 316.
 @-out_mini@>
 @z
 
-Section 317.
+Section 316.
 
 @x
 @ Compare this code with section |@<Output the name...@>|.
@@ -2088,7 +2088,7 @@ Section 317.
 @ @<Mini-output...@>=
 @z
 
-Section 319.
+Section 318.
 
 @x
 @ @<Predec...@>=@+static sixteen_bits title_lookup(void);
@@ -2097,7 +2097,7 @@ Section 319.
 @-title_lookup@>
 @z
 
-Section 322.
+Section 321.
 
 @x
 @d indent_param_decl flags['i'] /* should formal parameter declarations be indented? */
@@ -2107,7 +2107,7 @@ Section 322.
 @$indent_param_decl {CTWILL}322 =\\{flags}[\.{'i'}]@>
 @z
 
-Section 323.
+Section 322.
 
 @x
 @d order_decl_stmt flags['o'] /* should declarations and statements be separated? */
@@ -2117,7 +2117,7 @@ Section 323.
 @$order_decl_stmt {CTWILL}323 =\\{flags}[\.{'o'}]@>
 @z
 
-Section 329.
+Section 328.
 
 @x
 @** Index.
diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w
index 0a780b18c4e..5ac6224127f 100644
--- a/Build/source/texk/web2c/cwebdir/cweave.w
+++ b/Build/source/texk/web2c/cwebdir/cweave.w
@@ -600,8 +600,8 @@ ccode['\'']=ord;
 @<Special control codes for debugging@>@;
 
 @ Users can write
-\.{@@2}, \.{@@1}, and \.{@@0} to turn tracing fully on, partly on,
-and off, respectively.
+\.{@@2}, \.{@@1}, and \.{@@0} to turn tracing |fully| on, |partly| on,
+and |off|, respectively.
 
 @<Special control codes...@>=
 ccode['0']=ccode['1']=ccode['2']=trace;