texlive[54907] Build/source/texk/web2c/ctiedir: [CTIE] Editorial

[commits+ascherer at tug.org]

Revision: 54907
          http://tug.org/svn/texlive?view=revision&revision=54907
Author:   ascherer
Date:     2020-04-27 16:41:41 +0200 (Mon, 27 Apr 2020)
Log Message:
-----------
[CTIE] Editorial modifications of ctie.w.

Reading ctie.pdf results in some CWEB hackery.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ctiedir/ChangeLog
    trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch

Modified: trunk/Build/source/texk/web2c/ctiedir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ctiedir/ChangeLog	2020-04-27 08:33:45 UTC (rev 54906)
+++ trunk/Build/source/texk/web2c/ctiedir/ChangeLog	2020-04-27 14:41:41 UTC (rev 54907)
@@ -1,3 +1,7 @@
+2020-04-27  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctie-k.ch: Editorial modifications for ctie.w.
+
 2020-04-26  Andreas Scherer  <https://ascherer.github.io>
 
 	* ctie-k.ch: Fix several typos in ctie.w.

Modified: trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch
===================================================================
--- trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch	2020-04-27 08:33:45 UTC (rev 54906)
+++ trunk/Build/source/texk/web2c/ctiedir/ctie-k.ch	2020-04-27 14:41:41 UTC (rev 54907)
@@ -35,10 +35,16 @@
 @x l.105 Set up kpathsea stuff
     @<Initialise parameters@>;
 @y
-    @<Set up |PROGNAME| feature and initialise the search path mechanism@>;
-    @<Initialise parameters@>;
+    @<Set up |PROGNAME| feature and initialise the search path mechanism@>@;
+    @<Initialise parameters@>@;
 @z
 
+ at x l.107
+    @<Print the banners@>;
+ at y
+    @<Print the banners@>@;
+ at z
+
 boolean and string are defined by kpathsea.
 @x l.116
 @ We include the additional types |boolean| and |string|.  \.{CTIE}
@@ -58,9 +64,9 @@
 the original \.{WEB} system) with the standard \.{CWEB} behaviour, and
 so uses the |char| type for input and output.
 
-The |kpathsea| library (version 3.4.5 and higher) defines the |true|, |false|,
-|boolean| and |string| types in \.{kpathsea/types.h}, so we do not actually
-need to define them here.
+The \.{kpathsea} library (version 3.4.5 and higher) defines the |true|,
+|false|, |boolean| and |string| types in \.{kpathsea/types.h}, so we do not
+actually need to define them here.
 
 @s boolean int
 @s string int
@@ -96,11 +102,17 @@
 This variable must be initialised.
 @z
 
- at x l.173 The kpathsea include files must be first.
+ at x l.170 The kpathsea include files must be first.
+predefined as we include the \.{stdio.h} definitions.
+
+@<Global \&{\#include}s@>=
 #include <stdio.h>
 @y
+predefined as we include the \.{stdio.h} definitions
+through the \.{kpathsea} interface.
+
+@<Global \&{\#include}s@>=
 #include <kpathsea/kpathsea.h>
-#include <stdio.h>
 @z
 
 @x l.176 And this.
@@ -128,6 +140,42 @@
 files) are treated the same way.  To organise the
 @z
 
+Sections 10 and 11: use enum as requested in ctie.w
+
+ at x l.212
+#define search 0
+#define test 1
+#define reading 2
+#define ignore 3
+typedef int in_file_modes; /* should be |enum(search, test, reading, ignore)| */
+#define unknown 0
+#define master 1
+#define chf 2
+typedef int file_types; /* should be |enum(unknown, master, chf)| */
+ at y
+typedef enum {
+    search,
+    test,
+    reading,
+    ignore } in_file_modes;
+typedef enum {
+    unknown,
+    master,
+    chf } file_types;
+ at z
+
+ at x l.230 dito
+#define normal 0
+#define pre 1
+#define post 2
+typedef int out_md_type; /* should be |enum(normal, pre, post)| */
+ at y
+typedef enum {
+    normal,
+    pre,
+    post } out_md_type;
+ at z
+
 @x l.284 way too short!
 @d max_file_name_length 60
 @y
@@ -439,6 +487,20 @@
 }
 @z
 
+Section 63: use 'none' more than once.
+
+ at x l.1169
+(which is the case if |no_ch==(-1)|) or if the next element of
+ at y
+(which is the case if |no_ch==none|) or if the next element of
+ at z
+
+ at x l.1174
+    if (no_ch==(-1)) {
+ at y
+    if (no_ch==none) {
+ at z
+
 @x l.1218
 string CTIEHELP[] = {
     "Usage: ctie -[mc] outfile master changefile(s)",
@@ -517,7 +579,7 @@
 module number.
 @^system dependencies@>
 @y
-@* System-dependent changes.
+@* System-dependent changes.@^system dependencies@>
 The \.{ctie} program from the original \.{CTIE} package uses the
 compile-time default directory or the value of the environment
 variable \.{CWEBINPUTS} as an alternative place to be searched for
@@ -547,6 +609,6 @@
 filenames.  This allows different flavors of \.{CTIE} to have
 different search paths.
 
-@<Set up |PROGNAME| feature and initialise the search path mechanism@>=
+@<Set up |PROGNAME| feature...@>=
 kpse_set_program_name(argv[0], "ctie");
 @z