summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2024-06-05 07:17:31 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2024-06-05 07:17:31 +0000
commit3980e009fdc291a81d9870e879194b6e21540d96 (patch)
treefa123fced42acf4b95fb7de805eca8c3eef5e361 /Build
parentefe255ce57bcddf8fc8373373ca36c79825307e8 (diff)
Correctly count parts and sections.
Rerun 'fix-changefile-lines.py' on TEX.WEB amd MF.WEB. git-svn-id: svn://tug.org/texlive/trunk@71438 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog2
-rw-r--r--Build/source/texk/web2c/mf.ch142
-rw-r--r--Build/source/texk/web2c/tex.ch8
3 files changed, 77 insertions, 75 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index c79e05eb61a..025a70eb69c 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -3,6 +3,8 @@
* tests/fix-changefile-lines.py,
* tangle.ch,
* weave.ch: Correctly count section start markers.
+ * mf.ch,
+ * tex.ch: Recount parts and sections.
2024-06-03 David Fuchs <drfuchs@yahoo.com>
diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch
index d3c07230cbb..f293a65b0ae 100644
--- a/Build/source/texk/web2c/mf.ch
+++ b/Build/source/texk/web2c/mf.ch
@@ -1090,7 +1090,7 @@ if odd(right_type(q)) then a:=good_val(b,pen_edge+halfp(cur_gran))
else a:=good_val(b-1,pen_edge+halfp(cur_gran));
@z
-@x [24.510] l.10808 - i18n fix
+@x [24.509] l.10808 - i18n fix
print(" ("); print_int(info(h)); print(" offset");
if info(h)<>1 then print_char("s");
@y
@@ -1102,7 +1102,7 @@ else print(" offset");
% [25.530] |make_fraction| and |take_fraction| arguments are too long for
% some preprocessors, when they were defined as macros, just as in the
% previous change.
-@x [25.534] l.11334
+@x [25.530] l.11334
alpha:=take_fraction(take_fraction(major_axis,
make_fraction(gamma,beta)),n_cos)@|
-take_fraction(take_fraction(minor_axis,
@@ -1119,19 +1119,19 @@ else print(" offset");
gamma := pyth_add (take_fraction (major_axis, n_cos), gamma);
@z
-@x [26.560] l.11902 - Use halfp.
+@x [26.556] l.11902 - Use halfp.
begin cur_t:=half(cur_t+1); cur_tt:=half(cur_tt+1); return;
@y
begin cur_t:=halfp(cur_t+1); cur_tt:=halfp(cur_tt+1); return;
@z
-@x [26.565] l.11999 - Use halfp.
+@x [26.561] l.11999 - Use halfp.
begin cur_t:=half(cur_t); cur_tt:=half(cur_tt);
@y
begin cur_t:=halfp(cur_t); cur_tt:=halfp(cur_tt);
@z
-@x [27.568] l.12089 - The window functions are defined externally, in C.
+@x [27.564] l.12089 - The window functions are defined externally, in C.
@p function init_screen:boolean;
begin init_screen:=false;
end;
@@ -1143,7 +1143,7 @@ end;
{These functions/procedures are defined externally in C.}
@z
-@x [27.569] l.12114 - screen_row, screen_col are variables, so can't be subrange array bounds.
+@x [27.565] l.12114 - screen_row, screen_col are variables, so can't be subrange array bounds.
@!screen_row=0..screen_depth; {a row number on the screen}
@!screen_col=0..screen_width; {a column number on the screen}
@!trans_spec=array[screen_col] of screen_col; {a transition spec, see below}
@@ -1153,7 +1153,7 @@ end;
@!trans_spec=^screen_col; {a transition spec, see below}
@z
-@x [27.571] l.12138
+@x [27.567] l.12138
@p procedure blank_rectangle(@!left_col,@!right_col:screen_col;
@!top_row,@!bot_row:screen_row);
var @!r:screen_row;
@@ -1169,7 +1169,7 @@ end;
{Same thing.}
@z
-@x [27.572] l.12165
+@x [27.568] l.12165
@p procedure paint_row(@!r:screen_row;@!b:pixel_color;var @!a:trans_spec;
@!n:screen_col);
var @!k:screen_col; {an index into |a|}
@@ -1191,13 +1191,13 @@ end;
{Same thing}
@z
-@x [28.600] l.12687 - Use halfp.
+@x [28.596] l.12687 - Use halfp.
if abs(v)>half(threshold) then
@y
if abs(v)>halfp(threshold) then
@z
-@x [31.635] l.13377 - Add datastructures for file:line:error.
+@x [31.631] l.13377 - Add datastructures for file:line:error.
@!line_stack : array[1..max_in_open] of integer;
@y
@!line_stack : array[1..max_in_open] of integer;
@@ -1205,7 +1205,7 @@ if abs(v)>halfp(threshold) then
@!full_source_filename_stack : ^str_number;
@z
-@x [38.772] l.15564 - Area and extension rules.
+@x [38.768] l.15564 - Area and extension rules.
@ The file names we shall deal with for illustrative purposes have the
following structure: If the name contains `\.>' or `\.:', the file area
consists of all characters up to and including the final such character;
@@ -1237,20 +1237,20 @@ track of the occurrences of area and extension delimiters:
@!ext_delimiter:pool_pointer; {the most recent `\..', if any}
@z
-@x [38.773] l.15584 - MF area directories.
+@x [38.769] l.15584 - MF area directories.
@d MF_area=="MFinputs:"
@.MFinputs@>
@y
In C, the default paths are specified separately.
@z
-@x [38.774] l.15591 - filenames: quoted
+@x [38.770] l.15591 - filenames: quoted
begin area_delimiter:=0; ext_delimiter:=0;
@y
begin area_delimiter:=0; ext_delimiter:=0; quoted_filename:=false;
@z
-@x [38.775] l.15598 - more_name
+@x [38.771] l.15598 - more_name
begin if c=" " then more_name:=false
else begin if (c=">")or(c=":") then
@y
@@ -1265,13 +1265,13 @@ else begin
if IS_DIR_SEP (c) then
@z
-@x [38.775] l.15602 - more_name
+@x [38.771] l.15602 - more_name
else if (c=".")and(ext_delimiter=0) then ext_delimiter:=pool_ptr;
@y
else if c="." then ext_delimiter:=pool_ptr;
@z
-@x [38.776] l.15611 - end_name: quote if spaces in names.
+@x [38.772] l.15611 - end_name: quote if spaces in names.
@p procedure end_name;
@y
@d pool_seq_check(#) == {set |s:=str_start[str_ptr]| and |t:=#|,
@@ -1298,7 +1298,7 @@ var must_quote:boolean; {whether we need to quote a string}
@!j,@!s,@!t: pool_pointer; {running indices}
@z
-@x [38.776] l.15618 - end_name: quote if spaces in names.
+@x [38.772] l.15618 - end_name: quote if spaces in names.
if area_delimiter=0 then cur_area:=""
else begin cur_area:=str_ptr; incr(str_ptr);
str_start[str_ptr]:=area_delimiter+1;
@@ -1341,7 +1341,7 @@ if ext_delimiter=0 then cur_name:=make_string
else cur_ext:=make_string;
@z
-@x [38.777] l.15635 - print_file_name: quote if spaces in names.
+@x [38.773] l.15635 - print_file_name: quote if spaces in names.
@<Basic printing...@>=
procedure print_file_name(@!n,@!a,@!e:integer);
begin slow_print(a); slow_print(n); slow_print(e);
@@ -1371,7 +1371,7 @@ print_quoted(a); print_quoted(n); print_quoted(e);
if must_quote then slow_print("""");
@z
-@x [38.778] l.15646 - have append_to_name skip quotes.
+@x [38.774] l.15646 - have append_to_name skip quotes.
@d append_to_name(#)==begin c:=#; incr(k);
if k<=file_name_size then name_of_file[k]:=xchr[c];
end
@@ -1381,27 +1381,27 @@ if must_quote then slow_print("""");
end end
@z
-@x [38.778] l.15655 - (pack_file_name) malloc and null terminate name_of_file.
+@x [38.774] l.15655 - (pack_file_name) malloc and null terminate name_of_file.
for j:=str_start[a] to str_start[a+1]-1 do append_to_name(so(str_pool[j]));
@y
if name_of_file then libc_free (name_of_file);
name_of_file := xmalloc_array (ASCII_code, length(a)+length(n)+length(e)+1);
for j:=str_start[a] to str_start[a+1]-1 do append_to_name(so(str_pool[j]));
@z
-@x [38.778] l.15659
+@x [38.774] l.15659
for k:=name_length+1 to file_name_size do name_of_file[k]:=' ';
@y
name_of_file[name_length + 1] := 0;
@z
-@x [38.779] l.15668 - The default base.
+@x [38.775] l.15668 - The default base.
@d base_default_length=18 {length of the |MF_base_default| string}
@d base_area_length=8 {length of its area part}
@y
@d base_area_length=0 {no fixed area in C}
@z
-@x [38.779] l.15674 - Where `plain.base' is.
+@x [38.775] l.15674 - Where `plain.base' is.
@!MF_base_default:packed array[1..base_default_length] of char;
@ @<Set init...@>=
@@ -1415,7 +1415,7 @@ in \.{texmfmp.c}, since we want them to depend on the name of the
program.
@z
-@x [38.782] l.15703 - Change to pack_buffered_name as with pack_file_name.
+@x [38.778] l.15703 - Change to pack_buffered_name as with pack_file_name.
for j:=1 to n do append_to_name(xord[MF_base_default[j]]);
for j:=a to b do append_to_name(buffer[j]);
for j:=base_default_length-base_ext_length+1 to base_default_length do
@@ -1433,7 +1433,7 @@ if k<=file_name_size then name_length:=k@+else name_length:=file_name_size;
name_of_file[name_length + 1] := 0;
@z
-@x [38.783] l.15726 - Base file opening: do path searching for the default, not plain.
+@x [38.779] l.15726 - Base file opening: do path searching for the default, not plain.
pack_buffered_name(0,loc,j-1); {try first without the system file area}
if w_open_in(base_file) then goto found;
pack_buffered_name(base_area_length,loc,j-1);
@@ -1443,7 +1443,7 @@ name_of_file[name_length + 1] := 0;
pack_buffered_name(0,loc,j-1);
if w_open_in(base_file) then goto found;
@z
-@x [38.783] l.15732
+@x [38.779] l.15732
wterm_ln('Sorry, I can''t find that base;',' will try PLAIN.');
@y
wterm ('Sorry, I can''t find the base `');
@@ -1452,7 +1452,7 @@ name_of_file[name_length + 1] := 0;
fputs (MF_base_default + 1, stdout);
wterm_ln ('''.');
@z
-@x [38.783] l.15740
+@x [38.779] l.15740
wterm_ln('I can''t find the PLAIN base file!');
@.I can't find PLAIN...@>
@y
@@ -1462,7 +1462,7 @@ name_of_file[name_length + 1] := 0;
@.I can't find the base...@>
@z
-@x [38.784] l.15763 - make_name_string
+@x [38.780] l.15763 - make_name_string
make_name_string:=make_string;
end;
@y
@@ -1479,27 +1479,27 @@ name_of_file[name_length + 1] := 0;
end_name;
@z
-@x [38.785] l.15795 - Make scan_file_name ignore leading tabs as well as spaces.
+@x [38.781] l.15795 - Make scan_file_name ignore leading tabs as well as spaces.
while buffer[loc]=" " do incr(loc);
@y
while (buffer[loc]=" ")or(buffer[loc]=tab) do incr(loc);
@z
-@x [38.786] l.15805 - `logname' is declared in <unistd.h> on some systems.
+@x [38.782] l.15805 - `logname' is declared in <unistd.h> on some systems.
`\.{.base}' and `\.{.tfm}' in the names of \MF's output files.
@y
`\.{.base}' and `\.{.tfm}' in the names of \MF's output files.
@d log_name == texmf_log_name
@z
-@x [38.790] l.15847 - prompt_file_name: avoid empty filenames.
+@x [38.786] l.15847 - prompt_file_name: avoid empty filenames.
var @!k:0..buf_size; {index into |buffer|}
@y
var @!k:0..buf_size; {index into |buffer|}
@!saved_cur_name:str_number; {to catch empty terminal input}
@z
-@x [38.790] l.15860 - prompt_file_name: avoid empty filenames.
+@x [38.786] l.15860 - prompt_file_name: avoid empty filenames.
clear_terminal; prompt_input(": "); @<Scan file name in the buffer@>;
if cur_ext="" then cur_ext:=e;
@y
@@ -1509,19 +1509,19 @@ if cur_ext="" then cur_ext:=e;
if length(cur_name)=0 then cur_name:=saved_cur_name;
@z
-@x [38.791] l.15867 - <Scan file name...> needs similar leading tab treatment.
+@x [38.787] l.15867 - <Scan file name...> needs similar leading tab treatment.
while (buffer[k]=" ")and(k<last) do incr(k);
@y
while ((buffer[k]=" ")or(buffer[k]=tab))and(k<last) do incr(k);
@z
-@x [38.792] l.15883 - Adjust for C string conventions.
+@x [38.788] l.15883 - Adjust for C string conventions.
@!months:packed array [1..36] of char; {abbreviations of month names}
@y
@!months:const_cstring;
@z
-@x [38.792] l.15885 - Set correct filename for recorder.
+@x [38.788] l.15885 - Set correct filename for recorder.
if job_name=0 then job_name:="mfput";
@.mfput@>
pack_job_name(".log");
@@ -1533,13 +1533,13 @@ recorder_change_filename(stringcast(name_of_file+1));
pack_job_name(".log");
@z
-@x [38.794] l.15924 - leading character for C string
+@x [38.790] l.15924 - leading character for C string
months:='JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC';
@y
months := ' JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC';
@z
-@x [38.794] l.15928 - Print TCX name, if given.
+@x [38.790] l.15928 - Print TCX name, if given.
end
@y
if translate_filename then begin
@@ -1551,7 +1551,7 @@ end;
end
@z
-@x [38.797] l.15956 - (start_input) a_open_in of input file needs path specifier.
+@x [38.793] l.15956 - (start_input) a_open_in of input file needs path specifier.
begin @<Put the desired file name in |(cur_name,cur_ext,cur_area)|@>;
if cur_ext="" then cur_ext:=".mf";
pack_cur_name;
@@ -1576,20 +1576,20 @@ loop@+begin
goto done;
@z
-@x [38.797] l.15970 - The job name may have been given on the command line.
+@x [38.793] l.15970 - The job name may have been given on the command line.
begin job_name:=cur_name; open_log_file;
@y
begin job_name:=get_job_name(cur_name); open_log_file;
@z
-@x [38.797] l.15976 - Can't return name to string pool because of editor option?
+@x [38.793] l.15976 - Can't return name to string pool because of editor option?
if name=str_ptr-1 then {conserve string pool space (but see note above)}
begin flush_string(name); name:=cur_name;
end;
@y
@z
-@x [41.870] l.17320 - Use halfp.
+@x [41.866] l.17320 - Use halfp.
major_axis:=half(a_minus_b+a_plus_b); minor_axis:=half(abs(a_plus_b-a_minus_b));
if major_axis=minor_axis then theta:=0 {circle}
else theta:=half(n_arg(txx-tyy,tyx+txy)+n_arg(txx+tyy,tyx-txy));
@@ -1599,7 +1599,7 @@ if major_axis=minor_axis then theta:=0 {circle}
else theta:=half(n_arg(txx-tyy,tyx+txy)+n_arg(txx+tyy,tyx-txy));
@z
-@x [44.1027] l.19871 - if batchmode, MakeTeX... scripts should be silent.
+@x [44.1023] l.19871 - if batchmode, MakeTeX... scripts should be silent.
mode_command: begin print_ln; interaction:=cur_mod;
@y
mode_command: begin print_ln; interaction:=cur_mod;
@@ -1610,7 +1610,7 @@ else kpse_make_tex_discard_errors := 0;
% [45.1120] `threshold' is both a function and a variable. Since the
% function is used much less often than the variable, we'll change that
-@x [45.1124] l.21405
+@x [45.1120] l.21405
@p function threshold(@!m:integer):scaled;
var @!d:scaled; {lower bound on the smallest interval size}
begin excess:=min_cover(0)-m;
@@ -1630,19 +1630,19 @@ else begin repeat d:=perturbation;
threshold_fn:=d;
@z
-@x [45.1125] l.21428 - Change the call to the threshold function.
+@x [45.1121] l.21428 - Change the call to the threshold function.
begin d:=threshold(m); perturbation:=0;
@y
begin d:=threshold_fn(m); perturbation:=0;
@z
-@x [45.1126] l.21443 - Use halfp.
+@x [45.1122] l.21443 - Use halfp.
v:=l+half(value(p)-l);
@y
v:=l+halfp(value(p)-l);
@z
-@x [45.1137] l.21592 - Use C macros to do the TFM writing, to avoid casting(?) problems.
+@x [45.1133] l.21592 - Use C macros to do the TFM writing, to avoid casting(?) problems.
@d tfm_out(#)==write(tfm_file,#) {output one byte to |tfm_file|}
@p procedure tfm_two(@!x:integer); {output two bytes to |tfm_file|}
@@ -1672,19 +1672,19 @@ I don't know why not. Some casting problem?
@p procedure tfm_qqqq(@!x:four_quarters); {output four quarterwords to |tfm_file|}
@z
-@x [45.1138] l.21627 - print_file_name
+@x [45.1134] l.21627 - print_file_name
print_nl("Font metrics written on "); slow_print(metric_file_name);
@y
print_nl("Font metrics written on "); print_file_name(0,metric_file_name,0);
@z
-@x [47.1156] l.22122 - declare gf_buf as a pointer, for dynamic allocated
+@x [47.1152] l.22122 - declare gf_buf as a pointer, for dynamic allocated
@!gf_buf:array[gf_index] of eight_bits; {buffer for \.{GF} output}
@y
@!gf_buf:^eight_bits; {dynamically-allocated buffer for \.{GF} output}
@z
-@x [47.1158] l.22143 - omit write_gf
+@x [47.1154] l.22143 - omit write_gf
@<Declare generic font output procedures@>=
procedure write_gf(@!a,@!b:gf_index);
var k:gf_index;
@@ -1696,7 +1696,7 @@ the bytes to be written in one shot. Much better than writing four
bytes at a time.
@z
-@x [47.1159] l.22150 - check gf file size
+@x [47.1155] l.22150 - check gf file size
each time, we use the macro |gf_out|.
@y
each time, we use the macro |gf_out|.
@@ -1706,7 +1706,7 @@ The length of |gf_file| should not exceed |@"7FFFFFFF|; we set
recursion.
@z
-@x [47.1159] l.22158 - gf_swap: check gf file size
+@x [47.1155] l.22158 - gf_swap: check gf file size
begin if gf_limit=gf_buf_size then
@y
begin if gf_ptr>(@"7FFFFFFF-gf_offset) then
@@ -1717,7 +1717,7 @@ begin if gf_ptr>(@"7FFFFFFF-gf_offset) then
if gf_limit=gf_buf_size then
@z
-@x [47.1160] l.22171 - empty the last bytes: check gf file size
+@x [47.1156] l.22171 - empty the last bytes: check gf file size
if gf_ptr>0 then write_gf(0,gf_ptr-1)
@y
if gf_ptr>(@"7FFFFFFF-gf_offset) then
@@ -1728,7 +1728,7 @@ if gf_ptr>(@"7FFFFFFF-gf_offset) then
if gf_ptr>0 then write_gf(0,gf_ptr-1)
@z
-@x [47.1167] l.22263 - C needs k to be 0..256 instead of 0..255.
+@x [47.1163] l.22263 - C needs k to be 0..256 instead of 0..255.
procedure init_gf;
var @!k:eight_bits; {runs through all possible character codes}
@y
@@ -1736,13 +1736,13 @@ procedure init_gf;
var @!k:0..256; {runs through all possible character codes}
@z
-@x [47.1186] l.22501 - print_file_name
+@x [47.1182] l.22501 - print_file_name
print_nl("Output written on "); slow_print(output_file_name);
@y
print_nl("Output written on "); print_file_name(0,output_file_name,0);
@z
-@x [47.1186] l.22503 - i18n fix
+@x [47.1182] l.22503 - i18n fix
print(" ("); print_int(total_chars); print(" character");
if total_chars<>1 then print_char("s");
@y
@@ -1751,20 +1751,20 @@ if total_chars<>1 then print(" characters")
else print(" character");
@z
-@x [48.1189] l.22533 - INI = VIR.
+@x [48.1185] l.22533 - INI = VIR.
base_ident:=" (INIMF)";
@y
if ini_version then base_ident:=" (INIMF)";
@z
-@x [48.1190] l.22540 - Add base_engine.
+@x [48.1186] l.22540 - Add base_engine.
@!w: four_quarters; {four ASCII codes}
@y
@!w: four_quarters; {four ASCII codes}
@!base_engine: ^text_char;
@z
-@x [48.1191] l.22569 - Add base_engine.
+@x [48.1187] l.22569 - Add base_engine.
@!w: four_quarters; {four ASCII codes}
@y
@!w: four_quarters; {four ASCII codes}
@@ -1774,7 +1774,7 @@ if ini_version then base_ident:=" (INIMF)";
@!dummy_xprn: ASCII_code;
@z
-@x [48.1192] l.22585 - Reading and writing of `base_file' is done in C.
+@x [48.1188] l.22585 - Reading and writing of `base_file' is done in C.
@d dump_wd(#)==begin base_file^:=#; put(base_file);@+end
@d dump_int(#)==begin base_file^.int:=#; put(base_file);@+end
@d dump_hh(#)==begin base_file^.hh:=#; put(base_file);@+end
@@ -1782,7 +1782,7 @@ if ini_version then base_ident:=" (INIMF)";
@y
@z
-@x [48.1193] l.22599
+@x [48.1189] l.22599
@d undump_wd(#)==begin get(base_file); #:=base_file^;@+end
@d undump_int(#)==begin get(base_file); #:=base_file^.int;@+end
@d undump_hh(#)==begin get(base_file); #:=base_file^.hh;@+end
@@ -1790,7 +1790,7 @@ if ini_version then base_ident:=" (INIMF)";
@y
@z
-@x [48.1194] l.22615 - Dump engine name.
+@x [48.1190] l.22615 - Dump engine name.
dump_int(@$);@/
@y
dump_int(@"57324D46); {Web2C \MF's magic constant: "W2MF"}
@@ -1806,7 +1806,7 @@ dump_int(@$);@/
@<Dump |xord|, |xchr|, and |xprn|@>;
@z
-@x [48.1195] l.22629 - Avoid Pascal file convention.
+@x [48.1191] l.22629 - Avoid Pascal file convention.
x:=base_file^.int;
if x<>@$ then goto off_base; {check that strings are the same}
undump_int(x);
@@ -1853,7 +1853,7 @@ if mem_min+1100>mem_top then goto off_base;
mem:=xmalloc_array (memory_word, mem_max - mem_min + 1);
@z
-@x [48.1199] l.22713 - Check that p did not become corrupt.
+@x [48.1195] l.22713 - Check that p did not become corrupt.
p:=q+node_size(q);
if (p>lo_mem_max)or((q>=rlink(q))and(rlink(q)<>rover)) then goto off_base;
@y
@@ -1869,20 +1869,20 @@ then goto off_base;
p:=q+node_size(q);
@z
-@x [48.1203] l.22767 - Allow command line to override dumped value.
+@x [48.1199] l.22767 - Allow command line to override dumped value.
undump(batch_mode)(error_stop_mode)(interaction);
@y
undump(batch_mode)(error_stop_mode)(interaction);
if interaction_option<>unspecified_mode then interaction:=interaction_option;
@z
-@x [48.1203] l.22772 - Test for end-of-file already done by undump.
+@x [48.1199] l.22772 - Test for end-of-file already done by undump.
undump_int(x);@+if (x<>69069)or eof(base_file) then goto off_base
@y
undump_int(x);@+if x<>69069 then goto off_base
@z
-@x [49.1208] l.22858 - Dynamic allocation.
+@x [49.1204] l.22858 - Dynamic allocation.
@p begin @!{|start_here|}
@y
@d const_chk(#) == begin if # < inf@&# then # := inf@&# else
@@ -1927,7 +1927,7 @@ end;
@+tini
@z
-@x [49.1208] l.22870 - Only do get_strings_started if ini.
+@x [49.1204] l.22870 - Only do get_strings_started if ini.
@!init if not get_strings_started then goto final_end;
init_tab; {initialize the tables}
init_prim; {call |primitive| for each primitive}
@@ -1946,7 +1946,7 @@ end;
tini@/
@z
-@x [49.1208] l.22885
+@x [49.1204] l.22885
end_of_MF: close_files_and_terminate;
final_end: ready_already:=0;
@y
@@ -1956,7 +1956,7 @@ final_end: do_final_end;
% [49.1205] close_files_and_terminate: Print new line before
% termination; switch to editor if necessary.
-@x [49.1209] l.22917
+@x [49.1205] l.22917
slow_print(log_name); print_char(".");
end;
end;
@@ -1969,7 +1969,7 @@ if (edit_name_start<>0) and (interaction>batch_mode) then
call_edit(str_pool,edit_name_start,edit_name_length,edit_line);
@z
-@x [49.1213] l.23018 - Only do dump if ini.
+@x [49.1209] l.23018 - Only do dump if ini.
begin @!init store_base_file; return;@+tini@/
@y
begin
@@ -1982,7 +1982,7 @@ if (edit_name_start<>0) and (interaction>batch_mode) then
%if (base_ident=0)or(buffer[loc]="&")or dump_line then
%@z
-@x [51.1218] l.23126 - Add editor-switch variable to globals.
+@x [51.1214] l.23126 - Add editor-switch variable to globals.
This section should be replaced, if necessary, by any special
modifications of the program
that are necessary to make \MF\ work at a particular installation.
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index 9f5fe14d668..96603f96d0d 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -2151,7 +2151,7 @@ if name=str_ptr-1 then {we can try to conserve string pool space now}
begin job_name:=get_job_name(cur_name); open_log_file;
@z
-@x [29.537] l.10390 - -
+@x [29.537] l.10390 - -
if term_offset+length(name)>max_print_line-2 then print_ln
else if (term_offset>0)or(file_offset>0) then print_char(" ");
print_char("("); incr(open_parens); slow_print(name); update_terminal;
@@ -3368,11 +3368,11 @@ else begin n:=cur_chr; get_r_token; p:=cur_cs; define(p,relax,256);
% a) the string is already replaced in |scan_file_name| and therefore
% b) the wrong string will get flushed!!!
%
-@x [49.1257] l.23354 - unused variable
+@x [49.1257] l.23354 - unused variable
@!flushable_string:str_number; {string not yet referenced}
@y
@z
-@x [49.1260] l.23409 - new_font: string recycling -- already done
+@x [49.1260] l.23409 - new_font: string recyclingalready done
flushable_string:=str_ptr-1;
@y
@z
@@ -3391,7 +3391,7 @@ flushable_string:=str_ptr-1;
%
% otherwise the wrong string will get removed by |flush_string|!!
%
-@x [49.1260] l.23412 - new_font: string recycling -- already done
+@x [49.1260] l.23412 - new_font: string recyclingalready done
begin if cur_name=flushable_string then
begin flush_string; cur_name:=font_name[f];
end;