summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2020-04-10 11:14:07 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2020-04-10 11:14:07 +0000
commit9ebef863fbd274ccc04480e1f12b7ce385c739c8 (patch)
treea1ce3d49bc55a3f819f5cae68eaa5abc0bcbf686 /Build
parentffb1a15162aabae2a564f442f4041b4f4f1766d7 (diff)
[CWEB] Add new command-line option '-t'.
If disabled with '-t', the temporary output is ignored unconditionally and the final output is (re-)created irrespective of changes between runs. (Default is '+t' for CWEB={ctangle,cweave,ctwill}.) git-svn-id: svn://tug.org/texlive/trunk@54639 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog6
-rw-r--r--Build/source/texk/web2c/ctangleboot.cin13
-rw-r--r--Build/source/texk/web2c/cwebboot.cin93
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch2
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.h1
-rw-r--r--Build/source/texk/web2c/cwebdir/ctang-w2c.ch6
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-w2c.ch6
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-w2c.ch6
-rw-r--r--Build/source/texk/web2c/cwebdir/po/de/cweb.po3
-rw-r--r--Build/source/texk/web2c/cwebdir/po/de/web2c-help.po62
-rw-r--r--Build/source/texk/web2c/cwebdir/po/it/cweb.po3
-rw-r--r--Build/source/texk/web2c/cwebdir/po/web2c-help.pot60
-rw-r--r--Build/source/texk/web2c/help.h3
-rw-r--r--Build/source/texk/web2c/man/ChangeLog5
-rw-r--r--Build/source/texk/web2c/man/ctwill.man10
-rw-r--r--Build/source/texk/web2c/man/cweb.man10
17 files changed, 171 insertions, 125 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index b4b30611619..eb2ba2b2351 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-30 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.cin,
+ * cwebboot.cin,
+ * help.h: Add new option '-t' to CWEB.
+
2020-03-27 Karl Berry <karl@tug.org>
* TeX Live 2020.
diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin
index e6c504fe49d..83f928c8e12 100644
--- a/Build/source/texk/web2c/ctangleboot.cin
+++ b/Build/source/texk/web2c/ctangleboot.cin
@@ -100,6 +100,7 @@
#define show_banner flags['b']
#define show_progress flags['p']
#define show_happiness flags['h']
+#define temporary_output flags['t']
#define make_xrefs flags['x'] \
#define update_terminal fflush(stdout)
@@ -264,14 +265,14 @@ extern boolean change_pending;
extern boolean print_where;
/*:12*//*13:*/
-#line 200 "cwebdir/comm-w2c.h"
+#line 201 "cwebdir/comm-w2c.h"
extern int argc;
extern char**argv;
extern boolean flags[];
/*:13*//*14:*/
-#line 212 "cwebdir/comm-w2c.h"
+#line 213 "cwebdir/comm-w2c.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -281,7 +282,7 @@ extern FILE*check_file;
extern FILE*active_file;
/*:14*//*15:*/
-#line 222 "cwebdir/comm-w2c.h"
+#line 223 "cwebdir/comm-w2c.h"
extern void common_init(void);
extern void print_stats(void);
@@ -763,13 +764,13 @@ if((C_file= fopen(C_file_name,"r"))!=NULL){
#line 779 "cwebdir/ctang-w2c.ch"
char x[BUFSIZ],y[BUFSIZ];
-int x_size,y_size,comparison;
+int x_size,y_size,comparison= false;
if((check_file= fopen(check_file_name,"r"))==NULL)
fatal(_("! Cannot open output file "),check_file_name);
-/*100:*/
+if(temporary_output)/*100:*/
#line 794 "cwebdir/ctang-w2c.ch"
do{
@@ -837,7 +838,7 @@ if((check_file= fopen(check_file_name,"r"))==NULL)
fatal(_("! Cannot open output file "),check_file_name);
-/*100:*/
+if(temporary_output)/*100:*/
#line 794 "cwebdir/ctang-w2c.ch"
do{
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 8cc8f6937b2..602dfaf071a 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -17,21 +17,21 @@
#include <stdlib.h>
/*:22*//*81:*/
-#line 1118 "cwebdir/comm-w2c.ch"
+#line 1120 "cwebdir/comm-w2c.ch"
#include <string.h>
#line 1417 "cwebdir/common.w"
-#line 1125 "cwebdir/comm-w2c.ch"
+#line 1127 "cwebdir/comm-w2c.ch"
/*:81*//*85:*/
-#line 1164 "cwebdir/comm-w2c.ch"
+#line 1166 "cwebdir/comm-w2c.ch"
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
/*:85*//*88:*/
-#line 1206 "cwebdir/comm-w2c.ch"
+#line 1208 "cwebdir/comm-w2c.ch"
#ifndef HAVE_GETTEXT
#define HAVE_GETTEXT 0
@@ -48,7 +48,7 @@
#endif
/*:88*//*90:*/
-#line 1296 "cwebdir/comm-w2c.ch"
+#line 1298 "cwebdir/comm-w2c.ch"
typedef bool boolean;
#define HAVE_BOOLEAN
@@ -160,6 +160,7 @@ err_print(_("! Include file name too long") ) ;goto restart;} \
#define show_progress flags['p']
#define show_stats flags['s']
#define show_happiness flags['h']
+#define temporary_output flags['t']
#define make_xrefs flags['x'] \
#define flag_change (**argv!='-')
@@ -291,10 +292,10 @@ char**argv;
char C_file_name[max_file_name_length];
char tex_file_name[max_file_name_length];
char idx_file_name[max_file_name_length];
-#line 863 "cwebdir/comm-w2c.ch"
+#line 864 "cwebdir/comm-w2c.ch"
char scn_file_name[max_file_name_length];
char check_file_name[max_file_name_length];
-#line 870 "cwebdir/comm-w2c.ch"
+#line 871 "cwebdir/comm-w2c.ch"
boolean flags[128];
const char*use_language= "";
#line 1228 "cwebdir/common.w"
@@ -305,15 +306,15 @@ const char*use_language= "";
FILE*C_file;
FILE*tex_file;
FILE*idx_file;
-#line 1051 "cwebdir/comm-w2c.ch"
+#line 1053 "cwebdir/comm-w2c.ch"
FILE*scn_file;
FILE*check_file;
-#line 1058 "cwebdir/comm-w2c.ch"
+#line 1060 "cwebdir/comm-w2c.ch"
FILE*active_file;
char*found_filename;
#line 1376 "cwebdir/common.w"
-#line 1075 "cwebdir/comm-w2c.ch"
+#line 1077 "cwebdir/comm-w2c.ch"
/*:77*/
#line 61 "cwebdir/common.w"
@@ -328,7 +329,7 @@ char change_buffer[buf_size];
char*change_limit;
/*:11*//*86:*/
-#line 1180 "cwebdir/comm-w2c.ch"
+#line 1182 "cwebdir/comm-w2c.ch"
char cb_banner[max_banner];
string texmf_locale;
@@ -395,12 +396,12 @@ extern void overflow(const char*);
/*:63*//*69:*/
#line 1251 "cwebdir/common.w"
-#line 891 "cwebdir/comm-w2c.ch"
+#line 893 "cwebdir/comm-w2c.ch"
static void scan_args(void);
#line 1253 "cwebdir/common.w"
/*:69*//*83:*/
-#line 1140 "cwebdir/comm-w2c.ch"
+#line 1142 "cwebdir/comm-w2c.ch"
boolean get_line(void);
name_pointer id_lookup(const char*,const char*,char);
@@ -413,7 +414,7 @@ void reset_input(void);
void sprint_section_name(char*,name_pointer);
/*:83*//*84:*/
-#line 1153 "cwebdir/comm-w2c.ch"
+#line 1155 "cwebdir/comm-w2c.ch"
static boolean input_ln(FILE*);
static int web_strcmp(char*,int,char*,int);
@@ -423,7 +424,7 @@ static void check_change(void);
static void prime_the_change_buffer(void);
/*:84*//*98:*/
-#line 1397 "cwebdir/comm-w2c.ch"
+#line 1399 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str);
static void cb_usagehelp(const_string*message,const_string bug_email);
@@ -463,7 +464,7 @@ root= NULL;
#line 72 "cwebdir/comm-w2c.ch"
/*91:*/
-#line 1311 "cwebdir/comm-w2c.ch"
+#line 1313 "cwebdir/comm-w2c.ch"
kpse_set_program_name(argv[0],"cweb");
@@ -471,7 +472,7 @@ kpse_set_program_name(argv[0],"cweb");
#line 73 "cwebdir/comm-w2c.ch"
/*89:*/
-#line 1262 "cwebdir/comm-w2c.ch"
+#line 1264 "cwebdir/comm-w2c.ch"
setlocale(LC_MESSAGES,setlocale(LC_CTYPE,""));
texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}");
@@ -492,13 +493,15 @@ textdomain("cweb");
/*68:*/
#line 1233 "cwebdir/common.w"
+#line 878 "cwebdir/comm-w2c.ch"
+temporary_output= 1;
#line 1235 "cwebdir/common.w"
/*:68*/
#line 75 "cwebdir/comm-w2c.ch"
/*78:*/
-#line 1075 "cwebdir/comm-w2c.ch"
+#line 1077 "cwebdir/comm-w2c.ch"
scan_args();
if(program==ctangle){
@@ -1345,7 +1348,7 @@ puts(_("(That was a fatal error, my friend.)"));
#line 774 "cwebdir/comm-w2c.ch"
/*87:*/
-#line 1191 "cwebdir/comm-w2c.ch"
+#line 1193 "cwebdir/comm-w2c.ch"
if(C_file)fclose(C_file);
if(tex_file)fclose(tex_file);
@@ -1396,7 +1399,7 @@ printf(_("\n! Sorry, %s capacity exceeded"),t);fatal("","");
/*:65*//*70:*/
#line 1254 "cwebdir/common.w"
-#line 898 "cwebdir/comm-w2c.ch"
+#line 900 "cwebdir/comm-w2c.ch"
static void
scan_args(void)
#line 1257 "cwebdir/common.w"
@@ -1408,7 +1411,7 @@ boolean found_web= 0,found_change= 0,found_out= 0;
#line 1264 "cwebdir/common.w"
-#line 910 "cwebdir/comm-w2c.ch"
+#line 912 "cwebdir/comm-w2c.ch"
#if defined DEV_NULL
strncpy(change_file_name,DEV_NULL,max_file_name_length-2);
@@ -1423,25 +1426,25 @@ strcpy(change_file_name,"/dev/null");
while(--argc> 0){
#line 1266 "cwebdir/common.w"
if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*74:*/
-#line 988 "cwebdir/comm-w2c.ch"
+#line 990 "cwebdir/comm-w2c.ch"
{
if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
/*94:*/
-#line 1336 "cwebdir/comm-w2c.ch"
+#line 1338 "cwebdir/comm-w2c.ch"
cb_usagehelp(program==ctangle?CTANGLEHELP:
program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
/*:94*/
-#line 992 "cwebdir/comm-w2c.ch"
+#line 994 "cwebdir/comm-w2c.ch"
if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
/*96:*/
-#line 1378 "cwebdir/comm-w2c.ch"
+#line 1380 "cwebdir/comm-w2c.ch"
printversionandexit(cb_banner,
program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
@@ -1449,7 +1452,7 @@ NULL,"Contemporary development on https://github.com/ascherer/cwebbin.\n");
/*:96*/
-#line 995 "cwebdir/comm-w2c.ch"
+#line 997 "cwebdir/comm-w2c.ch"
if(strcmp("-verbose",*argv)==0||strcmp("--verbose",*argv)==0)
@@ -1468,14 +1471,14 @@ if(*dot_pos=='d'){
if(sscanf(++dot_pos,"%u",&kpathsea_debug)!=1)/*75:*/
#line 1352 "cwebdir/common.w"
-#line 1038 "cwebdir/comm-w2c.ch"
+#line 1040 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
#line 1363 "cwebdir/common.w"
-#line 1045 "cwebdir/comm-w2c.ch"
+#line 1047 "cwebdir/comm-w2c.ch"
/*:75*/
-#line 1010 "cwebdir/comm-w2c.ch"
+#line 1012 "cwebdir/comm-w2c.ch"
while(isdigit(*dot_pos))dot_pos++;
dot_pos--;
@@ -1484,7 +1487,7 @@ if(*dot_pos=='l'){
use_language= ++dot_pos;
break;
}else
-#line 1023 "cwebdir/comm-w2c.ch"
+#line 1025 "cwebdir/comm-w2c.ch"
flags[(eight_bits)*dot_pos]= flag_change;
#line 1350 "cwebdir/common.w"
}
@@ -1494,7 +1497,7 @@ break;
else{
s= name_pos= *argv;dot_pos= NULL;
-#line 931 "cwebdir/comm-w2c.ch"
+#line 933 "cwebdir/comm-w2c.ch"
while(*s){
if(*s=='.')dot_pos= s++;
else if(*s==DIR_SEPARATOR||*s==DEVICE_SEPARATOR||*s=='/')
@@ -1509,7 +1512,7 @@ if(!found_web)/*71:*/
{
if(s-*argv> max_file_name_length-5)
/*76:*/
-#line 1045 "cwebdir/comm-w2c.ch"
+#line 1047 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
#line 1365 "cwebdir/common.w"
@@ -1538,12 +1541,12 @@ else if(!found_change)/*72:*/
#line 1310 "cwebdir/common.w"
{
-#line 963 "cwebdir/comm-w2c.ch"
+#line 965 "cwebdir/comm-w2c.ch"
if(strcmp(*argv,"-")!=0){
#line 1314 "cwebdir/common.w"
if(s-*argv> max_file_name_length-4)
/*76:*/
-#line 1045 "cwebdir/comm-w2c.ch"
+#line 1047 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
#line 1365 "cwebdir/common.w"
@@ -1554,7 +1557,7 @@ fatal(_("! Filename too long\n"),*argv);
if(dot_pos==NULL)
sprintf(change_file_name,"%s.ch",*argv);
else strcpy(change_file_name,*argv);
-#line 970 "cwebdir/comm-w2c.ch"
+#line 972 "cwebdir/comm-w2c.ch"
}
found_change= 1;
#line 1321 "cwebdir/common.w"
@@ -1569,7 +1572,7 @@ else if(!found_out)/*73:*/
{
if(s-*argv> max_file_name_length-5)
/*76:*/
-#line 1045 "cwebdir/comm-w2c.ch"
+#line 1047 "cwebdir/comm-w2c.ch"
fatal(_("! Filename too long\n"),*argv);
#line 1365 "cwebdir/common.w"
@@ -1585,7 +1588,7 @@ sprintf(C_file_name,"%s.c",*argv);
}else{
strcpy(tex_file_name,*argv);
strcpy(C_file_name,*argv);
-#line 977 "cwebdir/comm-w2c.ch"
+#line 979 "cwebdir/comm-w2c.ch"
if(make_xrefs){
#line 1336 "cwebdir/common.w"
*dot_pos= 0;
@@ -1596,19 +1599,19 @@ sprintf(scn_file_name,"%s.scn",*argv);
found_out= 1;
}
-#line 987 "cwebdir/comm-w2c.ch"
+#line 989 "cwebdir/comm-w2c.ch"
/*:73*/
#line 1277 "cwebdir/common.w"
else/*75:*/
#line 1352 "cwebdir/common.w"
-#line 1038 "cwebdir/comm-w2c.ch"
+#line 1040 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
#line 1363 "cwebdir/common.w"
-#line 1045 "cwebdir/comm-w2c.ch"
+#line 1047 "cwebdir/comm-w2c.ch"
/*:75*/
#line 1278 "cwebdir/common.w"
;
@@ -1617,21 +1620,21 @@ else/*75:*/
if(!found_web)/*75:*/
#line 1352 "cwebdir/common.w"
-#line 1038 "cwebdir/comm-w2c.ch"
+#line 1040 "cwebdir/comm-w2c.ch"
cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
#line 1363 "cwebdir/common.w"
-#line 1045 "cwebdir/comm-w2c.ch"
+#line 1047 "cwebdir/comm-w2c.ch"
/*:75*/
#line 1281 "cwebdir/common.w"
;
#line 1283 "cwebdir/common.w"
}
-#line 950 "cwebdir/comm-w2c.ch"
+#line 952 "cwebdir/comm-w2c.ch"
/*:70*//*95:*/
-#line 1344 "cwebdir/comm-w2c.ch"
+#line 1346 "cwebdir/comm-w2c.ch"
static void cb_usage(const_string str)
{
@@ -1664,7 +1667,7 @@ history= spotless;exit(wrap_up());
}
/*:95*//*97:*/
-#line 1386 "cwebdir/comm-w2c.ch"
+#line 1388 "cwebdir/comm-w2c.ch"
void cb_show_banner(void)
{
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 012f317b23b..52c36e1345f 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-30 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch, comm-w2c.h, ctang-w2c.ch, ctwill-w2c.ch, cweav-w2c.ch,
+ * po/de/cweb.po, po/de/web2c-help.po,
+ * po/it/cweb.po,
+ * po/web2c-help.pot: Add new option '-t'.
+
2020-02-01 Andreas Scherer <https://ascherer.github.io>
* ctang-w2c.ch: Fix verbosity bug in ctangle.
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index ed87a71e9b4..1b5201897de 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -854,6 +854,7 @@ overflow(
@d show_happiness flags['h'] /* should lack of errors be announced? */
@y
@d show_happiness flags['h'] /* should lack of errors be announced? */
+@d temporary_output flags['t'] /* should temporary output take precedence? */
@d make_xrefs flags['x'] /* should cross references be output? */
@z
@@ -874,6 +875,7 @@ const char *use_language=""; /* prefix of \.{cwebmac.tex} in \TEX/ output */
@x
show_banner=show_happiness=show_progress=1;
@y
+temporary_output=1; /* Check temporary output for changes */
@z
@x
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.h b/Build/source/texk/web2c/cwebdir/comm-w2c.h
index be99ea8658d..09939bb2bc9 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.h
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.h
@@ -195,6 +195,7 @@ extern boolean print_where; /* tells \.{CTANGLE} to print line and file info */
@d show_banner flags['b'] /* should the banner line be printed? */
@d show_progress flags['p'] /* should progress reports be printed? */
@d show_happiness flags['h'] /* should lack of errors be announced? */
+@d temporary_output flags['t'] /* should temporary output take precedence? */
@d make_xrefs flags['x'] /* should cross references be output? */
@<Common code...@>=
diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
index 9f8136d9ac2..3397c8a4856 100644
--- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch
@@ -778,20 +778,20 @@ if((C_file=fopen(C_file_name,"r"))!=NULL) {
@ @<Set up the comparison of temporary output@>=
char x[BUFSIZ],y[BUFSIZ];
- int x_size,y_size,comparison;
+ int x_size,y_size,comparison=false;
if((check_file=fopen(check_file_name,"r"))==NULL)
fatal(_("! Cannot open output file "),check_file_name);
@.Cannot open output file@>
- @<Compare the temporary output to the previous output@>@;
+ if (temporary_output) @<Compare the temporary output...@>@;
fclose(C_file); C_file=NULL;
fclose(check_file); check_file=NULL;
@ We hope that this runs fast on most systems.
-@<Compare the temp...@>=
+@<Compare the temporary output to the previous output@>=
do {
x_size = fread(x,1,BUFSIZ,C_file);
y_size = fread(y,1,BUFSIZ,check_file);
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
index 4434b9a4f51..2dde67b3ee0 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
@@ -3163,13 +3163,13 @@ be found in the program \.{NUWEB} by Preston Briggs, to whom credit is due.
@<Update the result...@>=
if((tex_file=fopen(tex_file_name,"r"))!=NULL) {
char x[BUFSIZ],y[BUFSIZ];
- int x_size,y_size,comparison;
+ int x_size,y_size,comparison=false;
if((check_file=fopen(check_file_name,"r"))==NULL)
fatal(_("! Cannot open output file "),check_file_name);
@.Cannot open output file@>
- @<Compare the temporary output to the previous output@>@;
+ if (temporary_output) @<Compare the temporary output...@>@;
fclose(tex_file); tex_file=NULL;
fclose(check_file); check_file=NULL;
@@ -3182,7 +3182,7 @@ strcpy(check_file_name,""); /* We want to get rid of the temporary file */
@ We hope that this runs fast on most systems.
-@<Compare the temp...@>=
+@<Compare the temporary output to the previous output@>=
do {
x_size = fread(x,1,BUFSIZ,tex_file);
y_size = fread(y,1,BUFSIZ,check_file);
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
index 795b5fcb6db..bf52c91a45c 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -1926,13 +1926,13 @@ be found in the program \.{NUWEB} by Preston Briggs, to whom credit is due.
@<Update the result...@>=
if((tex_file=fopen(tex_file_name,"r"))!=NULL) {
char x[BUFSIZ],y[BUFSIZ];
- int x_size,y_size,comparison;
+ int x_size,y_size,comparison=false;
if((check_file=fopen(check_file_name,"r"))==NULL)
fatal(_("! Cannot open output file "),check_file_name);
@.Cannot open output file@>
- @<Compare the temporary output to the previous output@>@;
+ if (temporary_output) @<Compare the temporary output...@>@;
fclose(tex_file); tex_file=NULL;
fclose(check_file); check_file=NULL;
@@ -1945,7 +1945,7 @@ strcpy(check_file_name,""); /* We want to get rid of the temporary file */
@ We hope that this runs fast on most systems.
-@<Compare the temp...@>=
+@<Compare the temporary output to the previous output@>=
do {
x_size = fread(x,1,BUFSIZ,tex_file);
y_size = fread(y,1,BUFSIZ,check_file);
diff --git a/Build/source/texk/web2c/cwebdir/po/de/cweb.po b/Build/source/texk/web2c/cwebdir/po/de/cweb.po
index 71930326bc4..7665a113ad6 100644
--- a/Build/source/texk/web2c/cwebdir/po/de/cweb.po
+++ b/Build/source/texk/web2c/cwebdir/po/de/cweb.po
@@ -425,6 +425,7 @@ msgstr ""
"h [+] Bestätige einen fehlerfreien Lauf\n"
"p [+] Zeige einen Zwischenbericht\n"
"s [-] Melde die Verbrauchsstatistik\n"
+"t [+] Vergleiche temporäre Ausgabe nach Änderungen\n"
#: comm-i18n.ch:287
msgid ""
@@ -442,6 +443,7 @@ msgstr ""
"x [+] Füge Indexe und Inhaltsverzeichnisse ein\n"
"lX [] Verwende die Makros für Sprache X aus Xcwebmac.tex\n"
"s [-] Melde die Verbrauchsstatistik\n"
+"t [+] Vergleiche temporäre Ausgabe nach Änderungen\n"
#: comm-i18n.ch:290
msgid ""
@@ -460,6 +462,7 @@ msgstr ""
"P [-] Benutze 'proofmac.tex' statt 'ctwimac.tex'\n"
"lX [] Verwende die Makros für Sprache X aus X{ctwimac|proofmac}.tex\n"
"s [-] Melde die Verbrauchsstatistik\n"
+"t [+] Vergleiche temporäre Ausgabe nach Änderungen\n"
#: ctang-i18n.ch:131 cweav-i18n.ch:53 cweav-i18n.ch:119
msgid "! Use @l in limbo only"
diff --git a/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po b/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po
index f7db142698d..84d6b2a33a0 100644
--- a/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po
+++ b/Build/source/texk/web2c/cwebdir/po/de/web2c-help.po
@@ -1,14 +1,14 @@
# International version of CWEB (CWEBbin, TeXLive).
-# Copyright (C) 2018 Andreas Scherer et al.
+# Copyright (C) 2020 Andreas Scherer et al.
# This file is distributed under the same license as the CWEB package.
-# Andreas Scherer <https://ascherer.github.io>, 2018.
+# Andreas Scherer <https://ascherer.github.io>, 2020.
#
msgid ""
msgstr ""
-"Project-Id-Version: CWEBbin 2018\n"
+"Project-Id-Version: CWEBbin 2020\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-19 23:24+0100\n"
-"PO-Revision-Date: 2019-01-19 23:24+0100\n"
+"POT-Creation-Date: 2020-03-30 12:09+0100\n"
+"PO-Revision-Date: 2020-03-30 12:09+0100\n"
"Last-Translator: Andreas Scherer <andreas_github@freenet.de>\n"
"Language-Team: German\n"
"Language: de\n"
@@ -25,7 +25,7 @@ msgstr "Aufruf: ctangle [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.c]]
msgid " Tangle WEBFILE with CHANGEFILE into a C/C++ program."
msgstr " Verknüpfe WEBFILE mit CHANGEFILE in ein C/C++ Programm."
-#: help.h:54 help.h:73 help.h:98
+#: help.h:54 help.h:74 help.h:100
msgid " Default CHANGEFILE is /dev/null;"
msgstr " Vorgabe für CHANGEFILE ist /dev/null;"
@@ -33,94 +33,98 @@ msgstr " Vorgabe für CHANGEFILE ist /dev/null;"
msgid " C output goes to the basename of WEBFILE extended with `.c'"
msgstr " C Ausgabe geht in den Hauptnamen des WEBFILE erweitert um `.c',"
-#: help.h:56 help.h:75 help.h:100
+#: help.h:56 help.h:76 help.h:102
msgid " unless otherwise specified by OUTFILE; in this case, '-' specifies"
msgstr " sofern nicht ein anderes OUTFILE angegeben ist; in diesem Fall"
-#: help.h:57 help.h:76 help.h:101
+#: help.h:57 help.h:77 help.h:103
msgid " a null CHANGEFILE."
msgstr " bezeichnet '-' ein leeres CHANGEFILE."
-#: help.h:59 help.h:78 help.h:103
+#: help.h:59 help.h:79 help.h:105
msgid "+b print banner line on terminal"
msgstr "+b schreibe die Startmeldung"
-#: help.h:60 help.h:79 help.h:104
+#: help.h:60 help.h:80 help.h:106
msgid "+h print success message on completion"
msgstr "+h schreibe die Erfolgsmeldung am Ende"
-#: help.h:61 help.h:80 help.h:105
+#: help.h:61 help.h:81 help.h:107
msgid "+p print progress report messages"
msgstr "+p schreibe die Fortschrittsmeldungen"
-#: help.h:62 help.h:81 help.h:106
+#: help.h:62 help.h:82 help.h:108
msgid "+/-q shortcut for '-bhp'; also '--quiet' (default)"
msgstr "+/-q Kurzform für '-bhp'; auch '--quiet' (Vorgabe)"
-#: help.h:63 help.h:82 help.h:107
+#: help.h:63 help.h:83 help.h:109
msgid "+/-v shortcut for '+bhp'; also '--verbose'"
msgstr "+/-v Kurzform für '+bhp'; auch '--verbose'"
-#: help.h:64 help.h:89 help.h:115
+#: help.h:64 help.h:90 help.h:117
msgid "+s print usage statistics"
msgstr "+s melde die Verbrauchsstatistik"
-#: help.h:65 help.h:90 help.h:116
+#: help.h:65 help.h:91 help.h:118
+msgid "-t ignore temporary output irrespective of changes"
+msgstr "-t ignoriere temporäre Ausgabe unabhängig von Änderungen"
+
+#: help.h:65 help.h:91 help.h:118
msgid "--help display this help and exit"
msgstr "--help zeige diesen Hilfetext und ende"
-#: help.h:66 help.h:91 help.h:117
+#: help.h:66 help.h:92 help.h:119
msgid "--version output version information and exit"
msgstr "--version zeige die Versionsinformation und ende"
-#: help.h:71
+#: help.h:72
msgid "Usage: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr "Aufruf: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
-#: help.h:72
+#: help.h:73
msgid " Weave WEBFILE with CHANGEFILE into a TeX document."
msgstr " Verwebe WEBFILE mit CHANGEFILE in ein TeX Dokument."
-#: help.h:74 help.h:99
+#: help.h:75 help.h:101
msgid " TeX output goes to the basename of WEBFILE extended with `.tex'"
msgstr " TeX Ausgabe geht in den Hauptnamen des WEBFILE erweitert um `.tex',"
-#: help.h:83 help.h:108
+#: help.h:84 help.h:110
msgid "-e do not enclose C material in \\PB{...}"
msgstr "-e schließe C Material nicht in \\PB{...} ein"
-#: help.h:84 help.h:109
+#: help.h:85 help.h:111
msgid "-f do not force a newline after every C statement in output"
msgstr "-f erzwinge keinen Zeilenumbruch nach jedem C Statement"
-#: help.h:85 help.h:110
+#: help.h:86 help.h:112
msgid "-i suppress indentation of parameter declarations"
msgstr "-i unterdrücke die Einrückung von Parameterdeklarationen"
-#: help.h:86 help.h:111
+#: help.h:87 help.h:113
msgid "-o suppress separation of declarations and statements"
msgstr "-o unterdrücke die Trennung von Deklarationen und Statements"
-#: help.h:87 help.h:112
+#: help.h:88 help.h:114
msgid "-x omit indices, section names, table of contents"
msgstr "-x verzichte auf Indexe, Abschnittnamen und Inhaltsverzeichnis"
-#: help.h:88
+#: help.h:89
msgid "+lX use macros for language X as of Xcwebmac.tex"
msgstr "+lX benutze Macros für Sprache X aus Xcwebmac.tex"
-#: help.h:96
+#: help.h:98
msgid "Usage: ctwill [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr "Aufruf: ctwill [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
-#: help.h:97
+#: help.h:99
msgid " Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes."
msgstr " Verwebe WEBFILE mit CHANGEFILE in ein TeX Dokument mit Miniindexen."
-#: help.h:113
+#: help.h:115
msgid "+P \\input ctproofmac.tex instead of ctwimac.tex"
msgstr "+P \\input ctproofmac.tex an Stelle von ctwimac.tex"
-#: help.h:114
+#: help.h:116
msgid "+/-lX use macros for language X as of Xct{wi|proof}mac.tex"
msgstr "+/-lX benutze Macros für Sprache X aus Xct{wi|proof}mac.tex"
diff --git a/Build/source/texk/web2c/cwebdir/po/it/cweb.po b/Build/source/texk/web2c/cwebdir/po/it/cweb.po
index d2f2a89623f..104253110f4 100644
--- a/Build/source/texk/web2c/cwebdir/po/it/cweb.po
+++ b/Build/source/texk/web2c/cwebdir/po/it/cweb.po
@@ -426,6 +426,7 @@ msgstr ""
"h [+] stampa un messaggio di \"buon fine\"\n"
"p [+] mostra andamento elaborazione\n"
"s [-] mostra statistiche\n"
+"t [+] compare temporary output for changes\n"
#: comm-i18n.ch:287
msgid ""
@@ -443,6 +444,7 @@ msgstr ""
"x [+] include indici\n"
"lX [] usa macro in lingua X contenute in Xcwebmac.tex\n"
"s [-] mostra statistiche\n"
+"t [+] compare temporary output for changes\n"
#: comm-i18n.ch:290
msgid ""
@@ -461,6 +463,7 @@ msgstr ""
"P [-] include 'proofmac.tex' invece di 'ctwimac.tex'\n"
"lX [] usa macro in lingua X contenute in X{ctwi|proof}mac.tex\n"
"s [-] mostra statistiche\n"
+"t [+] compare temporary output for changes\n"
#: ctang-i18n.ch:131 cweav-i18n.ch:53 cweav-i18n.ch:119
msgid "! Use @l in limbo only"
diff --git a/Build/source/texk/web2c/cwebdir/po/web2c-help.pot b/Build/source/texk/web2c/cwebdir/po/web2c-help.pot
index 6eef47ddf3f..0d04df3265a 100644
--- a/Build/source/texk/web2c/cwebdir/po/web2c-help.pot
+++ b/Build/source/texk/web2c/cwebdir/po/web2c-help.pot
@@ -1,14 +1,14 @@
# International version of CWEB (CWEBbin, TeXLive).
-# Copyright (C) 2019 Andreas Scherer et al.
+# Copyright (C) 2020 Andreas Scherer et al.
# This file is distributed under the same license as the CWEB package.
-# Andreas Scherer <https://ascherer.github.io>, 2019.
+# Andreas Scherer <https://ascherer.github.io>, 2020.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: CWEBbin 2019\n"
+"Project-Id-Version: CWEBbin 2020\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-19 23:24+0100\n"
+"POT-Creation-Date: 2020-03-30 12:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
msgid " Tangle WEBFILE with CHANGEFILE into a C/C++ program."
msgstr ""
-#: help.h:54 help.h:73 help.h:98
+#: help.h:54 help.h:74 help.h:100
msgid " Default CHANGEFILE is /dev/null;"
msgstr ""
@@ -34,96 +34,100 @@ msgstr ""
msgid " C output goes to the basename of WEBFILE extended with `.c'"
msgstr ""
-#: help.h:56 help.h:75 help.h:100
+#: help.h:56 help.h:76 help.h:102
msgid " unless otherwise specified by OUTFILE; in this case, '-' specifies"
msgstr ""
-#: help.h:57 help.h:76 help.h:101
+#: help.h:57 help.h:77 help.h:103
msgid " a null CHANGEFILE."
msgstr ""
-#: help.h:59 help.h:78 help.h:103
+#: help.h:59 help.h:79 help.h:105
msgid "+b print banner line on terminal"
msgstr ""
-#: help.h:60 help.h:79 help.h:104
+#: help.h:60 help.h:80 help.h:106
msgid "+h print success message on completion"
msgstr ""
-#: help.h:61 help.h:80 help.h:105
+#: help.h:61 help.h:81 help.h:107
msgid "+p print progress report messages"
msgstr ""
-#: help.h:62 help.h:81 help.h:106
+#: help.h:62 help.h:82 help.h:108
msgid "+/-q shortcut for '-bhp'; also '--quiet' (default)"
msgstr ""
-#: help.h:63 help.h:82 help.h:107
+#: help.h:63 help.h:83 help.h:109
msgid "+/-v shortcut for '+bhp'; also '--verbose'"
msgstr ""
-#: help.h:64 help.h:89 help.h:115
+#: help.h:64 help.h:90 help.h:117
msgid "+s print usage statistics"
msgstr ""
-#: help.h:65 help.h:90 help.h:116
+#: help.h:65 help.h:91 help.h:118
+msgid "-t ignore temporary output irrespective of changes"
+msgstr ""
+
+#: help.h:66 help.h:92 help.h:119
msgid "--help display this help and exit"
msgstr ""
-#: help.h:66 help.h:91 help.h:117
+#: help.h:67 help.h:93 help.h:120
msgid "--version output version information and exit"
msgstr ""
-#: help.h:71
+#: help.h:72
msgid ""
"Usage: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr ""
-#: help.h:72
+#: help.h:73
msgid " Weave WEBFILE with CHANGEFILE into a TeX document."
msgstr ""
-#: help.h:74 help.h:99
+#: help.h:75 help.h:101
msgid " TeX output goes to the basename of WEBFILE extended with `.tex'"
msgstr ""
-#: help.h:83 help.h:108
+#: help.h:84 help.h:110
msgid "-e do not enclose C material in \\PB{...}"
msgstr ""
-#: help.h:84 help.h:109
+#: help.h:85 help.h:111
msgid "-f do not force a newline after every C statement in output"
msgstr ""
-#: help.h:85 help.h:110
+#: help.h:86 help.h:112
msgid "-i suppress indentation of parameter declarations"
msgstr ""
-#: help.h:86 help.h:111
+#: help.h:87 help.h:113
msgid "-o suppress separation of declarations and statements"
msgstr ""
-#: help.h:87 help.h:112
+#: help.h:88 help.h:114
msgid "-x omit indices, section names, table of contents"
msgstr ""
-#: help.h:88
+#: help.h:89
msgid "+lX use macros for language X as of Xcwebmac.tex"
msgstr ""
-#: help.h:96
+#: help.h:98
msgid ""
"Usage: ctwill [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]"
msgstr ""
-#: help.h:97
+#: help.h:99
msgid " Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes."
msgstr ""
-#: help.h:113
+#: help.h:115
msgid "+P \\input ctproofmac.tex instead of ctwimac.tex"
msgstr ""
-#: help.h:114
+#: help.h:116
msgid "+/-lX use macros for language X as of Xct{wi|proof}mac.tex"
msgstr ""
diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h
index b2a61fd6a33..8f5b12b8d0d 100644
--- a/Build/source/texk/web2c/help.h
+++ b/Build/source/texk/web2c/help.h
@@ -62,6 +62,7 @@ const_string CTANGLEHELP[] = {
"+/-q shortcut for '-bhp'; also '--quiet' (default)",
"+/-v shortcut for '+bhp'; also '--verbose'",
"+s print usage statistics",
+ "-t ignore temporary output irrespective of changes",
"--help display this help and exit",
"--version output version information and exit",
NULL
@@ -87,6 +88,7 @@ const_string CWEAVEHELP[] = {
"-x omit indices, section names, table of contents",
"+lX use macros for language X as of Xcwebmac.tex",
"+s print usage statistics",
+ "-t ignore temporary output irrespective of changes",
"--help display this help and exit",
"--version output version information and exit",
NULL
@@ -113,6 +115,7 @@ const_string CTWILLHELP[] = {
"+P \\input ctproofmac.tex instead of ctwimac.tex",
"+/-lX use macros for language X as of Xct{wi|proof}mac.tex",
"+s print usage statistics",
+ "-t ignore temporary output irrespective of changes",
"--help display this help and exit",
"--version output version information and exit",
NULL
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index ae88b893d23..afb7d019e31 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-30 Andreas Scherer <https://ascherer.github.io>
+
+ * cweb.man,
+ * ctwill.man: Add new option '-t' to CWEB.
+
2020-02-01 Andreas Scherer <https://ascherer.github.io>
* cweb.man,
diff --git a/Build/source/texk/web2c/man/ctwill.man b/Build/source/texk/web2c/man/ctwill.man
index b5e8744640c..95f4d4fbfb1 100644
--- a/Build/source/texk/web2c/man/ctwill.man
+++ b/Build/source/texk/web2c/man/ctwill.man
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 2.9.1.1
+.\" Automatically generated by Pandoc 2.9.2.1
.\"
-.TH "CTWILL" "1" "December 7, 2019" "Web2c @VERSION@" "General Commands Manual"
+.TH "CTWILL" "1" "March 30, 2020" "Web2c @VERSION@" "General Commands Manual"
.hy
.SH NAME
.PP
@@ -116,8 +116,8 @@ In TeX\ Live the utility programs are prefixed with \f[B]ctwill-\f[R]
and the macro files with \f[B]ct\f[R] for technical reasons.
.IP \[bu] 2
Options \f[B]--help\f[R], \f[B]--quiet\f[R], \f[B]--verbose\f[R],
-\f[B]--version\f[R], and flags \f[B]-i\f[R], \f[B]-o\f[R], and
-\f[B]+lX\f[R] are new in CWEBbin and TeX\ Live.
+\f[B]--version\f[R], and flags \f[B]-i\f[R], \f[B]-o\f[R], \f[B]-t\f[R],
+and \f[B]+lX\f[R] are new in CWEBbin and TeX\ Live.
.IP \[bu] 2
Option \f[B]+lX\f[R] is accompanied by example wrapper files for
\f[B]ctwimac.tex\f[R] and \f[B]ctproofmac.tex\f[R] with translated
@@ -162,6 +162,8 @@ output
.IP \[bu] 2
\f[B]-o\f[R]: suppress separation of declarations and statements
.IP \[bu] 2
+\f[B]-t\f[R]: ignore temporary output irrespective of changes
+.IP \[bu] 2
\f[B]-x\f[R]: omit indices, section names, table of contents
.IP \[bu] 2
\f[B]+P\f[R]: \f[B]\[rs]input ctproofmac.tex\f[R] instead of
diff --git a/Build/source/texk/web2c/man/cweb.man b/Build/source/texk/web2c/man/cweb.man
index 37cb7456db3..6632ebe9386 100644
--- a/Build/source/texk/web2c/man/cweb.man
+++ b/Build/source/texk/web2c/man/cweb.man
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 2.9.1.1
+.\" Automatically generated by Pandoc 2.9.2.1
.\"
-.TH "CWEB" "1" "December 7, 2019" "Web2c @VERSION@" "General Commands Manual"
+.TH "CWEB" "1" "March 30, 2020" "Web2c @VERSION@" "General Commands Manual"
.hy
.SH NAME
.PP
@@ -55,8 +55,8 @@ the resulting output.
There are, however, a few differences worth noting:
.IP \[bu] 2
Options \f[B]--help\f[R], \f[B]--quiet\f[R], \f[B]--verbose\f[R],
-\f[B]--version\f[R], and flags \f[B]-i\f[R], \f[B]-o\f[R], and
-\f[B]+lX\f[R] are new in CWEBbin and TeX\ Live.
+\f[B]--version\f[R], and flags \f[B]-i\f[R], \f[B]-o\f[R], \f[B]-t\f[R],
+and \f[B]+lX\f[R] are new in CWEBbin and TeX\ Live.
.IP \[bu] 2
Option \f[B]+lX\f[R] is accompanied by several wrapper files for
\f[B]cwebmac.tex\f[R] with translated captions for German
@@ -97,6 +97,8 @@ The first batch of options are common to both \f[B]ctangle\f[R] and
.IP \[bu] 2
\f[B]+s\f[R]: print usage statistics
.IP \[bu] 2
+\f[B]-t\f[R]: ignore temporary output irrespective of changes
+.IP \[bu] 2
\f[B]--help\f[R]: display help message and exit
.IP \[bu] 2
\f[B]--version\f[R]: output version information and exit