texlive[71439] Build/source/texk/web2c: Restore @x comment.

[commits+ascherer at tug.org]

Revision: 71439
          https://tug.org/svn/texlive?view=revision&revision=71439
Author:   ascherer
Date:     2024-06-05 11:28:10 +0200 (Wed, 05 Jun 2024)
Log Message:
-----------
Restore @x comment.

Only replace leading '-' in @x comments.

Also fix special case "@
@c" (with or without following space after '@').

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

Modified: trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py
===================================================================
--- trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-05 07:17:31 UTC (rev 71438)
+++ trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-05 09:28:10 UTC (rev 71439)
@@ -75,7 +75,7 @@
             self.part_cnt += 1
             self.section_cnt += 1
 
-        if re.search("^@ ", line):
+        if re.search("^@ ", line) or line == "@":
             self.section_cnt += 1
 
         return (part, section, line_number), line
@@ -169,7 +169,7 @@
                     pattern = " -+ "
                     # Remove potentially text comment separator.
                     if re.match(pattern, text):
-                        text = re.sub(pattern, "", text).strip()
+                        text = re.sub(pattern, "", text, 1).strip()
 
             # Create line with standard tag.
             new_line = f"@x [{part}.{section}] l.{line_number}"

Modified: trunk/Build/source/texk/web2c/tex.ch
===================================================================
--- trunk/Build/source/texk/web2c/tex.ch	2024-06-05 07:17:31 UTC (rev 71438)
+++ trunk/Build/source/texk/web2c/tex.ch	2024-06-05 09:28:10 UTC (rev 71439)
@@ -2151,7 +2151,7 @@
   begin job_name:=get_job_name(cur_name); open_log_file;
 @z
 
- at x [29.537] l.10390 - -
+ at x [29.537] l.10390
 if term_offset+length(name)>max_print_line-2 then print_ln
 else if (term_offset>0)or(file_offset>0) then print_char(" ");
 print_char("("); incr(open_parens); slow_print(name); update_terminal;
@@ -3372,7 +3372,7 @@
 @!flushable_string:str_number; {string not yet referenced}
 @y
 @z
- at x [49.1260] l.23409 - new_font: string recyclingalready done
+ at x [49.1260] l.23409 - new_font: string recycling -- already done
 flushable_string:=str_ptr-1;
 @y
 @z
@@ -3391,7 +3391,7 @@
 %
 % otherwise the wrong string will get removed by |flush_string|!!
 %
- at x [49.1260] l.23412 - new_font: string recyclingalready done
+ at x [49.1260] l.23412 - new_font: string recycling -- already done
     begin if cur_name=flushable_string then
       begin flush_string; cur_name:=font_name[f];
       end;