diff options
author | Andreas Scherer <andreas_tex@freenet.de> | 2020-04-27 15:10:54 +0000 |
---|---|---|
committer | Andreas Scherer <andreas_tex@freenet.de> | 2020-04-27 15:10:54 +0000 |
commit | 63703a242cd8ba25502923c64c3b75a618c2125b (patch) | |
tree | e48a427f73e4dacaf2a12576c0b66ae9c14b2d2d /Build | |
parent | cbd721a93e857c65e4e12e99f4b654cdbc437725 (diff) |
[TIE] Editorial modifications for tie.w.
git-svn-id: svn://tug.org/texlive/trunk@54908 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/web2c/tiedir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/tiedir/tie-w2c.ch | 76 |
2 files changed, 79 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/tiedir/ChangeLog b/Build/source/texk/web2c/tiedir/ChangeLog index 45b33a70d4b..036e7cafed0 100644 --- a/Build/source/texk/web2c/tiedir/ChangeLog +++ b/Build/source/texk/web2c/tiedir/ChangeLog @@ -1,3 +1,7 @@ +2020-04-27 Andreas Scherer <https://ascherer.github.io> + + * tie-w2c.ch: Editorial modifications for ctie.w. + 2020-04-26 Andreas Scherer <https://ascherer.github.io> * tie-w2c.ch: Fix several typos in tie.w. diff --git a/Build/source/texk/web2c/tiedir/tie-w2c.ch b/Build/source/texk/web2c/tiedir/tie-w2c.ch index c5d913a43af..cb27e004283 100644 --- a/Build/source/texk/web2c/tiedir/tie-w2c.ch +++ b/Build/source/texk/web2c/tiedir/tie-w2c.ch @@ -46,12 +46,66 @@ typedef char* string; #include <stdio.h> @y #include "cpascal.h" -#include <stdio.h> #include <kpathsea/kpathsea.h> /* Also redefine |usage| to avoid clash with function from lib. */ #define usage tieusage @z +Section 16: Remove redundant #include directives. + +@x l.483 +This should cause no trouble in any \Cl\ program. +@^system dependencies@> + +@<Global |#include|s@>= +#ifdef __STDC__ +#include <stdlib.h> +#else +#include <malloc.h> +#endif +@y +This should cause no trouble in any \Cl\ program. +The \.{kpathsea} include files handle the definition of |malloc()|, +too. +@^system dependencies@> +@z + +Sections 18 and 19: use enum as requested in tie.w + +@x l.530 +#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)| */ +@y +typedef enum { + search, + test, + reading, + ignore } in_file_modes; +typedef enum { + unknown, + master, + chf } file_types; +@z + +@x l.548 +#define normal 0 +#define pre 1 +#define post 2 +typedef int out_md_type; /* should be |enum(normal,pre,post)| */ +@y +typedef enum { + normal, + pre, + post } out_md_type; +@z + @x l.617 void get_line(i) file_index i; @@ -144,6 +198,26 @@ a line to write and |test_input| ist set to |none|. a line to write and |test_input| is set to |none|. @z +Section 48: fix indentation of nested loop. + +@x l.1044 +if (prod_chf==chf) { + loop @+ { + @<Test for normal, |break| when done@>@; + @<Test for pre, |break| when done@>@; + @<Test for post, |break| when done@>@; + } +} else +@y +if (prod_chf==chf) + loop @+ { + @<Test for normal, |break| when done@>@; + @<Test for pre, |break| when done@>@; + @<Test for post, |break| when done@>@; + } +else +@z + @x void usage() { |