[CWEB] Update section/line references in change files.

Hopefully, after almost 100 commits since May 2023, the next step will be the new 4.10 version number and a possible release. git-svn-id: svn://tug.org/texlive/trunk/Build/source@67968 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Aug 18, 2023 · 69feeba · 69feeba
1 parent 35216a2
commit 69feeba
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 63 deletions.
diff --git a/texk/web2c/cwebboot.cin b/texk/web2c/cwebboot.cin
@@ -26,28 +26,28 @@
 #line 75 "cwebdir/comm-w2c.h"
 
 /*:4*//*91:*/
-#line 739 "cwebdir/comm-w2c.ch"
+#line 737 "cwebdir/comm-w2c.ch"
 
 #if HAVE_GETTEXT
 #include <locale.h>  
 #else
-#line 743 "cwebdir/comm-w2c.ch"
+#line 741 "cwebdir/comm-w2c.ch"
 #define setlocale(a,b) ""
 #define bindtextdomain(a,b) ""
 #define textdomain(a) ""
 #endif
-#line 747 "cwebdir/comm-w2c.ch"
+#line 745 "cwebdir/comm-w2c.ch"
 
 /*:91*//*93:*/
-#line 786 "cwebdir/comm-w2c.ch"
+#line 784 "cwebdir/comm-w2c.ch"
 
 #include <kpathsea/kpathsea.h>  
 
 #include <w2c/config.h>  
 #include <lib/lib.h>  
 
 /*:93*//*96:*/
-#line 823 "cwebdir/comm-w2c.ch"
+#line 821 "cwebdir/comm-w2c.ch"
 
 #define CWEB
 #include "help.h" 
@@ -395,27 +395,27 @@ FILE*C_file;
 FILE*tex_file;
 FILE*idx_file;
 FILE*scn_file;
-#line 584 "cwebdir/comm-w2c.ch"
+#line 582 "cwebdir/comm-w2c.ch"
 FILE*active_file;
 FILE*check_file;
 #line 1272 "cwebdir/common.w"
 
-#line 601 "cwebdir/comm-w2c.ch"
+#line 599 "cwebdir/comm-w2c.ch"
 /*:83*//*86:*/
-#line 629 "cwebdir/comm-w2c.ch"
+#line 627 "cwebdir/comm-w2c.ch"
 
 const char*use_language= "";
 
 
 /*:86*//*87:*/
-#line 642 "cwebdir/comm-w2c.ch"
+#line 640 "cwebdir/comm-w2c.ch"
 
 char cb_banner[max_banner];
 string texmf_locale;
 #ifndef SEPARATORS
 #define SEPARATORS "://"
 #endif
-#line 648 "cwebdir/comm-w2c.ch"
+#line 646 "cwebdir/comm-w2c.ch"
  char separators[]= SEPARATORS;
 
 /*:87*/
@@ -486,9 +486,9 @@ static int section_name_cmp(char**,size_t,name_pointer);
 #line 1185 "cwebdir/common.w"
 static void scan_args(void);
 
-#line 514 "cwebdir/comm-w2c.ch"
+#line 512 "cwebdir/comm-w2c.ch"
 /*:76*//*98:*/
-#line 836 "cwebdir/comm-w2c.ch"
+#line 834 "cwebdir/comm-w2c.ch"
 
 static void cb_usage(const_string str);
 static void cb_usagehelp(const_string*message);
@@ -521,7 +521,7 @@ for(h= hash;h<=hash_end;*h++= NULL);
 #line 78 "cwebdir/comm-w2c.ch"
 
 /*94:*/
-#line 798 "cwebdir/comm-w2c.ch"
+#line 796 "cwebdir/comm-w2c.ch"
 
 kpse_set_program_name(argv[0],"cweb");
 
@@ -530,7 +530,7 @@ kpse_set_program_name(argv[0],"cweb");
 
 #line 85 "cwebdir/comm-w2c.ch"
 /*92:*/
-#line 748 "cwebdir/comm-w2c.ch"
+#line 746 "cwebdir/comm-w2c.ch"
 
 setlocale(LC_MESSAGES,setlocale(LC_CTYPE,""));
 texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}");
