summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2024-06-15 09:19:04 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2024-06-15 09:19:04 +0000
commitd14bbf1a23125974e3298b68582ce9f2bf465558 (patch)
treed00fe4317157f952046afe993a28ec35885bb8eb /Build
parentc3d711a4dcebdcdb9493e05747bb4ed1d689151a (diff)
[WEB] Output '@x' with optional information.
E.g., 'fix-changefile-lines -hlp dvicopy.{wen,ch}' prints only '@x [section] text' lines. ('[137/138]' was replaced with '[137]'.) git-svn-id: svn://tug.org/texlive/trunk@71530 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/dvicopy.ch24
-rwxr-xr-xBuild/source/texk/web2c/tests/fix-changefile-lines.py56
3 files changed, 65 insertions, 20 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 025a70eb69c..543468fd749 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-15 Andreas Scherer <https://ascherer.github.io>
+
+ * tests/fix-changefile-lines.py,
+ * dvicopy.ch: Output '@x' with optional information.
+
2024-06-05 Andreas Scherer <https://ascherer.github.io>
* tests/fix-changefile-lines.py,
diff --git a/Build/source/texk/web2c/dvicopy.ch b/Build/source/texk/web2c/dvicopy.ch
index 7ae1ecba2e7..6e3a35fe694 100644
--- a/Build/source/texk/web2c/dvicopy.ch
+++ b/Build/source/texk/web2c/dvicopy.ch
@@ -36,7 +36,7 @@ calls the `|jump_out|' procedure, which goes to the label |final_end|.
@y
calls the `|jump_out|' procedure.
@z
-@x
+@x [3]
label final_end;
@y
@z
@@ -85,7 +85,7 @@ procedure initialize; {this procedure gets things started properly}
% [7] Rename the integer types, as they collide with names used by C99.
% Rather than change the code all over the place, we use macros to do
% the renaming. This could also be done at C preprocessor level.
-@x
+@x [7]
@d int_32 == integer {signed 32~bit integers}
@y
@d int_32 == integer {signed 32~bit integers}
@@ -103,7 +103,7 @@ procedure initialize; {this procedure gets things started properly}
% [11] Redirect output, so it can go to either stdout or stderr,
% depending on where the output dvi file is going.
-@x
+@x [11]
@d print(#)==write(output,#)
@d print_ln(#)==write_ln(output,#)
@d new_line==write_ln(output) {start new line}
@@ -122,7 +122,7 @@ procedure initialize; {this procedure gets things started properly}
% [15] The text_char type is used as an array index into xord. The
% default type `char' produces signed integers, which are bad array
% indices in C.
-@x
+@x [15]
@d text_char == char {the data type of characters in text files}
@d first_text_char=0 {ordinal number of the smallest element of |text_char|}
@d last_text_char=127 {ordinal number of the largest element of |text_char|}
@@ -143,7 +143,7 @@ by a call on some system procedure that quietly terminates the program.
@y
so a procedure called |jump_out| has been introduced.
@z
-@x
+@x [23]
@d abort(#)==begin print_ln(' ',#,'.'); jump_out;
end
@@ -175,7 +175,7 @@ says |confusion(|indication of where we are|)|.
@y
says |confusion|(indication of where we are).
@z
-@x
+@x [24]
procedure confusion(@!p:pckt_pointer);
@y
noreturn procedure confusion(@!p:pckt_pointer);
@@ -229,24 +229,24 @@ to |make_font_name|.
% [67] No conversion of filenames in lower case, and initialize and
% terminate for C strings. Eliminate now unused variable.
-@x
+@x [67]
@!c:char; {a character to be appended to |cur_name|}
@y
@z
-@x
+@x [67]
cur_loc:=pckt_start[n]; cur_limit:=pckt_start[n+1];
@y
cur_name := xmalloc_array (char, pckt_length (n) + pckt_length (e));
cur_loc:=pckt_start[n]; cur_limit:=pckt_start[n+1];
@z
-@x
+@x [67]
if (b>="a")and(b<="z") then Decr(b)(("a"-"A")); {convert to upper case}
@y
@z
-@x
+@x [67]
cur_loc:=pckt_start[e]; cur_limit:=pckt_start[e+1];
while cur_loc<cur_limit do
begin pckt_extract(b); append_res_to_name(xchr[b]);
@@ -380,7 +380,7 @@ id3(".")("V")("F")(vf_ext); {file name extension for \.{VF} files}
id3(".")("v")("f")(vf_ext); {file name extension for \.{VF} files}
@z
-@x [137/138] Set default directory name
+@x [137] Set default directory name
@ If no font directory has been specified, \.{\title} is supposed to use
the default \.{VF} directory, which is a system-dependent place where
the \.{VF} files for standard fonts are kept.
@@ -488,7 +488,7 @@ end;
dialog; {get options}
@y
@z
-@x
+@x [241]
final_end:end.
@y
end.
diff --git a/Build/source/texk/web2c/tests/fix-changefile-lines.py b/Build/source/texk/web2c/tests/fix-changefile-lines.py
index 647cbbf54cf..1efad3be400 100755
--- a/Build/source/texk/web2c/tests/fix-changefile-lines.py
+++ b/Build/source/texk/web2c/tests/fix-changefile-lines.py
@@ -7,22 +7,49 @@ Reads a WEB file and a change file and writes a change file to stdout with
potentially corrected part, section and line numbers.
Written by Tyge Tiessen, 2024. Public domain.
"""
+import getopt
import re
import sys
USAGE = f"{sys.argv[0]} <web file> <change file>"
+# Optional elements of "@x [{part}.{section}] l.{line} {-(hyphen)} {text}
+part_b, section_b, line_b, hyphen_b, text_b = True, True, True, True, True
+
def main():
- if len(sys.argv) != 3:
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "pslht",
+ ["parts", "sections", "lines", "hyphens", "texts"])
+ except getopt.GetoptErr as err:
+ print(USAGE)
+ sys.exit(1)
+
+ global part_b, section_b, line_b, hyphen_b, text_b
+
+ for opt, _ in opts:
+ if opt in ("-p", "--parts"):
+ part_b = False
+ elif opt in ("-s", "--sections"):
+ section_b = False
+ elif opt in ("-l", "--lines"):
+ line_b = False
+ elif opt in ("-h", "--hyphens"):
+ hyphen_b = False
+ elif opt in ("-t", "--texts"):
+ text_b = False
+ else:
+ assert False, f"Unhandled option {opt}"
+
+ if len(args) != 2:
print(USAGE)
sys.exit(1)
# Read WEB file
- web_reader = WebReader(sys.argv[1])
+ web_reader = WebReader(args[0])
# Read change file
- ch_reader = ChangeReader(sys.argv[2])
+ ch_reader = ChangeReader(args[1])
# Run through the two files in parallel
ch_reader.traverse(web_reader)
@@ -189,11 +216,24 @@ class ChangeReader:
if re.match(pattern, text):
text = re.sub(pattern, "", text, 1).strip()
- # Create line with standard tag.
- new_line = f"@x [{part}.{section}] l.{line_number}"
-
- if text:
- new_line += f" - {text}"
+ # Create line with standard tag and optional information.
+ new_line = f"@x"
+ if part_b or section_b:
+ new_line += f" ["
+ if part_b:
+ new_line += f"{part}"
+ if part_b and section_b:
+ new_line += f"."
+ if section_b:
+ new_line += f"{section}"
+ new_line += f"]"
+ if line_b:
+ new_line += f" l.{line_number}"
+
+ if text_b and text:
+ if hyphen_b:
+ new_line += f" -"
+ new_line += f" {text}"
ch_line = self._lines[self._chunk_start]
if new_line[:10] != ch_line[:10]: