From 416f5a72112983e834271737163a40e73be0b2d1 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Thu, 30 Jul 2020 15:10:47 +0000 Subject: [CWEB] Fix typographic inconsistency. 'Extensions' was the only major section with the 'header' separated from the first text paragraph. git-svn-id: svn://tug.org/texlive/trunk@55993 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ctangleboot.cin | 66 +++++++++++++-------------- Build/source/texk/web2c/cwebboot.cin | 30 ++++++------ Build/source/texk/web2c/cwebdir/ChangeLog | 7 +++ Build/source/texk/web2c/cwebdir/comm-w2c.ch | 12 ++--- Build/source/texk/web2c/cwebdir/ctang-w2c.ch | 10 ++-- Build/source/texk/web2c/cwebdir/ctwill-w2c.ch | 10 ++-- Build/source/texk/web2c/cwebdir/cweav-w2c.ch | 10 ++-- Build/source/texk/web2c/man/ctwill.man | 2 +- Build/source/texk/web2c/man/cweb.man | 2 +- 9 files changed, 74 insertions(+), 75 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin index 4e7bd9043c3..afd215a5b09 100644 --- a/Build/source/texk/web2c/ctangleboot.cin +++ b/Build/source/texk/web2c/ctangleboot.cin @@ -290,7 +290,7 @@ extern void cb_show_banner(void); #line 128 "cwebdir/ctangle.w" /*:15*//*108:*/ -#line 905 "cwebdir/ctang-w2c.ch" +#line 903 "cwebdir/ctang-w2c.ch" extern char cb_banner[]; @@ -440,7 +440,7 @@ static void skip_limbo(void); #line 1480 "cwebdir/ctangle.w" /*:92*//*97:*/ -#line 768 "cwebdir/ctang-w2c.ch" +#line 766 "cwebdir/ctang-w2c.ch" static eight_bits get_next(void); static eight_bits skip_ahead(void); @@ -525,7 +525,7 @@ ccode['\'']= ord; section_text[0]= ' '; /*:71*//*109:*/ -#line 908 "cwebdir/ctang-w2c.ch" +#line 906 "cwebdir/ctang-w2c.ch" strncpy(cb_banner,banner,max_banner-1); @@ -757,11 +757,11 @@ writeloop:/*43:*/ fclose(C_file);C_file= NULL; /*98:*/ -#line 788 "cwebdir/ctang-w2c.ch" +#line 786 "cwebdir/ctang-w2c.ch" if((C_file= fopen(C_file_name,"r"))!=NULL){ /*99:*/ -#line 795 "cwebdir/ctang-w2c.ch" +#line 793 "cwebdir/ctang-w2c.ch" char x[BUFSIZ],y[BUFSIZ]; int x_size,y_size,comparison= false; @@ -771,7 +771,7 @@ fatal(_("! Cannot open output file "),check_file_name); if(temporary_output)/*100:*/ -#line 810 "cwebdir/ctang-w2c.ch" +#line 808 "cwebdir/ctang-w2c.ch" do{ x_size= fread(x,1,BUFSIZ,C_file); @@ -781,17 +781,17 @@ if(comparison)comparison= !memcmp(x,y,x_size); }while(comparison&&!feof(C_file)&&!feof(check_file)); /*:100*/ -#line 803 "cwebdir/ctang-w2c.ch" +#line 801 "cwebdir/ctang-w2c.ch" fclose(C_file);C_file= NULL; fclose(check_file);check_file= NULL; /*:99*/ -#line 790 "cwebdir/ctang-w2c.ch" +#line 788 "cwebdir/ctang-w2c.ch" /*101:*/ -#line 821 "cwebdir/ctang-w2c.ch" +#line 819 "cwebdir/ctang-w2c.ch" if(comparison) remove(check_file_name); @@ -801,7 +801,7 @@ rename(check_file_name,C_file_name); } /*:101*/ -#line 791 "cwebdir/ctang-w2c.ch" +#line 789 "cwebdir/ctang-w2c.ch" }else rename(check_file_name,C_file_name); @@ -828,14 +828,14 @@ cur_end= (cur_repl+1)->tok_start; while(stack_ptr> stack)get_output(); flush_buffer();fclose(C_file);C_file= NULL; /*102:*/ -#line 834 "cwebdir/ctang-w2c.ch" +#line 832 "cwebdir/ctang-w2c.ch" if(0==strcmp("/dev/stdout",output_file_name)) /*104:*/ -#line 861 "cwebdir/ctang-w2c.ch" +#line 859 "cwebdir/ctang-w2c.ch" { /*107:*/ -#line 892 "cwebdir/ctang-w2c.ch" +#line 890 "cwebdir/ctang-w2c.ch" char in_buf[BUFSIZ+1]; int in_size,comparison= true; @@ -844,7 +844,7 @@ fatal(_("! Cannot open output file "),check_file_name); /*:107*/ -#line 862 "cwebdir/ctang-w2c.ch" +#line 860 "cwebdir/ctang-w2c.ch" do{ in_size= fread(in_buf,1,BUFSIZ,check_file); @@ -853,7 +853,7 @@ fprintf(stdout,"%s",in_buf); }while(!feof(check_file)); fclose(check_file);check_file= NULL; /*103:*/ -#line 851 "cwebdir/ctang-w2c.ch" +#line 849 "cwebdir/ctang-w2c.ch" if(comparison) remove(check_file_name); @@ -863,19 +863,19 @@ rename(check_file_name,output_file_name); } /*:103*/ -#line 869 "cwebdir/ctang-w2c.ch" +#line 867 "cwebdir/ctang-w2c.ch" } /*:104*/ -#line 836 "cwebdir/ctang-w2c.ch" +#line 834 "cwebdir/ctang-w2c.ch" else if(0==strcmp("/dev/stderr",output_file_name)) /*105:*/ -#line 874 "cwebdir/ctang-w2c.ch" +#line 872 "cwebdir/ctang-w2c.ch" { /*107:*/ -#line 892 "cwebdir/ctang-w2c.ch" +#line 890 "cwebdir/ctang-w2c.ch" char in_buf[BUFSIZ+1]; int in_size,comparison= true; @@ -884,7 +884,7 @@ fatal(_("! Cannot open output file "),check_file_name); /*:107*/ -#line 875 "cwebdir/ctang-w2c.ch" +#line 873 "cwebdir/ctang-w2c.ch" do{ in_size= fread(in_buf,1,BUFSIZ,check_file); @@ -893,7 +893,7 @@ fprintf(stderr,"%s",in_buf); }while(!feof(check_file)); fclose(check_file);check_file= NULL; /*103:*/ -#line 851 "cwebdir/ctang-w2c.ch" +#line 849 "cwebdir/ctang-w2c.ch" if(comparison) remove(check_file_name); @@ -903,20 +903,20 @@ rename(check_file_name,output_file_name); } /*:103*/ -#line 882 "cwebdir/ctang-w2c.ch" +#line 880 "cwebdir/ctang-w2c.ch" } /*:105*/ -#line 838 "cwebdir/ctang-w2c.ch" +#line 836 "cwebdir/ctang-w2c.ch" else if(0==strcmp("/dev/null",output_file_name)) /*106:*/ -#line 887 "cwebdir/ctang-w2c.ch" +#line 885 "cwebdir/ctang-w2c.ch" { int comparison= true; /*103:*/ -#line 851 "cwebdir/ctang-w2c.ch" +#line 849 "cwebdir/ctang-w2c.ch" if(comparison) remove(check_file_name); @@ -926,17 +926,17 @@ rename(check_file_name,output_file_name); } /*:103*/ -#line 889 "cwebdir/ctang-w2c.ch" +#line 887 "cwebdir/ctang-w2c.ch" } /*:106*/ -#line 840 "cwebdir/ctang-w2c.ch" +#line 838 "cwebdir/ctang-w2c.ch" else{ if((C_file= fopen(output_file_name,"r"))!=NULL){ /*99:*/ -#line 795 "cwebdir/ctang-w2c.ch" +#line 793 "cwebdir/ctang-w2c.ch" char x[BUFSIZ],y[BUFSIZ]; int x_size,y_size,comparison= false; @@ -946,7 +946,7 @@ fatal(_("! Cannot open output file "),check_file_name); if(temporary_output)/*100:*/ -#line 810 "cwebdir/ctang-w2c.ch" +#line 808 "cwebdir/ctang-w2c.ch" do{ x_size= fread(x,1,BUFSIZ,C_file); @@ -956,17 +956,17 @@ if(comparison)comparison= !memcmp(x,y,x_size); }while(comparison&&!feof(C_file)&&!feof(check_file)); /*:100*/ -#line 803 "cwebdir/ctang-w2c.ch" +#line 801 "cwebdir/ctang-w2c.ch" fclose(C_file);C_file= NULL; fclose(check_file);check_file= NULL; /*:99*/ -#line 843 "cwebdir/ctang-w2c.ch" +#line 841 "cwebdir/ctang-w2c.ch" /*103:*/ -#line 851 "cwebdir/ctang-w2c.ch" +#line 849 "cwebdir/ctang-w2c.ch" if(comparison) remove(check_file_name); @@ -976,7 +976,7 @@ rename(check_file_name,output_file_name); } /*:103*/ -#line 844 "cwebdir/ctang-w2c.ch" +#line 842 "cwebdir/ctang-w2c.ch" }else rename(check_file_name,output_file_name); diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin index 11fb195954b..2854c14f822 100644 --- a/Build/source/texk/web2c/cwebboot.cin +++ b/Build/source/texk/web2c/cwebboot.cin @@ -2,13 +2,13 @@ #line 58 "cwebdir/common.w" /*85:*/ -#line 1249 "cwebdir/comm-w2c.ch" +#line 1247 "cwebdir/comm-w2c.ch" #include #include /*:85*//*88:*/ -#line 1288 "cwebdir/comm-w2c.ch" +#line 1286 "cwebdir/comm-w2c.ch" #ifndef HAVE_GETTEXT #define HAVE_GETTEXT 0 @@ -25,7 +25,7 @@ #endif /*:88*//*90:*/ -#line 1382 "cwebdir/comm-w2c.ch" +#line 1380 "cwebdir/comm-w2c.ch" typedef bool boolean; #define HAVE_BOOLEAN @@ -35,7 +35,7 @@ typedef bool boolean; #include /*:90*//*93:*/ -#line 1421 "cwebdir/comm-w2c.ch" +#line 1419 "cwebdir/comm-w2c.ch" #define CWEB #include "help.h" @@ -320,7 +320,7 @@ char change_buffer[buf_size]; char*change_limit; /*:11*//*86:*/ -#line 1262 "cwebdir/comm-w2c.ch" +#line 1260 "cwebdir/comm-w2c.ch" char cb_banner[max_banner]; string texmf_locale; @@ -392,7 +392,7 @@ static void scan_args(void); #line 1253 "cwebdir/common.w" /*:69*//*83:*/ -#line 1224 "cwebdir/comm-w2c.ch" +#line 1222 "cwebdir/comm-w2c.ch" boolean get_line(void); name_pointer id_lookup(const char*,const char*,char); @@ -405,7 +405,7 @@ void reset_input(void); void sprint_section_name(char*,name_pointer); /*:83*//*84:*/ -#line 1237 "cwebdir/comm-w2c.ch" +#line 1235 "cwebdir/comm-w2c.ch" static boolean input_ln(FILE*); static int web_strcmp(char*,int,char*,int); @@ -415,7 +415,7 @@ static void check_change(void); static void prime_the_change_buffer(void); /*:84*//*98:*/ -#line 1487 "cwebdir/comm-w2c.ch" +#line 1485 "cwebdir/comm-w2c.ch" static void cb_usage(const_string str); static void cb_usagehelp(const_string*message,const_string bug_email); @@ -455,7 +455,7 @@ root= NULL; #line 103 "cwebdir/comm-w2c.ch" /*91:*/ -#line 1396 "cwebdir/comm-w2c.ch" +#line 1394 "cwebdir/comm-w2c.ch" kpse_set_program_name(argv[0],"cweb"); @@ -463,7 +463,7 @@ kpse_set_program_name(argv[0],"cweb"); #line 104 "cwebdir/comm-w2c.ch" /*89:*/ -#line 1344 "cwebdir/comm-w2c.ch" +#line 1342 "cwebdir/comm-w2c.ch" setlocale(LC_MESSAGES,setlocale(LC_CTYPE,"")); texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}"); @@ -1346,7 +1346,7 @@ puts(_("(That was a fatal error, my friend.)")); #line 844 "cwebdir/comm-w2c.ch" /*87:*/ -#line 1273 "cwebdir/comm-w2c.ch" +#line 1271 "cwebdir/comm-w2c.ch" if(C_file)fclose(C_file); if(tex_file)fclose(tex_file); @@ -1430,7 +1430,7 @@ if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*74:*/ if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0) /*94:*/ -#line 1425 "cwebdir/comm-w2c.ch" +#line 1423 "cwebdir/comm-w2c.ch" cb_usagehelp(program==ctangle?CTANGLEHELP: program==cweave?CWEAVEHELP:CTWILLHELP,NULL); @@ -1442,7 +1442,7 @@ program==cweave?CWEAVEHELP:CTWILLHELP,NULL); if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0) /*96:*/ -#line 1468 "cwebdir/comm-w2c.ch" +#line 1466 "cwebdir/comm-w2c.ch" printversionandexit(cb_banner, program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth", @@ -1632,7 +1632,7 @@ cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill"); #line 1030 "cwebdir/comm-w2c.ch" /*:70*//*95:*/ -#line 1434 "cwebdir/comm-w2c.ch" +#line 1432 "cwebdir/comm-w2c.ch" static void cb_usage(const_string str) { @@ -1665,7 +1665,7 @@ history= spotless;exit(wrap_up()); } /*:95*//*97:*/ -#line 1476 "cwebdir/comm-w2c.ch" +#line 1474 "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 132c4a6f651..a737adc0770 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,10 @@ +2020-07-30 Andreas Scherer + + * comm-w2c.ch, + * ctang-w2c.ch, + * ctwill-w2c.ch, + * cweav-w2c.ch: Fix typographic inconsistency. + 2020-07-15 Andreas Scherer * comm-w2c.ch, diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch index 292b790a8a7..e5704fb05b5 100644 --- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch @@ -59,7 +59,7 @@ which roughly concerns the following @x sometimes use \.{CWEB} to refer to either of the two component @y -sometimes use \.{CWEB} to refer to either of the three component +sometimes use \.{CWEB} to refer to any of the three component @z @x @@ -1206,12 +1206,10 @@ functions |strlen|, |strcmp|, |strcpy|, |strncmp|, and |strncpy|. @x @** Index. @y -@** Extensions for modern \.{CWEB}. - -The following sections introduce code changes and extensions that have been -created by numerous contributors over the course of a quarter century. They -make \.{CWEB} adhere to modern coding standards and introduce new or improved -features. +@** Extensions for modern \.{CWEB}. The following sections introduce code +changes and extensions that have been created by numerous contributors over the +course of a quarter century. They make \.{CWEB} adhere to modern coding +standards and introduce new or improved features. Care has been taken to keep the original section numbering intact, so this new section should have the same number as the original ``\&{82.~Index},'' and diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch index 9bb0effcc15..dd8aadadc64 100644 --- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch @@ -750,12 +750,10 @@ print_stats(void) { @x @** Index. @y -@** Extensions for modern \.{CWEB}. - -The following sections introduce code changes and extensions that have been -created by numerous contributors over the course of a quarter century. They -make \.{CWEB} adhere to modern coding standards and introduce new or improved -features. +@** Extensions for modern \.{CWEB}. The following sections introduce code +changes and extensions that have been created by numerous contributors over the +course of a quarter century. They make \.{CWEB} adhere to modern coding +standards and introduce new or improved features. Care has been taken to keep the original section numbering intact, so this new section should have the same number as the original ``\&{96.~Index},'' and diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch index a51d324384f..41a0ec32a18 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch @@ -3113,12 +3113,10 @@ print_stats(void) { @x @** Index. @y -@** Extensions for modern {\tt CWEB}. - -The following sections introduce code changes and extensions that have been -created by numerous contributors over the course of a quarter century. They -make \.{CWEB} adhere to modern coding standards and introduce new or improved -features. +@** Extensions for modern {\tt CWEB}. The following sections introduce code +changes and extensions that have been created by numerous contributors over the +course of a quarter century. They make \.{CWEB} adhere to modern coding +standards and introduce new or improved features. \bigskip \font\itt=cmitt10 diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch index 6577102f90a..1c1c0c90e8e 100644 --- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch @@ -1866,12 +1866,10 @@ print_stats(void) { @x @** Index. @y -@** Extensions for modern {\tt CWEB}. - -The following sections introduce code changes and extensions that have been -created by numerous contributors over the course of a quarter century. They -make \.{CWEB} adhere to modern coding standards and introduce new or improved -features. +@** Extensions for modern {\tt CWEB}. The following sections introduce code +changes and extensions that have been created by numerous contributors over the +course of a quarter century. They make \.{CWEB} adhere to modern coding +standards and introduce new or improved features. Care has been taken to keep the original section numbering intact, so this new section should have the same number as the original ``\&{250.~Index},'' and diff --git a/Build/source/texk/web2c/man/ctwill.man b/Build/source/texk/web2c/man/ctwill.man index f4a71bfc65a..64cab42d952 100644 --- a/Build/source/texk/web2c/man/ctwill.man +++ b/Build/source/texk/web2c/man/ctwill.man @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 2.10 +.\" Automatically generated by Pandoc 2.10.1 .\" .TH "CTWILL" "1" "June 14, 2020" "Web2c @VERSION@" "General Commands Manual" .hy diff --git a/Build/source/texk/web2c/man/cweb.man b/Build/source/texk/web2c/man/cweb.man index fa81b09f5b5..5cb16ee3811 100644 --- a/Build/source/texk/web2c/man/cweb.man +++ b/Build/source/texk/web2c/man/cweb.man @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 2.10 +.\" Automatically generated by Pandoc 2.10.1 .\" .TH "CWEB" "1" "June 08, 2020" "Web2c @VERSION@" "General Commands Manual" .hy -- cgit v1.2.3