@@ -560,12 +560,12 @@ make_xrefs= true;
 
 #line 101 "cwebdir/common.w"
 /*84:*/
-#line 601 "cwebdir/comm-w2c.ch"
+#line 599 "cwebdir/comm-w2c.ch"
 
 scan_args();
 if(program==ctangle){
 if(check_for_change)/*88:*/
-#line 659 "cwebdir/comm-w2c.ch"
+#line 657 "cwebdir/comm-w2c.ch"
 {
 if((C_file= fopen(C_file_name,"a"))==NULL)
 fatal(_("! Cannot open output file "),C_file_name);
@@ -582,15 +582,15 @@ fatal(_("! Cannot open output file "),check_file_name);
 }
 
 /*:88*/
-#line 604 "cwebdir/comm-w2c.ch"
+#line 602 "cwebdir/comm-w2c.ch"
 
 else if((C_file= fopen(C_file_name,"wb"))==NULL)
 fatal(_("! Cannot open output file "),C_file_name);
 
 }
 else{
 if(check_for_change)/*89:*/
-#line 674 "cwebdir/comm-w2c.ch"
+#line 672 "cwebdir/comm-w2c.ch"
 {
 if((tex_file= fopen(tex_file_name,"a"))==NULL)
 fatal(_("! Cannot open output file "),tex_file_name);
@@ -607,14 +607,14 @@ fatal(_("! Cannot open output file "),check_file_name);
 }
 
 /*:89*/
-#line 610 "cwebdir/comm-w2c.ch"
+#line 608 "cwebdir/comm-w2c.ch"
 
 else if((tex_file= fopen(tex_file_name,"wb"))==NULL)
 fatal(_("! Cannot open output file "),tex_file_name);
 }
 #line 1284 "cwebdir/common.w"
 
-#line 619 "cwebdir/comm-w2c.ch"
+#line 617 "cwebdir/comm-w2c.ch"
 /*:84*/
 #line 101 "cwebdir/common.w"
 
@@ -1367,7 +1367,7 @@ puts(_("(That was a fatal error, my friend.)"));
 #line 401 "cwebdir/comm-w2c.ch"
 
 /*90:*/
-#line 692 "cwebdir/comm-w2c.ch"
+#line 690 "cwebdir/comm-w2c.ch"
 
 if(C_file)fclose(C_file);
 if(tex_file)fclose(tex_file);
@@ -1440,32 +1440,32 @@ change_file_name[max_file_name_length-2]= '\0';
 if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/
 #line 1244 "cwebdir/common.w"
 
-#line 527 "cwebdir/comm-w2c.ch"
+#line 525 "cwebdir/comm-w2c.ch"
 {
 if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
 
 /*97:*/
-#line 827 "cwebdir/comm-w2c.ch"
+#line 825 "cwebdir/comm-w2c.ch"
 
 cb_usagehelp(program==ctangle?CTANGLEHELP:
 program==cweave?CWEAVEHELP:CTWILLHELP);
 
 
 /*:97*/
-#line 530 "cwebdir/comm-w2c.ch"
+#line 528 "cwebdir/comm-w2c.ch"
 
 if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
 
 /*100:*/
-#line 873 "cwebdir/comm-w2c.ch"
+#line 871 "cwebdir/comm-w2c.ch"
 
 printversionandexit(cb_banner,
 program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
 NULL,"Contemporary development on https://github.com/ascherer/cweb.\n");
 
 
 /*:100*/
-#line 533 "cwebdir/comm-w2c.ch"
+#line 531 "cwebdir/comm-w2c.ch"
 
 if(strcmp("-verbose",*argv)==0||strcmp("--verbose",*argv)==0)
 
@@ -1479,15 +1479,15 @@ case'v':show_banner= show_progress= show_happiness= true;continue;
 case'q':show_banner= show_progress= show_happiness= false;continue;
 case'd':
 if(sscanf(++dot_pos,"%u",&kpathsea_debug)!=1)/*81:*/
-#line 570 "cwebdir/comm-w2c.ch"
+#line 568 "cwebdir/comm-w2c.ch"
 
 cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
 
 #line 1259 "cwebdir/common.w"
 
-#line 578 "cwebdir/comm-w2c.ch"
+#line 576 "cwebdir/comm-w2c.ch"
 /*:81*/
-#line 545 "cwebdir/comm-w2c.ch"
+#line 543 "cwebdir/comm-w2c.ch"
 
 while(isdigit(*dot_pos))dot_pos++;
 dot_pos--;
@@ -1500,14 +1500,14 @@ break;
 }
 #line 1247 "cwebdir/common.w"
 
