texlive[71459] Build/source/texk/web2c: [CWEB] Ignore @<comment@> in

commits+ascherer at tug.org commits+ascherer at tug.org
Sun Jun 9 14:27:47 CEST 2024


Revision: 71459
          https://tug.org/svn/texlive?view=revision&revision=71459
Author:   ascherer
Date:     2024-06-09 14:27:46 +0200 (Sun, 09 Jun 2024)
Log Message:
-----------
[CWEB] Ignore @<comment@> in ctwill-w2c.ch.

Section 'Index' of COMMON.W is on Level 1, not 0.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/comm-mini.ch
    trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch
    trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
    trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2024-06-08 23:44:58 UTC (rev 71458)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2024-06-09 12:27:46 UTC (rev 71459)
@@ -1,3 +1,10 @@
+2024-06-09  Andreas Scherer  <https://ascherer.github.io>
+
+	* comm-mini.ch,
+	* comm-w2c.ch: Section 'Index.' is on Level 1, not 0.
+	* ctwill-w2c.ch,
+	* ../tests/fix-changefile-lines.py: Ignore CWEB @<comment@> line(s).
+
 2024-06-06  Andreas Scherer  <https://ascherer.github.io>
 
 	* comm-w2c.ch,

Modified: trunk/Build/source/texk/web2c/cwebdir/comm-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/comm-mini.ch	2024-06-08 23:44:58 UTC (rev 71458)
+++ trunk/Build/source/texk/web2c/cwebdir/comm-mini.ch	2024-06-09 12:27:46 UTC (rev 71459)
@@ -283,6 +283,6 @@
 Section 85/102.
 
 @x
-@** Index.
+@* Index.
 @y
 @z

Modified: trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch	2024-06-08 23:44:58 UTC (rev 71458)
+++ trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch	2024-06-09 12:27:46 UTC (rev 71459)
@@ -888,5 +888,5 @@
 @.cweb.mo@>
 }
 
-@** Index.
+@* Index.
 @z

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2024-06-08 23:44:58 UTC (rev 71458)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2024-06-09 12:27:46 UTC (rev 71459)
@@ -1270,7 +1270,7 @@
             (ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps);
 @z
 
- at x [13.269] l.4884
+ at x [14.270] l.4884
 @** Index.
 @y
 @q Section 270. @>

Modified: trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py
===================================================================
--- trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-08 23:44:58 UTC (rev 71458)
+++ trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-09 12:27:46 UTC (rev 71459)
@@ -156,7 +156,11 @@
             # Attempt to catch the case where something is inserted just before
             # the start of a section.
             match_start = self._match_lines[0].strip()[:2]
-            repl_start = self._lines[self._pos + 1].strip()[:2]
+            for repl_index in range(self._pos + 1, len(self._lines)):
+                repl_start = self._lines[repl_index].strip()[:2]
+                # CWEB @<comments@> are ignored; see ctwill-w2c.ch
+                if repl_start != "@q":
+                    break
             if match_start == "@ ":
                 if repl_start in ["@ ", "@*"]:
                     section += 1



More information about the tex-live-commits mailing list.