texlive[71440] Build/source/texk/web2c: [WEB] Restore @x comments

[commits+ascherer at tug.org]

Revision: 71440
          https://tug.org/svn/texlive?view=revision&revision=71440
Author:   ascherer
Date:     2024-06-05 12:55:05 +0200 (Wed, 05 Jun 2024)
Log Message:
-----------
[WEB] Restore @x comments with square brackets.

The initial regex was too gready.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/tangle.ch
    trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py
    trunk/Build/source/texk/web2c/weave.ch

Modified: trunk/Build/source/texk/web2c/tangle.ch
===================================================================
--- trunk/Build/source/texk/web2c/tangle.ch	2024-06-05 09:28:10 UTC (rev 71439)
+++ trunk/Build/source/texk/web2c/tangle.ch	2024-06-05 10:55:05 UTC (rev 71440)
@@ -252,7 +252,7 @@
 their |equiv| value contains the corresponding numeric value plus $2^{30}$.
 @z
 
- at x [5.47] l.868 - to delimit arguments).
+ at x [5.47] l.868 - Add parametric2 macros (macros that use [] to delimit arguments).
 \yskip\hang |parametric| identifiers have been defined to be parametric macros;
 like simple identifiers, their |equiv| value points to the replacement text.
 @y
@@ -273,7 +273,7 @@
 @!chopped_id:array [0..max_id_length] of ASCII_code; {chopped identifier}
 @z
 
- at x [6.53] l.960 - to delimit arguments).
+ at x [6.53] l.960 - Add parametric2 macros (macros that use [] to delimit arguments).
 |numeric|, |simple|, or |parametric|.
 @y
 |numeric|, |simple|, |parametric|, or |parametric2|.
@@ -327,7 +327,7 @@
   l:=l-double_chars-1;
 @z
 
- at x [9.85] l.1502 - to delimit arguments).
+ at x [9.85] l.1502 - Add parametric2 macros (macros that use [] to delimit arguments).
   begin if ilk[cur_name]=parametric then
 @y
   begin if (ilk[cur_name]=parametric) or (ilk[cur_name]=parametric2) then
@@ -339,13 +339,13 @@
 numeric: begin cur_val:=equiv[a]-@'10000000000; a:=number;
 @z
 
- at x [9.89] l.1590 - to delimit arguments).
+ at x [9.89] l.1590 - Add parametric2 macros (macros that use [] to delimit arguments).
 parametric: begin @<Put a parameter on the parameter stack,
 @y
 parametric,parametric2: begin @<Put a parameter on the parameter stack,
 @z
 
- at x [9.90] l.1607 - to delimit arguments).
+ at x [9.90] l.1607 - Add parametric2 macros (macros that use [] to delimit arguments).
 if (stack_ptr=0)or(tok_mem[zo,cur_byte]<>"(") then
 @y
 if (stack_ptr=0)or((ilk[a]=parametric)and(tok_mem[zo,cur_byte]<>"("))
@@ -352,7 +352,7 @@
     or((ilk[a]=parametric2)and(tok_mem[zo,cur_byte]<>"[")) then
 @z
 
- at x [9.93] l.1654 - to delimit arguments).
+ at x [9.93] l.1654 - Add parametric2 macros (macros that use [] to delimit arguments).
 bal:=1; incr(cur_byte); {skip the opening `\.('}
 @y
 bal:=1; incr(cur_byte); {skip the opening `\.(' or `['}
@@ -510,7 +510,7 @@
     add_in(equiv[q]-@'10000000000);
 @z
 
- at x [15.165] l.2964 - to delimit arguments).
+ at x [15.165] l.2964 - Add parametric2 macros (macros that use [] to delimit arguments).
   "(": incr(bal);
   ")": if bal=0 then err_print('! Extra )')
 @.Extra )@>
@@ -530,7 +530,7 @@
   "#": if (t=parametric)or(t=parametric2) then a:=param;
 @z
 
- at x [15.166] l.2988 - to delimit arguments).
+ at x [15.166] l.2988 - Add parametric2 macros (macros that use [] to delimit arguments).
   begin if bal=1 then err_print('! Missing )')
   else err_print('! Missing ',bal:1,' )''s');
 @.Missing n )@>
@@ -557,7 +557,7 @@
     end
 @z
 
- at x [16.173] l.3107 - to delimit arguments).
+ at x [16.173] l.3107 - Add parametric2 macros (macros that use [] to delimit arguments).
   else @<If the next text is `\.{(\#)==}', call |define_macro|
     and |goto continue|@>;
 @y
@@ -565,7 +565,7 @@
     and |goto continue|@>;
 @z
 
- at x [16.174] l.3114 - to delimit arguments).
+ at x [16.174] l.3114 - Add parametric2 macros (macros that use [] to delimit arguments).
 @ @<If the next text is `\.{(\#)==}'...@>=
 if next_control="(" then
   begin next_control:=get_next;

Modified: trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py
===================================================================
--- trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-05 09:28:10 UTC (rev 71439)
+++ trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-05 10:55:05 UTC (rev 71440)
@@ -158,7 +158,7 @@
             text = self._lines[self._chunk_start][2:].strip()
 
             # Remove potentially leading [part.section] tag.
-            pattern = "\\[.*\\]"
+            pattern = "\\[\\d+(\\.\\d+)?\\]"
             if re.match(pattern, text):
                 text = re.sub(pattern, "", text).strip()
 

Modified: trunk/Build/source/texk/web2c/weave.ch
===================================================================
--- trunk/Build/source/texk/web2c/weave.ch	2024-06-05 09:28:10 UTC (rev 71439)
+++ trunk/Build/source/texk/web2c/weave.ch	2024-06-05 10:55:05 UTC (rev 71440)
@@ -459,7 +459,7 @@
 @ @<Change |pp| to $\max(|scrap_base|,\,|pp+d|)$@>=
 @z
 
- at x [15.174] l.3344
+ at x [15.174] l.3344 - Rewrite 'squash' to match description in section [148].
 @ Similarly, the `|squash|' macro invokes a procedure called `|sq|'. This
 procedure takes advantage of the simplification that occurs when |k=1|.
 @y