From 18a4dbf5b45434b7b4b21d7d83083f7575e9f3dd Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 5 Jun 2024 10:55:05 +0000 Subject: [WEB] Restore @x comments with square brackets. The initial regex was too gready. git-svn-id: svn://tug.org/texlive/trunk@71440 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/tangle.ch | 20 ++++++++++---------- .../source/texk/web2c/tests/fix-changefile-lines.py | 2 +- Build/source/texk/web2c/weave.ch | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/tangle.ch b/Build/source/texk/web2c/tangle.ch index 6aff69fee60..066a7476581 100644 --- a/Build/source/texk/web2c/tangle.ch +++ b/Build/source/texk/web2c/tangle.ch @@ -252,7 +252,7 @@ their |equiv| value contains the corresponding numeric value plus $2^{15}$. their |equiv| value contains the corresponding numeric value plus $2^{30}$. @z -@x [5.47] l.868 - to delimit arguments). +@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 @@ the replacement text. @!chopped_id:array [0..max_id_length] of ASCII_code; {chopped identifier} @z -@x [6.53] l.960 - to delimit arguments). +@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 @@ else begin l:=l-double_chars-1; @z -@x [9.85] l.1502 - to delimit arguments). +@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,20 +339,20 @@ numeric: begin cur_val:=equiv[a]-@'100000; a:=number; numeric: begin cur_val:=equiv[a]-@'10000000000; a:=number; @z -@x [9.89] l.1590 - to delimit arguments). +@x [9.89] l.1590 - Add parametric2 macros (macros that use [] to delimit arguments). parametric: begin @"(") then @y if (stack_ptr=0)or((ilk[a]=parametric)and(tok_mem[zo,cur_byte]<>"(")) or((ilk[a]=parametric2)and(tok_mem[zo,cur_byte]<>"[")) then @z -@x [9.93] l.1654 - to delimit arguments). +@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 @@ equiv[p]:=accumulator+@'10000000000; {name |p| now is defined to equal |accumula add_in(equiv[q]-@'10000000000); @z -@x [15.165] l.2964 - to delimit arguments). +@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 @@ equiv[p]:=accumulator+@'10000000000; {name |p| now is defined to equal |accumula "#": if (t=parametric)or(t=parametric2) then a:=param; @z -@x [15.166] l.2988 - to delimit arguments). +@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 @@ equiv[p]:=accumulator+@'10000000000; {name |p| now is defined to equal |accumula end @z -@x [16.173] l.3107 - to delimit arguments). +@x [16.173] l.3107 - Add parametric2 macros (macros that use [] to delimit arguments). else @; @y @@ -565,7 +565,7 @@ equiv[p]:=accumulator+@'10000000000; {name |p| now is defined to equal |accumula and |goto continue|@>; @z -@x [16.174] l.3114 - to delimit arguments). +@x [16.174] l.3114 - Add parametric2 macros (macros that use [] to delimit arguments). @ @= if next_control="(" then begin next_control:=get_next; diff --git a/Build/source/texk/web2c/tests/fix-changefile-lines.py b/Build/source/texk/web2c/tests/fix-changefile-lines.py index 19b8c32233d..92b52c5c441 100755 --- a/Build/source/texk/web2c/tests/fix-changefile-lines.py +++ b/Build/source/texk/web2c/tests/fix-changefile-lines.py @@ -158,7 +158,7 @@ class ChangeReader: 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() diff --git a/Build/source/texk/web2c/weave.ch b/Build/source/texk/web2c/weave.ch index 50bca31216c..5a932e576ab 100644 --- a/Build/source/texk/web2c/weave.ch +++ b/Build/source/texk/web2c/weave.ch @@ -459,7 +459,7 @@ if k>0 then @ @= @z -@x [15.174] l.3344 +@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 -- cgit v1.2.3