texlive[71555] Build/source/texk/web2c: [CTIE] Recreate change file

[commits+ascherer at tug.org]

Revision: 71555
          https://tug.org/svn/texlive?view=revision&revision=71555
Author:   ascherer
Date:     2024-06-18 16:45:49 +0200 (Tue, 18 Jun 2024)
Log Message:
-----------
[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'.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ctiedir/ChangeLog
    trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch
    trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py

Modified: trunk/Build/source/texk/web2c/ctiedir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ctiedir/ChangeLog	2024-06-17 23:41:51 UTC (rev 71554)
+++ trunk/Build/source/texk/web2c/ctiedir/ChangeLog	2024-06-18 14:45:49 UTC (rev 71555)
@@ -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 at t-lab.opal.ne.jp>
 
 	* ctie.test: Make easier to test on Windows.

Modified: trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch
===================================================================
--- trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch	2024-06-17 23:41:51 UTC (rev 71554)
+++ trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch	2024-06-18 14:45:49 UTC (rev 71555)
@@ -65,7 +65,7 @@
 @z
 
 @x [1] l.81
- at d copyright 
+ at 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 @@
 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 @@
 @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 @@
         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) {

Modified: trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py
===================================================================
--- trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-17 23:41:51 UTC (rev 71554)
+++ trunk/Build/source/texk/web2c/tests/fix-changefile-lines.py	2024-06-18 14:45:49 UTC (rev 71555)
@@ -198,7 +198,7 @@
                     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 @@
 
             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 @@
             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)