texlive[55841] Build/source/texk/web2c: [CWEB] Clearer exposition re
commits+ascherer at tug.org
commits+ascherer at tug.org
Wed Jul 15 14:32:35 CEST 2020
Revision: 55841
http://tug.org/svn/texlive?view=revision&revision=55841
Author: ascherer
Date: 2020-07-15 14:32:35 +0200 (Wed, 15 Jul 2020)
Log Message:
-----------
[CWEB] Clearer exposition re external type definitions.
A few underlined index entries added and one index entry removed.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/ctangleboot.cin
trunk/Build/source/texk/web2c/cwebboot.cin
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch
trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h
trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/ChangeLog 2020-07-15 12:32:35 UTC (rev 55841)
@@ -1,3 +1,8 @@
+2020-07-15 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.cin,
+ * cwebboot.cin: Recreate CWEB boot modules.
+
2020-07-08 Andreas Scherer <https://ascherer.github.io>
* cwebboot.cin,
Modified: trunk/Build/source/texk/web2c/ctangleboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/ctangleboot.cin 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/ctangleboot.cin 2020-07-15 12:32:35 UTC (rev 55841)
@@ -47,7 +47,7 @@
#define stack_size 50
#define buf_size 1000 \
-#define _(STRING) gettext(STRING) \
+#define _(S) gettext(S) \
#define and_and 04
#define lt_lt 020
Modified: trunk/Build/source/texk/web2c/cwebboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/cwebboot.cin 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/cwebboot.cin 2020-07-15 12:32:35 UTC (rev 55841)
@@ -8,7 +8,7 @@
#include <stddef.h>
/*:85*//*88:*/
-#line 1290 "cwebdir/comm-w2c.ch"
+#line 1288 "cwebdir/comm-w2c.ch"
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
@@ -15,7 +15,7 @@
#endif
#if HAVE_GETTEXT
-#include <locale.h>
+#include <locale.h>
#include <libintl.h>
#else
#define setlocale(A,B) ""
@@ -25,19 +25,22 @@
#endif
/*:88*//*90:*/
-#line 1381 "cwebdir/comm-w2c.ch"
+#line 1382 "cwebdir/comm-w2c.ch"
typedef bool boolean;
#define HAVE_BOOLEAN
-#include <kpathsea/kpathsea.h>
+#include <kpathsea/kpathsea.h>
#include <w2c/config.h>
#include <lib/lib.h>
+/*:90*//*93:*/
+#line 1421 "cwebdir/comm-w2c.ch"
+
#define CWEB
-#include "help.h"
+#include "help.h"
-/*:90*/
+/*:93*/
#line 59 "cwebdir/common.w"
#define and_and 04
@@ -153,7 +156,7 @@
#define DIR_SEPARATOR separators[1]
#define DEVICE_SEPARATOR separators[2] \
-#define _(STRING) gettext(STRING) \
+#define _(S) gettext(S) \
#define kpse_find_cweb(name) kpse_find_file(name,kpse_cweb_format,true) \
@@ -317,7 +320,7 @@
char*change_limit;
/*:11*//*86:*/
-#line 1264 "cwebdir/comm-w2c.ch"
+#line 1262 "cwebdir/comm-w2c.ch"
char cb_banner[max_banner];
string texmf_locale;
@@ -412,7 +415,7 @@
static void prime_the_change_buffer(void);
/*:84*//*98:*/
-#line 1484 "cwebdir/comm-w2c.ch"
+#line 1487 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str);
static void cb_usagehelp(const_string*message,const_string bug_email);
@@ -452,7 +455,7 @@
#line 103 "cwebdir/comm-w2c.ch"
/*91:*/
-#line 1398 "cwebdir/comm-w2c.ch"
+#line 1396 "cwebdir/comm-w2c.ch"
kpse_set_program_name(argv[0],"cweb");
@@ -460,7 +463,7 @@
#line 104 "cwebdir/comm-w2c.ch"
/*89:*/
-#line 1346 "cwebdir/comm-w2c.ch"
+#line 1344 "cwebdir/comm-w2c.ch"
setlocale(LC_MESSAGES,setlocale(LC_CTYPE,""));
texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}");
@@ -1343,7 +1346,7 @@
#line 844 "cwebdir/comm-w2c.ch"
/*87:*/
-#line 1275 "cwebdir/comm-w2c.ch"
+#line 1273 "cwebdir/comm-w2c.ch"
if(C_file)fclose(C_file);
if(tex_file)fclose(tex_file);
@@ -1427,7 +1430,7 @@
if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
/*94:*/
-#line 1423 "cwebdir/comm-w2c.ch"
+#line 1425 "cwebdir/comm-w2c.ch"
cb_usagehelp(program==ctangle?CTANGLEHELP:
program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
@@ -1439,7 +1442,7 @@
if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
/*96:*/
-#line 1465 "cwebdir/comm-w2c.ch"
+#line 1468 "cwebdir/comm-w2c.ch"
printversionandexit(cb_banner,
program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
@@ -1629,7 +1632,7 @@
#line 1030 "cwebdir/comm-w2c.ch"
/*:70*//*95:*/
-#line 1431 "cwebdir/comm-w2c.ch"
+#line 1434 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str)
{
@@ -1662,7 +1665,7 @@
}
/*:95*//*97:*/
-#line 1473 "cwebdir/comm-w2c.ch"
+#line 1476 "cwebdir/comm-w2c.ch"
void cb_show_banner(void)
{
Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2020-07-15 12:32:35 UTC (rev 55841)
@@ -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,
Modified: trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/cwebdir/comm-w2c.ch 2020-07-15 12:32:35 UTC (rev 55841)
@@ -1244,7 +1244,7 @@
@* 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 @@
@ The |scan_args| and |cb_show_banner| routines and the |bindtextdomain|
argument string need a few extra variables.
- at s string int
-
@d max_banner 50
@d PATH_SEPARATOR separators[0]
@@ -1285,7 +1283,7 @@
utilities.'' For systems that do not have this library installed, we wrap
things for neutral behavior without internationalization.
- at d _(STRING) gettext(STRING)
+ at d _(S) gettext(S)
@<Include files@>=
#ifndef HAVE_GETTEXT
@@ -1293,7 +1291,7 @@
#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 @@
i.e., \.{\$TEXMFDOTDIR:\$TEXMF/texmf/cweb//}.\par}
@.CWEBINPUTS@>
+ at s const_string int
+ at 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 @@
@* 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.
-@<Display help message and |exit|@>=
+@<Include files@>=
+#define CWEB
+#include "help.h" /* |@!CTANGLEHELP|, |@!CWEAVEHELP|, |@!CTWILLHELP| */
+
+@ @<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).
- at 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)
{
Modified: trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/cwebdir/comm-w2c.h 2020-07-15 12:32:35 UTC (rev 55841)
@@ -47,7 +47,7 @@
not have this library installed, we wrap things for neutral behavior without
internationalization.
- at d _(STRING) gettext(STRING)
+ at d _(S) gettext(S)
@<Include files@>=
#ifndef HAVE_GETTEXT
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch 2020-07-14 23:52:38 UTC (rev 55840)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch 2020-07-15 12:32:35 UTC (rev 55841)
@@ -104,7 +104,7 @@
internationalization.
@-A@>
@-HAVE_GETTEXT@>
- at -STRING@>
+ at -S@>
@z
Section 11.
More information about the tex-live-commits
mailing list.