From 3e2a2bff9b01e23879cedcaddd318d776bdf9b24 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Sun, 26 Apr 2020 11:51:04 +0000 Subject: [CTIE] Make ctie/ctie-k TeXable. Preserve section numbers of stand-alone ctie.w by moving two new sections with KPathSea material to section 70. System-dependent changes. Improve formatting of item list. Use $TEXMFDOTDIR in description, as in CWEB's comm-w2c.ch. git-svn-id: svn://tug.org/texlive/trunk@54885 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ctiedir/ChangeLog | 1 + Build/source/texk/web2c/ctiedir/ctie-k.ch | 77 ++++++++++++++++--------------- 2 files changed, 42 insertions(+), 36 deletions(-) (limited to 'Build/source/texk/web2c/ctiedir') diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog index 8274d7932f9..357fa3aca8c 100644 --- a/Build/source/texk/web2c/ctiedir/ChangeLog +++ b/Build/source/texk/web2c/ctiedir/ChangeLog @@ -2,6 +2,7 @@ * ctie-k.ch: Fix several typos in ctie.w. Use British English also in the changefile. + Make the result TeXable, preserving section numbers. 2014-06-18 Peter Breitenlohner diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch index d7b864c7b00..88c5d479f69 100644 --- a/Build/source/texk/web2c/ctiedir/ctie-k.ch +++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch @@ -39,8 +39,7 @@ int main (int argc, string *argv) @; @z -These are defined by kpathsea; we replace this by the path-searching -initialisation code taken almost verbatim from comm-w2c.ch. +boolean and string are defined by kpathsea. @x l.116 @ We include the additional types |boolean| and |string|. \.{CTIE} replaces the complex \.{TIE} character set handling (based on that of @@ -54,44 +53,17 @@ so uses the |char| type for input and output. typedef int boolean; typedef char* string; @y -@ 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 -files, if they could not be found in the current directory. - -This version uses the \Kpathsea/ mechanism for searching files. -The directories to be searched for come from three sources: - - (a)~a user-set environment variable \.{CWEBINPUTS} - (overridden by \.{CWEBINPUTS\_ctie});\par - (b)~a line in \Kpathsea/ configuration file \.{texmf.cnf},\hfil\break - e.g. \.{CWEBINPUTS=.:$TEXMF/texmf/cweb//} - or \.{CWEBINPUTS.ctie=.:$TEXMF/texmf/cweb//};\hangindent=2\parindent\par - (c)~compile-time default directories \.{.:$TEXMF/texmf/cweb//} - (specified in \.{texmf.in}). - -@d kpse_find_cweb(name) kpse_find_file(name, kpse_cweb_format, true) - -@ The simple file searching is replaced by the `path searching' -mechanism that the \Kpathsea/ library provides. - -We set |kpse_program_name| to |"ctie"|. This means if the variable -|CWEBINPUTS.ctie| is present in \.{texmf.cnf} (or |CWEBINPUTS_ctie| in -the environment) its value will be used as the search path for -filenames. This allows different flavors of \.{CTIE} to have -different search paths. - -@= -kpse_set_program_name(argv[0], "ctie"); - @ We include the additional types |boolean| and |string|. \.{CTIE} replaces the complex \.{TIE} character set handling (based on that of 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) 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 @z @x l.129 The kpathsea include files find the right header file for these. @@ -528,6 +500,9 @@ print_version_and_exit (const_string name, const_string version) } @z +We use the path-searching initialisation code +taken almost verbatim from comm-w2c.ch. + @x l.1267 @* System-dependent changes. This section should be replaced, if necessary, by @@ -542,5 +517,35 @@ module number. @^system dependencies@> @y @* System-dependent changes. -There are no additional changes. +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 +files, if they could not be found in the current directory. + +This version uses the \Kpathsea/ mechanism for searching files. +The directories to be searched for come from three sources: +\smallskip +{\parindent5em +\item{(a)} a user-set environment variable \.{CWEBINPUTS} + (overridden by \.{CWEBINPUTS\_ctie}); +\item{(b)} a line in \Kpathsea/ configuration file \.{texmf.cnf},\hfil\break + e.g., \.{CWEBINPUTS=\$TEXMFDOTDIR:\$TEXMF/texmf/cweb//}\hfil\break + or \.{CWEBINPUTS.ctie=\$TEXMFDOTDIR:\$TEXMF/texmf/cweb//}; +\item{(c)} compile-time default directories (specified in + \.{texmf.in}),\hfil\break + i.e., \.{\$TEXMFDOTDIR:\$TEXMF/texmf/cweb//}.\par} + +@d kpse_find_cweb(name) kpse_find_file(name, kpse_cweb_format, true) + +@ The simple file searching is replaced by the `path searching' +mechanism that the \Kpathsea/ library provides. + +We set |kpse_program_name| to |"ctie"|. This means if the variable +|CWEBINPUTS.ctie| is present in \.{texmf.cnf} (or |CWEBINPUTS_ctie| in +the environment) its value will be used as the search path for +filenames. This allows different flavors of \.{CTIE} to have +different search paths. + +@= +kpse_set_program_name(argv[0], "ctie"); @z -- cgit v1.2.3