[CWEB] Clearer exposition re external type definitions.

A few underlined index entries added and one index entry removed.

git-svn-id: svn://tug.org/texlive/trunk@55841 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 26 insertions, 17 deletions

diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index b5855c33653..132c4a6f651 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,9 @@
+2020-07-15  Andreas Scherer  <https://ascherer.github.io>
+
+	* comm-w2c.ch,
+	* comm-w2c.hch,
+	* ctwill-mini.ch: Clearer exposition re external type definitions.
+
 2020-07-08  Andreas Scherer  <https://ascherer.github.io>
 
 	* cwebman-w2c.ch,
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 732f55a5e9e..292b790a8a7 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -1244,7 +1244,7 @@ static void prime_the_change_buffer(void);@/
 
 @* Standard C library interfaces.  This updated version of \.{CWEB} uses
 standard C types for boolean values, pointers, and objects with fixed sizes
-(already in \Kpathsea/).
+(|@!uint8_t|, |@!uint16_t|; already in \Kpathsea/).
 
 @<Include files@>=
 #include <stdbool.h> /* type definition of |bool| */
@@ -1253,8 +1253,6 @@ standard C types for boolean values, pointers, and objects with fixed sizes
 @ The |scan_args| and |cb_show_banner| routines and the |bindtextdomain|
 argument string need a few extra variables.
 
-@s string int
-
 @d max_banner 50
 
 @d PATH_SEPARATOR   separators[0]
@@ -1285,7 +1283,7 @@ This is just a shortcut for the `|@!gettext|' function from the ``GNU~gettext
 utilities.'' For systems that do not have this library installed, we wrap
 things for neutral behavior without internationalization.
 
-@d _(STRING) gettext(STRING)
+@d _(S) gettext(S)
 
 @<Include files@>=
 #ifndef HAVE_GETTEXT
@@ -1293,7 +1291,7 @@ things for neutral behavior without internationalization.
 #endif
 @#
 #if HAVE_GETTEXT
-#include <locale.h>
+#include <locale.h> /* |@!LC_MESSAGES|, |@!LC_CTYPE| */
 #include <libintl.h>
 #else
 #define setlocale(A,B) ""
@@ -1376,18 +1374,18 @@ The directories to be searched for come from three sources:
     i.e., \.{\$TEXMFDOTDIR:\$TEXMF/texmf/cweb//}.\par}
 @.CWEBINPUTS@>
 
+@s const_string int
+@s string int
+
 @d kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true)
 
 @<Include files@>=
 typedef bool boolean;
 #define HAVE_BOOLEAN
-#include <kpathsea/kpathsea.h>
-    /* include every \Kpathsea/ header; |@!kpathsea_debug| */
+#include <kpathsea/kpathsea.h> /* include every \Kpathsea/ header;
+  |@!kpathsea_debug|, |@!const_string|, |@!string| */
 #include <w2c/config.h> /* \&{integer} */
 #include <lib/lib.h> /* |@!versionstring| */
-@#
-#define CWEB
-#include "help.h"
 
 @ We set |kpse_program_name| to `\.{cweb}'.  This means if the variable
 \.{CWEBINPUTS.cweb} is present in \.{texmf.cnf} (or \.{CWEBINPUTS\_cweb}
@@ -1418,16 +1416,21 @@ Debugging output is always written to |stderr|, and begins with the string
 
 @* System dependent changes. The most volatile stuff comes at the very end.
 
-@ Modules for dealing with help messages and version info.
+Modules for dealing with help messages and version info.
+
+@<Include files@>=
+#define CWEB
+#include "help.h" /* |@!CTANGLEHELP|, |@!CWEAVEHELP|, |@!CTWILLHELP| */
 
-@<Display help message and |exit|@>=
+@ @<Display help message and |exit|@>=
 cb_usagehelp(program==ctangle ? CTANGLEHELP :
   program==cweave ? CWEAVEHELP : CTWILLHELP, NULL);
 @.--help@>
 
-@ Special variants from Web2c's `\.{lib/usage.c}', adapted for \.{i18n}/\.{t10n}.
-We simply filter the strings through the catalogs (if available).
-@s const_string int
+@ Special variants from Web2c's `\.{lib/usage.c}', adapted for
+\.{i18n}/\.{t10n}.  We simply filter the strings through the catalogs
+(if available).
+
 @c
 static void cb_usage (const_string str)
 {
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.h b/Build/source/texk/web2c/cwebdir/comm-w2c.h
index d1fd950bf49..a772d1190a4 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.h
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.h
@@ -47,7 +47,7 @@ are placed in the context of the `|_|'~macro.  This is just a shortcut for the
 not have this library installed, we wrap things for neutral behavior without
 internationalization.
 
-@d _(STRING) gettext(STRING)
+@d _(S) gettext(S)
 
 @<Include files@>=
 #ifndef HAVE_GETTEXT
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
index 8a90004904b..ccb04efb43a 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
@@ -104,7 +104,7 @@ internationalization.
 internationalization.
 @-A@>
 @-HAVE_GETTEXT@>
-@-STRING@>
+@-S@>
 @z
 
 Section 11.