summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2024-06-18 14:45:49 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2024-06-18 14:45:49 +0000
commit63c2dff8f2171f2f487ad3b3736d3b3a8edfe5e0 (patch)
tree87c5bbcd1c98c2bc11a4382bae1c59c2cca1615c /Build/source/texk/web2c
parent313536bcf96e2691d695674d17fef3f58e327bf8 (diff)
[CTIE] Recreate change file with 'f-c-l -ph ctie.w ctie-k.ch'.
A few changes to 'fix-changefile-lines.py': * Print 'Old:' vs 'New:' differences to 'stderr'. * Avoid double space when using option '-h'. git-svn-id: svn://tug.org/texlive/trunk@71555 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/ctiedir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ctiedir/ctie-k.ch8
-rwxr-xr-xBuild/source/texk/web2c/tests/fix-changefile-lines.py16
3 files changed, 15 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog
index 9161b12edc8..2e32440a7c3 100644
--- a/Build/source/texk/web2c/ctiedir/ChangeLog
+++ b/Build/source/texk/web2c/ctiedir/ChangeLog
@@ -1,3 +1,7 @@
+2024-06-18 Andreas Scherer <https://ascherer.github.io>
+
+ * ctie-k.ch: Recreate with 'f-c-l -ph ctie.w ctie-k.ch'.
+
2023-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* ctie.test: Make easier to test on Windows.
diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch
index e4f258ffbaf..de1f4542400 100644
--- a/Build/source/texk/web2c/ctiedir/ctie-k.ch
+++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch
@@ -65,7 +65,7 @@ permission notice identical to this one.
@z
@x [1] l.81
-@d copyright
+@d copyright
"Copyright 2002,2003 Julian Gilbey. All rights reserved. There is no warranty.\n\
Run with the --version option for other important information."
@y
@@ -304,7 +304,7 @@ The next piece is simplified using the kpathsea kpse_find_file
function.
@x [27] l.497
-If the environment variable \.{CWEBINPUTS} is set, or if the compiler flag
+If the environment variable \.{CWEBINPUTS} is set, or if the compiler flag
of the same name was defined at compile time,
\.{CWEB} will look for include files in the directory thus named, if
it cannot find them in the current directory.
@@ -315,7 +315,7 @@ variable) to search for this file.@.CWEBINPUTS@>
@z
@x [27] l.510 Don't need the same variables any longer
- char temp_file_name[max_file_name_length];
+ char temp_file_name[max_file_name_length];
char *file_name_end;
char *k, *kk;
int l; /* length of file name */
@@ -344,7 +344,7 @@ variable) to search for this file.@.CWEBINPUTS@>
if ((l=strlen(CWEBINPUTS))>max_file_name_length-2) too_long();
strcpy(temp_file_name, CWEBINPUTS);
#else
- l=0;
+ l=0;
#endif /* |CWEBINPUTS| */
}
if (l>0) {
diff --git a/Build/source/texk/web2c/tests/fix-changefile-lines.py b/Build/source/texk/web2c/tests/fix-changefile-lines.py
index facce1bf5c3..7efcdf3146a 100755
--- a/Build/source/texk/web2c/tests/fix-changefile-lines.py
+++ b/Build/source/texk/web2c/tests/fix-changefile-lines.py
@@ -198,7 +198,7 @@ class ChangeReader:
text = re.sub(pattern, "", text, 1)
# Remove potentially text comment separator.
- pattern = " -+ "
+ pattern = " -*"
if re.match(pattern, text):
text = re.sub(pattern, "", text, 1).strip()
@@ -223,11 +223,11 @@ class ChangeReader:
ch_line = self._lines[self._chunk_start]
if new_line[:10] != ch_line[:10]:
- print("Old:")
- print(f" {ch_line}")
- print("New:")
- print(f" {new_line}")
- print()
+ eprint("Old:")
+ eprint(f" {ch_line}")
+ eprint("New:")
+ eprint(f" {new_line}")
+ eprint()
self._lines[self._chunk_start] = new_line
@@ -253,9 +253,7 @@ class OptHandler:
opts, self.args = getopt.getopt(sys.argv[1:], "pslht",
["parts", "sections", "lines", "hyphens", "texts"])
except getopt.GetoptError as err:
- eprint(f"""
-{os.path.basename(sys.argv[0])}: {err}!
-""")
+ eprint(f"\n{os.path.basename(sys.argv[0])}: {err}!\n")
print(USAGE)
sys.exit(1)