summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2024-06-09 12:27:46 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2024-06-09 12:27:46 +0000
commitb84d183204934d306447909148c69fd2f4b52d9d (patch)
treef78786773718f495ca4ee843891a47fda8eea01b /Build/source
parent1f99af729a619d5735f29af78742fed01b81b20f (diff)
[CWEB] Ignore @<comment@> in ctwill-w2c.ch.
Section 'Index' of COMMON.W is on Level 1, not 0. git-svn-id: svn://tug.org/texlive/trunk@71459 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-mini.ch2
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch2
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-w2c.ch2
-rwxr-xr-xBuild/source/texk/web2c/tests/fix-changefile-lines.py6
5 files changed, 15 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index a3665a07ee9..66e106f64bf 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -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,
diff --git a/Build/source/texk/web2c/cwebdir/comm-mini.ch b/Build/source/texk/web2c/cwebdir/comm-mini.ch
index 56356a366a3..d1bd623b2a2 100644
--- a/Build/source/texk/web2c/cwebdir/comm-mini.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-mini.ch
@@ -283,6 +283,6 @@ Section 96.
Section 85/102.
@x
-@** Index.
+@* Index.
@y
@z
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index a4a1aa8f38e..f87aa845428 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -888,5 +888,5 @@ void cb_show_banner (void)
@.cweb.mo@>
}
-@** Index.
+@* Index.
@z
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
index d2e953401c4..9ad6bf3acba 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
@@ -1270,7 +1270,7 @@ out_name(cur_name,proofing);
(ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps);
@z
-@x [13.269] l.4884
+@x [14.270] l.4884
@** Index.
@y
@q Section 270. @>
diff --git a/Build/source/texk/web2c/tests/fix-changefile-lines.py b/Build/source/texk/web2c/tests/fix-changefile-lines.py
index 10dd32dcd03..c2f0ebc5d8e 100755
--- a/Build/source/texk/web2c/tests/fix-changefile-lines.py
+++ b/Build/source/texk/web2c/tests/fix-changefile-lines.py
@@ -156,7 +156,11 @@ class ChangeReader:
# 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