From 21789d78376b470876b5e1f80a10fb5c7c653b37 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Mon, 8 Feb 2021 08:21:23 +0000 Subject: [CWEB] Don't repeat yourself. Purge repeated lines in *.w by uncommenting line in common.h. Unfortunately, this shifts all #line numbers. ;o) git-svn-id: svn://tug.org/texlive/trunk@57676 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/cwebboot.cin | 276 +++++++++++++++++------------------ 1 file changed, 138 insertions(+), 138 deletions(-) (limited to 'Build/source/texk/web2c/cwebboot.cin') diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin index 1b1a2c234ee..6d38bc2c1ad 100644 --- a/Build/source/texk/web2c/cwebboot.cin +++ b/Build/source/texk/web2c/cwebboot.cin @@ -283,18 +283,18 @@ extern FILE*check_file; #line 69 "cwebdir/common.w" /*18:*/ -#line 85 "cwebdir/common.w" +#line 83 "cwebdir/common.w" #line 72 "cwebdir/comm-w2c.ch" cweb program; -#line 87 "cwebdir/common.w" +#line 85 "cwebdir/common.w" /*:18*//*19:*/ -#line 94 "cwebdir/common.w" +#line 92 "cwebdir/common.w" int phase; /*:19*//*21:*/ -#line 131 "cwebdir/common.w" +#line 129 "cwebdir/common.w" char section_text[longest_name+1]; char*section_text_end= section_text+longest_name; @@ -302,7 +302,7 @@ char*id_first; char*id_loc; /*:21*//*22:*/ -#line 151 "cwebdir/common.w" +#line 149 "cwebdir/common.w" char buffer[long_buf_size]; char*buffer_end= buffer+buf_size-2; @@ -310,7 +310,7 @@ char*limit= buffer; char*loc= buffer; /*:22*//*25:*/ -#line 196 "cwebdir/common.w" +#line 194 "cwebdir/common.w" int include_depth; FILE*file[max_include_depth]; @@ -318,7 +318,7 @@ FILE*change_file; char file_name[max_include_depth][max_file_name_length]; char change_file_name[max_file_name_length]; -#line 204 "cwebdir/common.w" +#line 202 "cwebdir/common.w" int line[max_include_depth]; int change_line; int change_depth; @@ -327,13 +327,13 @@ boolean changing; boolean web_file_open= 0; /*:25*//*26:*/ -#line 222 "cwebdir/common.w" +#line 220 "cwebdir/common.w" char change_buffer[buf_size]; char*change_limit; /*:26*//*37:*/ -#line 403 "cwebdir/common.w" +#line 401 "cwebdir/common.w" sixteen_bits section_count; boolean changed_section[max_sections]; @@ -342,7 +342,7 @@ boolean change_pending; boolean print_where= 0; /*:37*//*43:*/ -#line 600 "cwebdir/common.w" +#line 598 "cwebdir/common.w" char byte_mem[max_bytes]; char*byte_mem_end= byte_mem+max_bytes-1; @@ -350,25 +350,25 @@ name_info name_dir[max_names]; name_pointer name_dir_end= name_dir+max_names-1; /*:43*//*44:*/ -#line 611 "cwebdir/common.w" +#line 609 "cwebdir/common.w" name_pointer name_ptr; char*byte_ptr; /*:44*//*46:*/ -#line 631 "cwebdir/common.w" +#line 629 "cwebdir/common.w" name_pointer hash[hash_size]; hash_pointer hash_end= hash+hash_size-1; hash_pointer h; /*:46*//*65:*/ -#line 1019 "cwebdir/common.w" +#line 1017 "cwebdir/common.w" int history= spotless; /*:65*//*73:*/ -#line 1140 "cwebdir/common.w" +#line 1138 "cwebdir/common.w" int argc; char**argv; @@ -378,11 +378,11 @@ char idx_file_name[max_file_name_length]; #line 431 "cwebdir/comm-w2c.ch" char scn_file_name[max_file_name_length]; char check_file_name[max_file_name_length]; -#line 1147 "cwebdir/common.w" +#line 1145 "cwebdir/common.w" boolean flags[128]; /*:73*//*83:*/ -#line 1288 "cwebdir/common.w" +#line 1286 "cwebdir/common.w" FILE*C_file; FILE*tex_file; @@ -393,7 +393,7 @@ FILE*check_file; #line 576 "cwebdir/comm-w2c.ch" FILE*active_file; char*found_filename; -#line 1294 "cwebdir/common.w" +#line 1292 "cwebdir/common.w" #line 593 "cwebdir/comm-w2c.ch" /*:83*//*86:*/ @@ -451,34 +451,34 @@ extern void print_stats(void); extern void cb_show_banner(void); /*:15*//*23:*/ -#line 161 "cwebdir/common.w" +#line 159 "cwebdir/common.w" static boolean input_ln(FILE*); /*:23*//*27:*/ -#line 233 "cwebdir/common.w" +#line 231 "cwebdir/common.w" static void prime_the_change_buffer(void); /*:27*//*32:*/ -#line 305 "cwebdir/common.w" +#line 303 "cwebdir/common.w" static void check_change(void); /*:32*//*55:*/ -#line 778 "cwebdir/common.w" +#line 776 "cwebdir/common.w" static int web_strcmp(char*,int,char*,int); static name_pointer add_section_name(name_pointer,int,char*,char*,int); static void extend_section_name(name_pointer,char*,char*,int); /*:55*//*63:*/ -#line 974 "cwebdir/common.w" +#line 972 "cwebdir/common.w" static int section_name_cmp(char**,int,name_pointer); /*:63*//*75:*/ -#line 1172 "cwebdir/common.w" +#line 1170 "cwebdir/common.w" static void scan_args(void); @@ -493,14 +493,14 @@ static void cb_usagehelp(const_string*message,const_string bug_email); /*:1*//*20:*/ -#line 100 "cwebdir/common.w" +#line 98 "cwebdir/common.w" void common_init(void) { #line 78 "cwebdir/comm-w2c.ch" /*45:*/ -#line 615 "cwebdir/common.w" +#line 613 "cwebdir/common.w" name_dir->byte_start= byte_ptr= byte_mem; name_ptr= name_dir+1; @@ -508,7 +508,7 @@ name_ptr->byte_start= byte_mem; root= NULL; /*:45*//*47:*/ -#line 638 "cwebdir/common.w" +#line 636 "cwebdir/common.w" for(h= hash;h<=hash_end;*h++= NULL); @@ -544,18 +544,18 @@ textdomain("cweb"); #line 85 "cwebdir/comm-w2c.ch" /*74:*/ -#line 1153 "cwebdir/common.w" +#line 1151 "cwebdir/common.w" #line 438 "cwebdir/comm-w2c.ch" make_xrefs= true; temporary_output= true; -#line 1155 "cwebdir/common.w" +#line 1153 "cwebdir/common.w" show_stats= false; /*:74*/ #line 86 "cwebdir/comm-w2c.ch" -#line 106 "cwebdir/common.w" +#line 104 "cwebdir/common.w" /*84:*/ #line 593 "cwebdir/comm-w2c.ch" @@ -588,16 +588,16 @@ else strcpy(dot_pos,".wtp"); if((tex_file= fopen(check_file_name,"wb"))==NULL) fatal(_("! Cannot open output file "),check_file_name); } -#line 1306 "cwebdir/common.w" +#line 1304 "cwebdir/common.w" #line 628 "cwebdir/comm-w2c.ch" /*:84*/ -#line 106 "cwebdir/common.w" +#line 104 "cwebdir/common.w" } /*:20*//*24:*/ -#line 164 "cwebdir/common.w" +#line 162 "cwebdir/common.w" static boolean input_ln( FILE*fp) @@ -609,12 +609,12 @@ limit= k= buffer; while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n') #line 92 "cwebdir/comm-w2c.ch" if((*(k++)= c)!=' '&&c!='\r')limit= k; -#line 174 "cwebdir/common.w" +#line 172 "cwebdir/common.w" if(k> buffer_end) if((c= getc(fp))!=EOF&&c!='\n'){ #line 98 "cwebdir/comm-w2c.ch" ungetc(c,fp);loc= buffer;err_print(_("! Input line too long")); -#line 177 "cwebdir/common.w" +#line 175 "cwebdir/common.w" } if(c==EOF&&limit==buffer)return(0); @@ -623,14 +623,14 @@ return(1); } /*:24*//*28:*/ -#line 236 "cwebdir/common.w" +#line 234 "cwebdir/common.w" static void prime_the_change_buffer(void) { change_limit= change_buffer; /*29:*/ -#line 250 "cwebdir/common.w" +#line 248 "cwebdir/common.w" while(1){ change_line++; @@ -643,33 +643,33 @@ if(buffer[1]=='y'||buffer[1]=='z'||buffer[1]=='i'){ loc= buffer+2; #line 109 "cwebdir/comm-w2c.ch" err_print(_("! Missing @x in change file")); -#line 261 "cwebdir/common.w" +#line 259 "cwebdir/common.w" } } /*:29*/ -#line 241 "cwebdir/common.w" +#line 239 "cwebdir/common.w" /*30:*/ -#line 267 "cwebdir/common.w" +#line 265 "cwebdir/common.w" do{ change_line++; if(!input_ln(change_file)){ #line 115 "cwebdir/comm-w2c.ch" err_print(_("! Change file ended after @x")); -#line 272 "cwebdir/common.w" +#line 270 "cwebdir/common.w" return; } }while(limit==buffer); /*:30*/ -#line 242 "cwebdir/common.w" +#line 240 "cwebdir/common.w" /*31:*/ -#line 277 "cwebdir/common.w" +#line 275 "cwebdir/common.w" { change_limit= change_buffer+(ptrdiff_t)(limit-buffer); @@ -677,12 +677,12 @@ strncpy(change_buffer,buffer,(size_t)(limit-buffer+1)); } /*:31*/ -#line 243 "cwebdir/common.w" +#line 241 "cwebdir/common.w" } /*:28*//*33:*/ -#line 308 "cwebdir/common.w" +#line 306 "cwebdir/common.w" static void check_change(void) @@ -699,7 +699,7 @@ changing= 1;print_where= 1;change_line++; if(!input_ln(change_file)){ #line 121 "cwebdir/comm-w2c.ch" err_print(_("! Change file ended before @y")); -#line 323 "cwebdir/common.w" +#line 321 "cwebdir/common.w" change_limit= change_buffer;changing= 0; return; @@ -707,12 +707,12 @@ return; if(limit> buffer+1&&buffer[0]=='@'){ char xyz_code= xisupper(buffer[1])?tolower((eight_bits)buffer[1]):buffer[1]; /*34:*/ -#line 346 "cwebdir/common.w" +#line 344 "cwebdir/common.w" if(xyz_code=='x'||xyz_code=='z'){ #line 133 "cwebdir/comm-w2c.ch" loc= buffer+2;err_print(_("! Where is the matching @y?")); -#line 349 "cwebdir/common.w" +#line 347 "cwebdir/common.w" } else if(xyz_code=='y'){ @@ -721,7 +721,7 @@ loc= buffer+2; printf("\n! Hmm... %d ",n); #line 139 "cwebdir/comm-w2c.ch" err_print(_("of the preceding lines failed to match")); -#line 356 "cwebdir/common.w" +#line 354 "cwebdir/common.w" } change_depth= include_depth; @@ -729,11 +729,11 @@ return; } /*:34*/ -#line 330 "cwebdir/common.w" +#line 328 "cwebdir/common.w" } /*31:*/ -#line 277 "cwebdir/common.w" +#line 275 "cwebdir/common.w" { change_limit= change_buffer+(ptrdiff_t)(limit-buffer); @@ -741,14 +741,14 @@ strncpy(change_buffer,buffer,(size_t)(limit-buffer+1)); } /*:31*/ -#line 332 "cwebdir/common.w" +#line 330 "cwebdir/common.w" changing= 0;cur_line++; while(!input_ln(cur_file)){ if(include_depth==0){ #line 127 "cwebdir/comm-w2c.ch" err_print(_("! CWEB file ended during a change")); -#line 337 "cwebdir/common.w" +#line 335 "cwebdir/common.w" input_has_ended= 1;return; } @@ -759,14 +759,14 @@ if(lines_dont_match)n++; } /*:33*//*35:*/ -#line 366 "cwebdir/common.w" +#line 364 "cwebdir/common.w" void reset_input(void) { limit= buffer;loc= buffer+1;buffer[0]= ' '; /*36:*/ -#line 381 "cwebdir/common.w" +#line 379 "cwebdir/common.w" #line 149 "cwebdir/comm-w2c.ch" if((found_filename= kpse_find_cweb(web_file_name))==NULL|| @@ -779,7 +779,7 @@ strcpy(web_file_name,found_filename+ ((strncmp(found_filename,"./",2)==0)?2:0)); free(found_filename); }else fatal(_("! Filename too long\n"),found_filename); -#line 387 "cwebdir/common.w" +#line 385 "cwebdir/common.w" web_file_open= 1; @@ -794,10 +794,10 @@ strcpy(change_file_name,found_filename+ ((strncmp(found_filename,"./",2)==0)?2:0)); free(found_filename); }else fatal(_("! Filename too long\n"),found_filename); -#line 392 "cwebdir/common.w" +#line 390 "cwebdir/common.w" /*:36*/ -#line 371 "cwebdir/common.w" +#line 369 "cwebdir/common.w" include_depth= 0;cur_line= 0;change_line= 0; change_depth= include_depth; @@ -806,20 +806,20 @@ limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= 0; } /*:35*//*38:*/ -#line 410 "cwebdir/common.w" +#line 408 "cwebdir/common.w" boolean get_line(void) { restart: if(changing&&include_depth==change_depth) /*41:*/ -#line 518 "cwebdir/common.w" +#line 516 "cwebdir/common.w" { change_line++; if(!input_ln(change_file)){ #line 274 "cwebdir/comm-w2c.ch" err_print(_("! Change file ended without @z")); -#line 522 "cwebdir/common.w" +#line 520 "cwebdir/common.w" buffer[0]= '@';buffer[1]= 'z';limit= buffer+2; } @@ -837,7 +837,7 @@ if(buffer[1]=='x'||buffer[1]=='y'){ loc= buffer+2; #line 280 "cwebdir/comm-w2c.ch" err_print(_("! Where is the matching @z?")); -#line 538 "cwebdir/common.w" +#line 536 "cwebdir/common.w" } else if(buffer[1]=='z'){ @@ -848,11 +848,11 @@ prime_the_change_buffer();changing= !changing;print_where= 1; } /*:41*/ -#line 415 "cwebdir/common.w" +#line 413 "cwebdir/common.w" if(!changing||include_depth> change_depth){ /*40:*/ -#line 501 "cwebdir/common.w" +#line 499 "cwebdir/common.w" { cur_line++; while(!input_ln(cur_file)){ @@ -871,7 +871,7 @@ if(change_limit> change_buffer)check_change(); } /*:40*/ -#line 417 "cwebdir/common.w" +#line 415 "cwebdir/common.w" if(changing&&include_depth==change_depth)goto restart; } @@ -883,25 +883,25 @@ while(*loc==' '||*loc=='\t')loc++; if(loc>=limit){ #line 180 "cwebdir/comm-w2c.ch" err_print(_("! Include file name not given")); -#line 427 "cwebdir/common.w" +#line 425 "cwebdir/common.w" goto restart; } if(include_depth>=max_include_depth-1){ #line 186 "cwebdir/comm-w2c.ch" err_print(_("! Too many nested includes")); -#line 432 "cwebdir/common.w" +#line 430 "cwebdir/common.w" goto restart; } include_depth++; /*39:*/ -#line 455 "cwebdir/common.w" +#line 453 "cwebdir/common.w" { #line 223 "cwebdir/comm-w2c.ch" char*cur_file_name_end= cur_file_name+max_file_name_length-1; char*k= cur_file_name; -#line 460 "cwebdir/common.w" +#line 458 "cwebdir/common.w" if(*loc=='"'){ loc++; @@ -922,17 +922,17 @@ strcpy(cur_file_name,found_filename+ ((strncmp(found_filename,"./",2)==0)?2:0)); free(found_filename); }else fatal(_("! Filename too long\n"),found_filename); -#line 471 "cwebdir/common.w" +#line 469 "cwebdir/common.w" cur_line= 0;print_where= 1; goto restart; } #line 268 "cwebdir/comm-w2c.ch" include_depth--;err_print(_("! Cannot open include file"));goto restart; -#line 499 "cwebdir/common.w" +#line 497 "cwebdir/common.w" } /*:39*/ -#line 436 "cwebdir/common.w" +#line 434 "cwebdir/common.w" } return 1; @@ -940,7 +940,7 @@ return 1; #line 201 "cwebdir/comm-w2c.ch" /*:38*//*42:*/ -#line 550 "cwebdir/common.w" +#line 548 "cwebdir/common.w" void check_complete(void){ @@ -950,13 +950,13 @@ limit= buffer+(ptrdiff_t)(change_limit-change_buffer); changing= 1;change_depth= include_depth;loc= buffer; #line 286 "cwebdir/comm-w2c.ch" err_print(_("! Change file entry did not match")); -#line 558 "cwebdir/common.w" +#line 556 "cwebdir/common.w" } } /*:42*//*48:*/ -#line 643 "cwebdir/common.w" +#line 641 "cwebdir/common.w" name_pointer id_lookup( @@ -971,17 +971,17 @@ name_pointer p; if(last==NULL)for(last= first;*last!='\0';last++); l= (int)(last-first); /*49:*/ -#line 666 "cwebdir/common.w" +#line 664 "cwebdir/common.w" h= (eight_bits)*i; while(++ilink; @@ -991,28 +991,28 @@ p->link= hash[h];hash[h]= p; } /*:50*/ -#line 657 "cwebdir/common.w" +#line 655 "cwebdir/common.w" if(p==name_ptr)/*51:*/ -#line 685 "cwebdir/common.w" +#line 683 "cwebdir/common.w" { #line 293 "cwebdir/comm-w2c.ch" if(byte_ptr+l> byte_mem_end)overflow(_("byte memory")); if(name_ptr>=name_dir_end)overflow(_("name")); -#line 688 "cwebdir/common.w" +#line 686 "cwebdir/common.w" strncpy(byte_ptr,first,l); (++name_ptr)->byte_start= byte_ptr+= l; init_p(p,t); } /*:51*/ -#line 658 "cwebdir/common.w" +#line 656 "cwebdir/common.w" return(p); } /*:48*//*52:*/ -#line 717 "cwebdir/common.w" +#line 715 "cwebdir/common.w" void print_section_name( @@ -1033,7 +1033,7 @@ if(q)term_write("...",3); } /*:52*//*53:*/ -#line 736 "cwebdir/common.w" +#line 734 "cwebdir/common.w" void sprint_section_name( @@ -1056,7 +1056,7 @@ s= p->byte_start; } /*:53*//*54:*/ -#line 757 "cwebdir/common.w" +#line 755 "cwebdir/common.w" void print_prefix_name( @@ -1069,7 +1069,7 @@ if(s+l<(p+1)->byte_start)term_write("...",3); } /*:54*//*56:*/ -#line 783 "cwebdir/common.w" +#line 781 "cwebdir/common.w" static int web_strcmp( char*j, @@ -1087,7 +1087,7 @@ else return greater; } /*:56*//*57:*/ -#line 812 "cwebdir/common.w" +#line 810 "cwebdir/common.w" static name_pointer add_section_name( @@ -1103,7 +1103,7 @@ int name_len= (int)(last-first)+ispref; #line 301 "cwebdir/comm-w2c.ch" if(s+name_len> byte_mem_end)overflow(_("byte memory")); if(name_ptr+1>=name_dir_end)overflow(_("name")); -#line 826 "cwebdir/common.w" +#line 824 "cwebdir/common.w" (++name_ptr)->byte_start= byte_ptr= s+name_len; if(ispref){ *(byte_ptr-1)= ' '; @@ -1120,7 +1120,7 @@ return par==NULL?(root= p):c==less?(par->llink= p):(par->rlink= p); } /*:57*//*58:*/ -#line 841 "cwebdir/common.w" +#line 839 "cwebdir/common.w" static void extend_section_name( @@ -1134,21 +1134,21 @@ name_pointer q= p+1; int name_len= (int)(last-first)+ispref; #line 308 "cwebdir/comm-w2c.ch" if(name_ptr>=name_dir_end)overflow(_("name")); -#line 853 "cwebdir/common.w" +#line 851 "cwebdir/common.w" while(q->link!=name_dir)q= q->link; q->link= name_ptr; s= name_ptr->byte_start; name_ptr->link= name_dir; #line 314 "cwebdir/comm-w2c.ch" if(s+name_len> byte_mem_end)overflow(_("byte memory")); -#line 858 "cwebdir/common.w" +#line 856 "cwebdir/common.w" (++name_ptr)->byte_start= byte_ptr= s+name_len; strncpy(s,first,name_len); if(ispref)*(byte_ptr-1)= ' '; } /*:58*//*59:*/ -#line 869 "cwebdir/common.w" +#line 867 "cwebdir/common.w" name_pointer section_lookup( @@ -1163,7 +1163,7 @@ name_pointer par= NULL; int name_len= (int)(last-first)+1; /*60:*/ -#line 893 "cwebdir/common.w" +#line 891 "cwebdir/common.w" while(p){ c= web_strcmp(first,name_len,first_chunk(p),prefix_length(p)); @@ -1175,12 +1175,12 @@ p= (c==less?p->llink:p->rlink); if(r!=NULL){ #line 320 "cwebdir/comm-w2c.ch" fputs(_("\n! Ambiguous prefix: matches <"),stdout); -#line 903 "cwebdir/common.w" +#line 901 "cwebdir/common.w" print_prefix_name(p); #line 326 "cwebdir/comm-w2c.ch" fputs(_(">\n and <"),stdout); -#line 906 "cwebdir/common.w" +#line 904 "cwebdir/common.w" print_prefix_name(r); err_print(">"); return name_dir; @@ -1194,19 +1194,19 @@ p= q,q= NULL; } /*:60*/ -#line 883 "cwebdir/common.w" +#line 881 "cwebdir/common.w" /*61:*/ -#line 918 "cwebdir/common.w" +#line 916 "cwebdir/common.w" if(r==NULL) return add_section_name(par,c,first,last+1,ispref); /*:61*/ -#line 884 "cwebdir/common.w" +#line 882 "cwebdir/common.w" /*62:*/ -#line 926 "cwebdir/common.w" +#line 924 "cwebdir/common.w" switch(section_name_cmp(&first,name_len,r)){ @@ -1214,7 +1214,7 @@ case prefix: if(!ispref){ #line 332 "cwebdir/comm-w2c.ch" fputs(_("\n! New name is a prefix of <"),stdout); -#line 932 "cwebdir/common.w" +#line 930 "cwebdir/common.w" print_section_name(r); err_print(">"); @@ -1228,7 +1228,7 @@ return r; case bad_extension: #line 338 "cwebdir/comm-w2c.ch" fputs(_("\n! New name extends <"),stdout); -#line 944 "cwebdir/common.w" +#line 942 "cwebdir/common.w" print_section_name(r); err_print(">"); @@ -1236,24 +1236,24 @@ return r; default: #line 344 "cwebdir/comm-w2c.ch" fputs(_("\n! Section name incompatible with <"),stdout); -#line 950 "cwebdir/common.w" +#line 948 "cwebdir/common.w" print_prefix_name(r); #line 350 "cwebdir/comm-w2c.ch" fputs(_(">,\n which abbreviates <"),stdout); -#line 953 "cwebdir/common.w" +#line 951 "cwebdir/common.w" print_section_name(r); err_print(">"); return r; } /*:62*/ -#line 885 "cwebdir/common.w" +#line 883 "cwebdir/common.w" } /*:59*//*64:*/ -#line 977 "cwebdir/common.w" +#line 975 "cwebdir/common.w" static int section_name_cmp( char**pfirst, @@ -1287,7 +1287,7 @@ default:return c; } /*:64*//*66:*/ -#line 1029 "cwebdir/common.w" +#line 1027 "cwebdir/common.w" void err_print( @@ -1296,14 +1296,14 @@ const char*s) char*k,*l; printf(*s=='!'?"\n%s":"%s",s); if(web_file_open)/*67:*/ -#line 1049 "cwebdir/common.w" +#line 1047 "cwebdir/common.w" {if(changing&&include_depth==change_depth) #line 358 "cwebdir/comm-w2c.ch" printf(_(". (l. %d of change file)\n"),change_line); else if(include_depth==0)printf(_(". (l. %d)\n"),cur_line); else printf(_(". (l. %d of include file %s)\n"),cur_line,cur_file_name); -#line 1054 "cwebdir/common.w" +#line 1052 "cwebdir/common.w" l= (loc>=limit?limit:loc); if(l> buffer){ for(k= buffer;k 0){ if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*80:*/ #line 510 "cwebdir/comm-w2c.ch" @@ -1469,7 +1469,7 @@ if(sscanf(++dot_pos,"%u",&kpathsea_debug)!=1)/*81:*/ cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill"); -#line 1281 "cwebdir/common.w" +#line 1279 "cwebdir/common.w" #line 563 "cwebdir/comm-w2c.ch" /*:81*/ @@ -1482,13 +1482,13 @@ if(*dot_pos=='l'){ use_language= ++dot_pos; break; }else -#line 1267 "cwebdir/common.w" +#line 1265 "cwebdir/common.w" flags[(eight_bits)*dot_pos]= flag_change; } #line 555 "cwebdir/comm-w2c.ch" /*:80*/ -#line 1187 "cwebdir/common.w" +#line 1185 "cwebdir/common.w" else{ s= name_pos= *argv;dot_pos= NULL; @@ -1500,20 +1500,20 @@ dot_pos= NULL,name_pos= ++s; else s++; } -#line 1195 "cwebdir/common.w" +#line 1193 "cwebdir/common.w" if(!found_web)/*77:*/ -#line 1212 "cwebdir/common.w" +#line 1210 "cwebdir/common.w" { if(s-*argv> max_file_name_length-5) /*82:*/ #line 563 "cwebdir/comm-w2c.ch" fatal(_("! Filename too long\n"),*argv); -#line 1283 "cwebdir/common.w" +#line 1281 "cwebdir/common.w" /*:82*/ -#line 1215 "cwebdir/common.w" +#line 1213 "cwebdir/common.w" if(dot_pos==NULL) sprintf(web_file_name,"%s.w",*argv); @@ -1521,7 +1521,7 @@ else{ strcpy(web_file_name,*argv); *dot_pos= 0; } -#line 1223 "cwebdir/common.w" +#line 1221 "cwebdir/common.w" sprintf(tex_file_name,"%s.tex",name_pos); sprintf(idx_file_name,"%s.idx",name_pos); sprintf(scn_file_name,"%s.scn",name_pos); @@ -1530,10 +1530,10 @@ found_web= 1; } /*:77*/ -#line 1196 "cwebdir/common.w" +#line 1194 "cwebdir/common.w" else if(!found_change)/*78:*/ -#line 1230 "cwebdir/common.w" +#line 1228 "cwebdir/common.w" { if(strcmp(*argv,"-")!=0){ @@ -1541,11 +1541,11 @@ if(s-*argv> max_file_name_length-4) /*82:*/ #line 563 "cwebdir/comm-w2c.ch" fatal(_("! Filename too long\n"),*argv); -#line 1283 "cwebdir/common.w" +#line 1281 "cwebdir/common.w" /*:82*/ -#line 1234 "cwebdir/common.w" +#line 1232 "cwebdir/common.w" if(dot_pos==NULL) sprintf(change_file_name,"%s.ch",*argv); @@ -1555,21 +1555,21 @@ found_change= 1; } /*:78*/ -#line 1197 "cwebdir/common.w" +#line 1195 "cwebdir/common.w" else if(!found_out)/*79:*/ -#line 1242 "cwebdir/common.w" +#line 1240 "cwebdir/common.w" { if(s-*argv> max_file_name_length-5) /*82:*/ #line 563 "cwebdir/comm-w2c.ch" fatal(_("! Filename too long\n"),*argv); -#line 1283 "cwebdir/common.w" +#line 1281 "cwebdir/common.w" /*:82*/ -#line 1245 "cwebdir/common.w" +#line 1243 "cwebdir/common.w" if(dot_pos==NULL){ sprintf(tex_file_name,"%s.tex",*argv); @@ -1589,18 +1589,18 @@ found_out= 1; } /*:79*/ -#line 1198 "cwebdir/common.w" +#line 1196 "cwebdir/common.w" else/*81:*/ #line 555 "cwebdir/comm-w2c.ch" cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill"); -#line 1281 "cwebdir/common.w" +#line 1279 "cwebdir/common.w" #line 563 "cwebdir/comm-w2c.ch" /*:81*/ -#line 1199 "cwebdir/common.w" +#line 1197 "cwebdir/common.w" } } @@ -1609,11 +1609,11 @@ if(!found_web)/*81:*/ cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill"); -#line 1281 "cwebdir/common.w" +#line 1279 "cwebdir/common.w" #line 563 "cwebdir/comm-w2c.ch" /*:81*/ -#line 1202 "cwebdir/common.w" +#line 1200 "cwebdir/common.w" } -- cgit v1.2.3