-#line 570 "cwebdir/comm-w2c.ch"
+#line 568 "cwebdir/comm-w2c.ch"
 /*:80*/
 #line 1168 "cwebdir/common.w"
 
 else{
 s= name_pos= *argv;dot_pos= NULL;
-#line 501 "cwebdir/comm-w2c.ch"
 while(*s)
+#line 500 "cwebdir/comm-w2c.ch"
 if(*s=='.')dot_pos= s++;
 else if(*s==DIR_SEPARATOR||*s==DEVICE_SEPARATOR||*s=='/')
 dot_pos= NULL,name_pos= ++s;
@@ -1520,7 +1520,7 @@ if(!found_web)/*77:*/
 {
 if(s-*argv> max_file_name_length-5)
 /*82:*/
-#line 578 "cwebdir/comm-w2c.ch"
+#line 576 "cwebdir/comm-w2c.ch"
 fatal(_("! Filename too long\n"),*argv);
 #line 1261 "cwebdir/common.w"
 
@@ -1552,7 +1552,7 @@ else if(!found_change)/*78:*/
 if(strcmp(*argv,"-")!=0){
 if(s-*argv> max_file_name_length-4)
 /*82:*/
-#line 578 "cwebdir/comm-w2c.ch"
+#line 576 "cwebdir/comm-w2c.ch"
 fatal(_("! Filename too long\n"),*argv);
 #line 1261 "cwebdir/common.w"
 
@@ -1576,7 +1576,7 @@ else if(!found_out)/*79:*/
 {
 if(s-*argv> max_file_name_length-5)
 /*82:*/
-#line 578 "cwebdir/comm-w2c.ch"
+#line 576 "cwebdir/comm-w2c.ch"
 fatal(_("! Filename too long\n"),*argv);
 #line 1261 "cwebdir/common.w"
 
@@ -1603,33 +1603,33 @@ found_out= true;
 #line 1178 "cwebdir/common.w"
 
 else/*81:*/
-#line 570 "cwebdir/comm-w2c.ch"
+#line 568 "cwebdir/comm-w2c.ch"
 
 cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
 
 #line 1259 "cwebdir/common.w"
 
-#line 578 "cwebdir/comm-w2c.ch"
+#line 576 "cwebdir/comm-w2c.ch"
 /*:81*/
 #line 1179 "cwebdir/common.w"
 
 }
 }
 if(!found_web)/*81:*/
-#line 570 "cwebdir/comm-w2c.ch"
+#line 568 "cwebdir/comm-w2c.ch"
 
 cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
 
 #line 1259 "cwebdir/common.w"
 
-#line 578 "cwebdir/comm-w2c.ch"
+#line 576 "cwebdir/comm-w2c.ch"
 /*:81*/
 #line 1182 "cwebdir/common.w"
 
 }
 
 /*:75*//*99:*/
-#line 840 "cwebdir/comm-w2c.ch"
+#line 838 "cwebdir/comm-w2c.ch"
 
 static void cb_usage(const_string str)
 {
@@ -1661,7 +1661,7 @@ history= spotless;exit(wrap_up());
 }
 
 /*:99*//*101:*/
-#line 881 "cwebdir/comm-w2c.ch"
+#line 879 "cwebdir/comm-w2c.ch"
 
 void cb_show_banner(void)
 {

diff --git a/texk/web2c/cwebdir/ChangeLog b/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,17 @@
+2023-08-18  Andreas Scherer  <https://ascherer.github.io>
+
+	* comm-bs.ch,
+	* comm-mac.ch,
+	* comm-mini.ch,
+	* comm-w2c.ch,
+	* comm-w32.ch,
+	* ctang-bs.ch,
+	* ctang-vms.ch,
+	* ctang-w32.ch,
+	* ctwill-hint.ch,
+	* ctwill-mini.ch,
+	* cweav-bs.ch: Update section/line references.
+
 2023-08-16  Andreas Scherer  <https://ascherer.github.io>
 
 	* comm-w2c.ch,

diff --git a/texk/web2c/cwebdir/comm-bs.ch b/texk/web2c/cwebdir/comm-bs.ch
@@ -15,7 +15,7 @@ by using "huge" pointers.
 (Update attempt by Andreas Scherer, 31 Jan 2021.  Good luck!)
 
 
-@x Section 9.
+@x Section 10.
 @d ilk dummy.Ilk /* used by \.{CWEAVE} only */
 
 @<Common code...@>=
@@ -59,7 +59,7 @@ extern char huge* byte_mem_end; /* end of |byte_mem| */
 @z
 
 
-@x Section 39.
+@x Section 36.
     cur_file_name[l]='/'; /* \UNIX/ pathname separator */
 @y
     cur_file_name[l]='/'; /* A valid {\mc MSDOS} pathname separator */

diff --git a/texk/web2c/cwebdir/comm-mac.ch b/texk/web2c/cwebdir/comm-mac.ch
@@ -81,7 +81,7 @@ FILE *fp) /* what file to read from */
   @<Skip over comment lines in the change file; |return| if end of file@>@;
 @z
 
-@x section 39, declare colon as Mac's path separator
+@x section 36, declare colon as Mac's path separator
 (Colon-separated paths are not supported.)
 The remainder of the \.{@@i} line after the file name is ignored.
 
@@ -94,7 +94,7 @@ The remainder of the \.{@@i} line after the file name is ignored.
 @d PATH_SEP ':'   /* MacOS pathname separator */
 @^system dependencies@>
 @z
-@x section 39, use the path separator constant
+@x section 36, use the path separator constant
     cur_file_name[l]='/'; /* \UNIX/ pathname separator */
 @y
     cur_file_name[l]=PATH_SEP; /* pathname separator */

diff --git a/texk/web2c/cwebdir/comm-mini.ch b/texk/web2c/cwebdir/comm-mini.ch
@@ -132,7 +132,7 @@ Section 52.
 @d first_chunk(p) ((p)->byte_start+2)
 @z
 
-Section 54.
+Section 53.
 
 @x
   *dest='\0';
@@ -280,6 +280,8 @@ Section 96.
 @-CWEB@>
 @z
 
+Section 85/102.
+
 @x
 @** Index.
 @y

diff --git a/texk/web2c/cwebdir/comm-w2c.ch b/texk/web2c/cwebdir/comm-w2c.ch
@@ -493,12 +493,10 @@ systems the contents of the compile-time variable |DEV_NULL| (\TeX~Live) or
 @z
 
 @x
-      while (*s)
         if (*s=='.') dot_pos=s++;
         else if (*s=='/') dot_pos=NULL,name_pos=++s;
         else s++;
 @y
-      while (*s)
         if (*s=='.') dot_pos=s++;
         else if (*s==DIR_SEPARATOR || *s==DEVICE_SEPARATOR || *s=='/')
           dot_pos=NULL,name_pos=++s;

diff --git a/texk/web2c/cwebdir/comm-w32.ch b/texk/web2c/cwebdir/comm-w32.ch
@@ -34,7 +34,7 @@ header files to be safe.
 Admittedly, this is not vital for cweb, except that I build the whole texlive
 set of programs using the __fastcall convention.
 
-@x
+@x section 11
 extern boolean names_match(name_pointer,const char *,size_t,eight_bits);
 @y
 extern boolean __cdecl names_match(name_pointer,const char *,size_t,eight_bits);