texlive[73631] Build/source/texk/web2c: Fill a few gaps in the '@x'
commits+ascherer at tug.org
commits+ascherer at tug.org
Wed Jan 29 11:15:57 CET 2025
Revision: 73631
https://tug.org/svn/texlive?view=revision&revision=73631
Author: ascherer
Date: 2025-01-29 11:15:57 +0100 (Wed, 29 Jan 2025)
Log Message:
-----------
Fill a few gaps in the '@x' lines.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/bibtex.ch
trunk/Build/source/texk/web2c/dvicopy.ch
trunk/Build/source/texk/web2c/dvitype.ch
trunk/Build/source/texk/web2c/gftodvi.ch
trunk/Build/source/texk/web2c/gftopk.ch
trunk/Build/source/texk/web2c/gftype.ch
trunk/Build/source/texk/web2c/mft.ch
trunk/Build/source/texk/web2c/patgen.ch
trunk/Build/source/texk/web2c/pktogf.ch
trunk/Build/source/texk/web2c/pktype.ch
trunk/Build/source/texk/web2c/pltotf.ch
trunk/Build/source/texk/web2c/pooltype.ch
trunk/Build/source/texk/web2c/tftopl.ch
trunk/Build/source/texk/web2c/vftovp.ch
trunk/Build/source/texk/web2c/vptovf.ch
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/ChangeLog 2025-01-29 10:15:57 UTC (rev 73631)
@@ -1,3 +1,21 @@
+2025-01-29 Andreas Scherer <https://ascherer.github.io>
+
+ * bibtex.ch,
+ * dvicopy.ch,
+ * dvitype.ch,
+ * gftodvi.ch,
+ * gftopk.ch,
+ * gftype.ch,
+ * mft.ch,
+ * patgen.ch,
+ * pktogf.ch,
+ * pktype.ch,
+ * pltotf.ch,
+ * pooltype.ch,
+ * tftopl.ch,
+ * vftovp.ch,
+ * vptovf.ch: Fill a few gaps in the '@x' lines.
+
2025-01-28 Karl Berry <karl at freefriends.org>
* dvitype.ch: run tests/fix-changefile-lines.py to get chapter and
Modified: trunk/Build/source/texk/web2c/bibtex.ch
===================================================================
--- trunk/Build/source/texk/web2c/bibtex.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/bibtex.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -21,7 +21,7 @@
% [0] Let bibtex.tex work with latest webmac (which defines \ET, hence
% making E active loses).
- at x
+ at x [0]
% Note: WEAVE will typeset an upper-case `E' in a PASCAL identifier a
% bit strangely so that the `TeX' in the name of this program is typeset
% correctly; if this becomes a problem remove these three lines to get
@@ -46,7 +46,7 @@
% side -- and stdout is sometimes implemented as `&_iob[1]' or some
% such. An address of an address is invalid. Therefore, we define
% variables `standardinput' and `standardoutput' in openinout.c.
- at x
+ at x [2]
@d term_out == tty
@d term_in == tty
@y
@@ -182,7 +182,7 @@
% [10] Possibly exit with bad status. It doesn't seem worth it to move
% the definitions of the |history| values to above this module; hence the 1.
- at x
+ at x [10]
exit_program:
end.
@y
@@ -320,7 +320,7 @@
@y
@z
- at x [22, 23, 27, 28] Allow any character as input. [22]
+ at x [22] Allow any character as input.
@!ASCII_code=0..127; {seven-bit numbers}
@y
@!ASCII_code=0..255; {eight-bit numbers}
@@ -366,7 +366,7 @@
% [still 32] Make RET a `white_space' character, so we won't choke on DOS
% files, which use CR/LF for line endings.
- at x
+ at x [32]
lex_class[tab] := white_space;
@y
lex_class[tab] := white_space;
@@ -381,7 +381,7 @@
% [37] file_name_size no longer exists. See comments in tex.ch for why
% we change the element type to text_char.
- at x
+ at x [37]
@!name_of_file:packed array[1..file_name_size] of char;
{on some systems this is a \&{record} variable}
@!name_length:0..file_name_size;
@@ -555,7 +555,7 @@
% [58] (start_name) reallocate name_of_file for the new name and
% terminate with null.
- at x
+ at x [58]
if (length(file_name) > file_name_size) then
begin
print ('File=');
@@ -568,7 +568,7 @@
name_of_file := xmalloc_array (ASCII_code, length (file_name) + 1);
@z
- at x
+ at x [58]
name_length := length(file_name);
@y
name_length := length(file_name);
@@ -586,7 +586,7 @@
% [60] (add_extension) Don't pad name_of_file with blanks, terminate
% with null. And junk the overflow check, since Web2c can't translate
% the print statement properly and it can never happen, anyway.
- at x
+ at x [60]
if (name_length + length(ext) > file_name_size) then
begin
print ('File=',name_of_file,', extension=');
@@ -595,7 +595,7 @@
end;
@y
@z
- at x
+ at x [60]
name_ptr := name_length+1;
while (name_ptr <= file_name_size) do {pad with blanks}
begin
@@ -799,7 +799,7 @@
% [106] Don't use a path to find the aux file, and don't add the
% extension if it's already there.
- at x
+ at x [106]
add_extension (s_aux_extension); {this also sets |name_length|}
aux_ptr := 0; {initialize the \.{.aux} file stack}
if (not a_open_in(cur_aux_file)) then
@@ -1075,7 +1075,7 @@
% And we need to call kpse_*_name_ok because bibtex is included in the
% shell_escape_commands list that can be invoked by TeX in restricted mode.
%
- at x
+ at x [141]
while (name_ptr <= file_name_size) do {pad with blanks}
begin
name_of_file[name_ptr] := ' ';
@@ -1102,7 +1102,7 @@
% [151] This goto gets turned into a setjmp/longjmp by ./convert --
% unfortunately, it is a nonlocal goto. ekrell at ulysses.att.com
% implemented the conversion.
- at x
+ at x [151]
buf_ptr2 := last; {to get the first input line}
loop
begin
@@ -1124,7 +1124,7 @@
% [160] quote_next_fn and end_of_def are Pascal consts, instead of web macros.
% max_ent_ints and max_ent_strs are gone, max_fields is no longer const.
- at x
+ at x [160]
@d quote_next_fn = hash_base - 1 {special marker used in defining functions}
@d end_of_def = hash_max + 1 {another such special marker}
@@ -1165,7 +1165,7 @@
% q], but hidden inside a macro to mask the addressing computation.
% Although WEB does not have multi-argument macros, webman.tex shows how
% to get the equivalent effect.
- at x
+ at x [161]
@!entry_ints : array[int_ent_loc] of integer;
@!num_ent_ints : int_ent_loc; {the number of distinct |int_entry_var| names}
@!str_ent_ptr : str_ent_loc; {general |str_entry_var| location}
@@ -1568,7 +1568,7 @@
% import (or someone would have found it before GCC 2 did). Changing
% the second `and' to an `or' makes all but the last of multiple authors
% be omitted in the bbl file, so I simply removed the statement.
- at x
+ at x [388]
while ((ex_buf_xptr < ex_buf_ptr) and
(lex_class[ex_buf[ex_buf_ptr]] = white_space) and
(lex_class[ex_buf[ex_buf_ptr]] = sep_char)) do
@@ -1597,7 +1597,7 @@
% now a constant expression that is not evaluated at the Web level. If
% this label were ever required, it could be replaced by the constant
% 9997, which is not used as a statement label in BibTeX.
- at x
+ at x [459]
undefined : trace_pr ('unknown')
@y
trace_pr ('unknown')
Modified: trunk/Build/source/texk/web2c/dvicopy.ch
===================================================================
--- trunk/Build/source/texk/web2c/dvicopy.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/dvicopy.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -85,7 +85,7 @@
% [7] Rename the integer types, as they collide with names used by C99.
% Rather than change the code all over the place, we use macros to do
% the renaming. This could also be done at C preprocessor level.
- at x l.245
+ at x [7] l.245
@d int_32 == integer {signed 32~bit integers}
@y
@d int_32 == integer {signed 32~bit integers}
@@ -103,7 +103,7 @@
% [11] Redirect output, so it can go to either stdout or stderr,
% depending on where the output dvi file is going.
- at x l.311
+ at x [11] l.311
@d print(#)==write(output,#)
@d print_ln(#)==write_ln(output,#)
@d new_line==write_ln(output) {start new line}
@@ -122,7 +122,7 @@
% [15] The text_char type is used as an array index into xord. The
% default type `char' produces signed integers, which are bad array
% indices in C.
- at x l.400
+ at x [15] l.400
@d text_char == char {the data type of characters in text files}
@d first_text_char=0 {ordinal number of the smallest element of |text_char|}
@d last_text_char=127 {ordinal number of the largest element of |text_char|}
@@ -229,7 +229,7 @@
% [67] No conversion of filenames in lower case, and initialize and
% terminate for C strings. Eliminate now unused variable.
- at x l.1311
+ at x [67] l.1311
@!c:char; {a character to be appended to |cur_name|}
@y
@z
Modified: trunk/Build/source/texk/web2c/dvitype.ch
===================================================================
--- trunk/Build/source/texk/web2c/dvitype.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/dvitype.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -155,7 +155,7 @@
@d last_text_char=255 {ordinal number of the largest element of |text_char|}
@z
- at x [4.23] l.877] Fix up opening the files.
+ at x [4.23] l.877 Fix up opening the files.
@p procedure open_dvi_file; {prepares to read packed bytes in |dvi_file|}
begin reset(dvi_file);
cur_loc:=0;
@@ -253,7 +253,7 @@
@y
@z
- at x [6.48] l.1354 [48] No dialog.
+ at x [6.48] l.1354 No dialog.
@ The global variable |buf_ptr| is used while scanning each line of input;
it points to the first unread character in |buffer|.
Modified: trunk/Build/source/texk/web2c/gftodvi.ch
===================================================================
--- trunk/Build/source/texk/web2c/gftodvi.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/gftodvi.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -96,9 +96,7 @@
end;
@z
-% [4] Remove the final_end label.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [4] Remove the final_end label.
@ If the program has to stop prematurely, it goes to the
`|final_end|'.
@@ -123,9 +121,7 @@
@d abort(#)==@+begin write_ln (stderr, #); jump_out;@+end
@z
-% [8] Remove nonlocal goto.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [8] Remove nonlocal goto.
@p procedure jump_out;
begin goto final_end;
end;
@@ -139,7 +135,7 @@
% default type `char' produces signed integers, which are bad array
% indices in C.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [11]
@d text_char == char {the data type of characters in text files}
@y
@d text_char == ASCII_code {the data type of characters in text files}
@@ -240,7 +236,7 @@
% [48] Don't force a maximum length for name_of_file. See comments in
% tex.ch for why we change the element type to text_char.
- at x
+ at x [48]
@!name_of_file:packed array[1..file_name_size] of char; {external file name}
@y
@!name_of_file:^text_char;
@@ -252,7 +248,7 @@
% symbol table, so this loses. Rather than fix web2c (hard), we change
% the name of the field (ugly, but easy).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [52]
@!four_quarters = packed record@;@/
@!b0:quarterword;
@!b1:quarterword;
@@ -275,9 +271,7 @@
types that come after this}
@z
-% [55] fix references to .b0
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [55] fix references to .b0
@d char_width_end(#)==#.b0].sc
@d char_width(#)==font_info[width_base[#]+char_width_end
@d char_exists(#)==(#.b0>min_quarterword)
@@ -311,9 +305,7 @@
@d rem_byte(#)==#.B3
@z
-% [62] More .b?'s.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [62] More .b?'s.
qw.b0:=qi(b0); qw.b1:=qi(b1); qw.b2:=qi(b2); qw.b3:=qi(b3);
@y
qw.B0:=qi(b0); qw.B1:=qi(b1); qw.B2:=qi(b2); qw.B3:=qi(b3);
@@ -365,7 +357,7 @@
name_of_file[k]:=xchr[c];
@z
- at x
+ at x [92]
@!name_length:0..file_name_size; {number of characters packed}
begin k:=0;
for j:=str_start[a] to str_start[a+1]-1 do append_to_name(str_pool[j]);
@@ -476,9 +468,7 @@
if dvi_ptr>0 then write_dvi(0,dvi_ptr-1)
@z
-% [111] More .b?'s.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [111] More .b?'s.
dvi_out(qo(font_check[f].b0));
dvi_out(qo(font_check[f].b1));
dvi_out(qo(font_check[f].b2));
@@ -492,7 +482,7 @@
% [115] Don't go to final_end, just exit; this is the normal exit from
% the program, so we want to end with a newline if we are being verbose.
- at x
+ at x [115]
goto final_end;
@y
if verbose then print_ln (' ');
@@ -499,9 +489,7 @@
uexit (0);
@z
-% [118] And still more .b?'s.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [118] And still more .b?'s.
dummy_info.b0:=qi(0); dummy_info.b1:=qi(0); dummy_info.b2:=qi(0);
dummy_info.b3:=qi(0);
@y
@@ -509,9 +497,7 @@
dummy_info.B3:=qi(0);
@z
-% [138] write_ln formatting.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [138] write_ln formatting.
begin if abs(r-slant_reported)>0.001 then
begin print_nl('Sorry, I can''t make diagonal rules of slant ',r:10:5,'!');
@y
@@ -520,9 +506,7 @@
print_real(r,10,5); print('!');
@z
-% [164] No progress report unless verbose.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [164] No progress report unless verbose.
print('[',total_pages:1); update_terminal; {print a progress report}
@y
if verbose
@@ -532,7 +516,7 @@
end;
@z
- at x
+ at x [164]
print(']'); update_terminal;
@y
if verbose
@@ -549,7 +533,7 @@
% inches to the right edge of the diagram, which puts it off the paper
% for even moderately large fonts. Instead, we make it a command-line
% option.
- at x
+ at x [170]
over_col:=over_col+delta_x+10000000;
@y
over_col := over_col + delta_x + overflow_label_offset;
@@ -557,7 +541,7 @@
% [215] Some broken compilers cannot handle 165 labels for the same
% branch of a switch.
- at x
+ at x [215]
@<Read and process...@>=
loop @+begin continue: case cur_gf of
sixty_four_cases(0): k:=cur_gf;
Modified: trunk/Build/source/texk/web2c/gftopk.ch
===================================================================
--- trunk/Build/source/texk/web2c/gftopk.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/gftopk.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -104,7 +104,7 @@
@y
so we might want to |abort| the program with an error message.
@z
- at x
+ at x [8]
@d abort(#)==begin print(' ',#); jump_out;
end
@d bad_gf(#)==abort('Bad GF file: ',#,'!')
@@ -147,7 +147,7 @@
% [40] If the PK filename isn't given on the command line, we construct
% it from the GF filename.
- at x
+ at x [40]
@p procedure open_pk_file; {prepares to write packed bytes in |pk_file|}
begin rewrite(pk_file);
pk_loc := 0 ; pk_open := true ;
Modified: trunk/Build/source/texk/web2c/gftype.ch
===================================================================
--- trunk/Build/source/texk/web2c/gftype.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/gftype.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -208,7 +208,7 @@
% [26] Initialize wants_pixels and wants_mnemonics to false implicitly
% by virtue of being global variables. Can't do it here, since this is
% after the option parsing.
- at x
+ at x [26]
wants_mnemonics:=true; wants_pixels:=true;
@y
@z
Modified: trunk/Build/source/texk/web2c/mft.ch
===================================================================
--- trunk/Build/source/texk/web2c/mft.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/mft.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -54,7 +54,7 @@
% [3] No need for the final label in C.
% AIX defines `class' in <math.h>, so let's take this opportunity to
% define that away.
- at x
+ at x [3]
calls the `|jump_out|' procedure, which goes to the label |end_of_MFT|.
@d end_of_MFT = 9999 {go here to wrap it up}
@@ -90,7 +90,7 @@
@!max_bytes=60000; {the number of bytes in tokens; must be less than 65536}
@!max_names=6000; {number of tokens}
@z
- at x
+ at x [8]
@!buf_size=100; {maximum length of input line}
@!line_length=80; {lines of \TeX\ output have at most this many characters,
@y
@@ -102,7 +102,7 @@
% default type `char' produces signed integers, which are bad array
% indices in C.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [13]
@d text_char == char {the data type of characters in text files}
@y
@d text_char == ASCII_code {the data type of characters in text files}
@@ -123,9 +123,7 @@
@d print(#)==write(term_out,#) {`|print|' means write on the terminal}
@z
-% [20] Remove term_out.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [20] Remove term_out.
@<Globals...@>=
@!term_out:text_file; {the terminal as an output file}
@y
@@ -857,8 +855,7 @@
pr4("g")("o")("o")("d")(special_tag);@/
@z
-% The code below follows ideas from the section 646 of `mp.web'.
- at x [75]
+ at x [75] The code below follows ideas from the section 646 of `mp.web'.
two global variables, |cur_type| and |cur_tok|.
@y
two global variables, |cur_type| and |cur_tok|.
@@ -892,8 +889,7 @@
char_class[@'14]:=space_class; {form feed}
@z
-% When dealing with a TeX material we must copy spaces to output.
- at x [81]
+ at x [81] When dealing with a TeX material we must copy spaces to output.
space_class:if start_of_line then emit(indentation)
else goto switch;
@y
@@ -901,8 +897,7 @@
else goto switch;
@z
-% Set the default set of macros for \MP.
- at x [88]
+ at x [88] Set the default set of macros for \MP.
so that the first line of the output file will be `\.{\\input mftmac}'.
@.\\input mftmac@>
@.mftmac@>
@@ -931,7 +926,7 @@
% [112] Print newline at end of run, exit based upon value of history,
% and remove the end_of_MFT label.
- at x
+ at x [112]
print_ln(banner); {print a ``banner line''}
@y
print (banner); {print a ``banner line''}
@@ -938,7 +933,7 @@
print_ln (version_string);
@z
- at x
+ at x [112]
end_of_MFT:{here files should be closed if the operating system requires it}
@<Print the job |history|@>;
end.
Modified: trunk/Build/source/texk/web2c/patgen.ch
===================================================================
--- trunk/Build/source/texk/web2c/patgen.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/patgen.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -11,7 +11,7 @@
\def\title{PATGEN changes for C}
@z
- at x WEAVE: print changes only
+ at x [0] WEAVE: print changes only
\pageno=\contentspagenumber \advance\pageno by 1
@y
\pageno=\contentspagenumber \advance\pageno by 1
@@ -43,7 +43,7 @@
@d end_of_PATGEN=9999
@y
@z
- at x
+ at x [3]
label end_of_PATGEN;
@y
@z
@@ -76,7 +76,7 @@
@y
error message about what caused the error.
@z
- at x Error handling
+ at x [10] Error handling
@d jump_out==goto end_of_PATGEN {terminates \.{PATGEN}}
@#
@d error(#)==begin print_ln(#); jump_out; end
@@ -115,7 +115,7 @@
|trie_size| and greater than the number of occurrences of any pattern in
the dictionary}
@z
- at x
+ at x [27]
@!max_buf_len=80; {maximum length of input lines, must be at least |max_len|}
@y
@!max_buf_len=3000; {maximum length of input lines, must be at least |max_len|}
@@ -206,12 +206,12 @@
@y
repeat print('hyph_start, hyph_finish: '); input_2ints(n1,n2);@/
@z
- at x
+ at x [94]
repeat print('pat_start, pat_finish: '); get_input(n1,n2);@/
@y
repeat print('pat_start, pat_finish: '); input_2ints(n1,n2);@/
@z
- at x
+ at x [94]
get_input(n1,n2,n3);@/
@y
input_3ints(n1,n2,n3);@/
Modified: trunk/Build/source/texk/web2c/pktogf.ch
===================================================================
--- trunk/Build/source/texk/web2c/pktogf.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/pktogf.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -84,7 +84,7 @@
% [6] Remove terminal_line_length, since there is no dialog, and
% name_length, since there is no maximum size.
- at x
+ at x [6]
@<Constants...@>=
@!name_length=80; {maximum length of a file name}
@!terminal_line_length=132; {maximum length of an input line}
@@ -444,7 +444,7 @@
dialog ;
@y
@z
- at x
+ at x [73]
final_end :
@y
@z
Modified: trunk/Build/source/texk/web2c/pktype.ch
===================================================================
--- trunk/Build/source/texk/web2c/pktype.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/pktype.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -76,7 +76,7 @@
% [6] No need for |name_length| or |terminal_line_length|. Since these
% were the only constants, the <Constants...> module is no longer needed.
- at x
+ at x [6]
@<Constants...@>=
@!name_length=80; {maximum length of a file name}
@!terminal_line_length=132; {maximum length of an input line}
@@ -272,7 +272,7 @@
% [52] web2c can't handle the implied serialism in Pascal write
% statements. (From Martyn.Johnson at cl.cam.ac.uk.)
- at x
+ at x [52]
pk_yyy : t_print_ln((pk_loc-1):1,': Num special: ',get_32:1) ;
@y
pk_yyy : begin t_print((pk_loc-1):1);
@@ -326,7 +326,7 @@
@y
open_pk_file ;
@z
- at x
+ at x [55]
final_end :
@y
@z
Modified: trunk/Build/source/texk/web2c/pltotf.ch
===================================================================
--- trunk/Build/source/texk/web2c/pltotf.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/pltotf.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -163,7 +163,7 @@
% [117] Change the name of the variable `class', since AIX 3.1's <math.h>
% defines a function by that name.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [117]
@d pending=4 {$f(x,y)$ is being evaluated}
@y
@d pending=4 {$f(x,y)$ is being evaluated}
@@ -174,7 +174,7 @@
% But let's do a fake definition of f here, so that it gets into web2c's
% symbol table...
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [123]
@p function f(@!h,@!x,@!y:indx):indx; forward;@t\2@>
{compute $f$ for arguments known to be in |hash[h]|}
@y
@@ -185,9 +185,7 @@
endif('notdef')
@z
-% [124] ... and then really define it now.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [124] ... and then really define it now.
@p function f;
@y
@p function f(@!h,@!x,@!y:indx):indx;
@@ -202,7 +200,7 @@
% [130] web2c extends the range of 'lf' from 0..32767 into
% short (-32768..32767), but the overflow here ends up in
% Bad metric (TFM) file. So we add test here.
- at x
+ at x [130]
lf:=6+lh+(ec-bc+1)+memory[width]+memory[height]+memory[depth]+
memory[italic]+nl+lk_offset+nk+ne+np;
@y
Modified: trunk/Build/source/texk/web2c/pooltype.ch
===================================================================
--- trunk/Build/source/texk/web2c/pooltype.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/pooltype.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -35,7 +35,7 @@
label 9999; {this labels the end of the program}
@y
@z
- at x
+ at x [2]
procedure initialize; {this procedure gets things started properly}
var @<Local variables for initialization@>@;
begin @<Set initial values of key variables@>@/
@@ -53,7 +53,7 @@
% default type `char' produces signed integers, which are bad array
% indices in C.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [6]
@d text_char == char {the data type of characters in text files}
@y
@d text_char == ASCII_code {the data type of characters in text files}
@@ -92,7 +92,7 @@
% [19] The name of the pool file is dynamically determined. We open it at the
% end of parse_arguments.
- at x
+ at x [19]
reset(pool_file); xsum:=false;
@y
xsum:=false;
Modified: trunk/Build/source/texk/web2c/tftopl.ch
===================================================================
--- trunk/Build/source/texk/web2c/tftopl.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/tftopl.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -27,7 +27,7 @@
\def\title{TF\lowercase{to}PL changes for C}
@z
- at x [0] WEAVE: print changes only.
+ at x [0] l.46 WEAVE: print changes only.
\pageno=\contentspagenumber \advance\pageno by 1
@y
\pageno=\contentspagenumber \advance\pageno by 1
@@ -34,7 +34,7 @@
\let\maybe=\iffalse
@z
- at x [1] Define my_name
+ at x [1] l.67 Define my_name
@d banner=='This is TFtoPL, Version 3.3' {printed when the program starts}
@y
@d my_name=='tftopl'
@@ -41,7 +41,7 @@
@d banner=='This is TFtoPL, Version 3.3' {printed when the program starts}
@z
- at x [2] Print all terminal output on stderr, so the pl can be sent to stdout.
+ at x [2] l.80 Print all terminal output on stderr, so the pl can be sent to stdout.
@d print(#)==write(#)
@d print_ln(#)==write_ln(#)
@y
@@ -52,7 +52,7 @@
% [2] Fix files in program statement. We need to tell web2c about one
% special variable. Perhaps it would be better to allow @define's
% anywhere in a source file, but that seemed just as painful as this.
- at x
+ at x [2] l.83
@p program TFtoPL(@!tfm_file,@!pl_file,@!output);
@y
@p
@@ -61,12 +61,12 @@
program TFtoPL(@!tfm_file,@!pl_file,@!output);
@z
- at x [2] No global label.
+ at x [2] l.84 No global label.
label @<Labels in the outer block@>@/
@y
@z
- at x [still 2] Don't print banner until later (and unless verbose).
+ at x [still 2] l.88 Don't print banner until later (and unless verbose).
procedure initialize; {this procedure gets things started properly}
begin print_ln(banner);@/
@y
@@ -81,12 +81,12 @@
parse_arguments;
@z
- at x [3] No global label.
+ at x [3] l.98 No global label.
@<Labels...@>=final_end;
@y
@z
- at x [4] Increase sizes to match vptovf.
+ at x [4] l.104 Increase sizes to match vptovf.
@!tfm_size=30000; {maximum length of |tfm| data, in bytes}
@!lig_size=5000; {maximum length of |lig_kern| program, in words}
@!hash_size=5003; {preferably a prime number, a bit larger than the number
@@ -97,7 +97,7 @@
of character pairs in lig/kern steps}
@z
- at x [7] Open the TFM file.
+ at x [7] l.132 Open the TFM file.
@ On some systems you may have to do something special to read a
packed file of bytes. For example, the following code didn't work
when it was first tried at Stanford, because packed files have to be
@@ -119,7 +119,7 @@
end;
@z
- at x [17] Open the PL file.
+ at x [17] l.413 Open the PL file.
@ @<Set init...@>=
rewrite(pl_file);
@y
@@ -134,7 +134,7 @@
end;
@z
- at x [18,19] Make |tfm| be dynamically allocated, and rename `index'.
+ at x [18,19] l.420 Make |tfm| be dynamically allocated, and rename `index'.
@<Types...@>=
@!byte=0..255; {unsigned eight-bit quantity}
@!index=0..tfm_size; {address of a byte in |tfm|}
@@ -155,7 +155,7 @@
@!tfm_file_array: ^byte; {the input data all goes here}
@z
- at x [20] Allow arbitrarily large input files.
+ at x [20] l.446 Allow arbitrarily large input files.
if 4*lf-1>tfm_size then abort('The file is bigger than I can handle!');
@.The file is bigger...@>
@y
@@ -164,7 +164,7 @@
% [27, 28] Change strings to C char pointers. The Pascal strings are
% indexed starting at 1, so we pad with a blank.
- at x
+ at x [27] l.582
@!ASCII_04,@!ASCII_10,@!ASCII_14: packed array [1..32] of char;
{strings for output in the user's external character set}
@!MBL_string,@!RI_string,@!RCE_string:packed array [1..3] of char;
@@ -177,7 +177,7 @@
{handy string constants for |face| codes}
@z
- at x
+ at x [28] l.588
ASCII_04:=' !"#$%&''()*+,-./0123456789:;<=>?';@/
ASCII_10:='@@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_';@/
ASCII_14:='`abcdefghijklmnopqrstuvwxyz{|}~ ';@/
@@ -204,9 +204,7 @@
@ @<Reduce \(|l|...@>=
@z
-% [38] How we output the character code depends on |charcode_format|.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [38] l.708 How we output the character code depends on |charcode_format|.
begin if font_type>vanilla then
begin tfm[0]:=c; out_octal(0,1)
end
@@ -234,9 +232,7 @@
else begin tfm[0]:=c; out_octal(0,1);
@z
-% [39] Don't output the face code as an integer.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [39] l.730 Don't output the face code as an integer.
out(MBL_string[1+(b mod 3)]);
out(RI_string[1+s]);
out(RCE_string[1+(b div 3)]);
@@ -258,9 +254,7 @@
@ @<Reduce negative to positive@>=
@z
-% [78] No progress reports unless verbose.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [78] l.1246 No progress reports unless verbose.
incr(chars_on_line);
end;
print_octal(c); {progress report}
@@ -273,7 +267,7 @@
% [89] Change the name of the variable `class', since AIX 3.1's <math.h>
% defines a function by that name.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [89] l.1408
@d pending=4 {$f(x,y)$ is being evaluated}
@y
@d pending=4 {$f(x,y)$ is being evaluated}
@@ -281,21 +275,19 @@
@d class == class_var
@z
- at x [90]
+ at x [90] l.1435
goto final_end;
@y
uexit(1);;
@z
-% [90] Change name of the function `f'.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [90] l.1440 Change name of the function `f'.
r:=f(r,(hash[r]-1)div 256,(hash[r]-1)mod 256);
@y
r:=f_fn(r,(hash[r]-1)div 256,(hash[r]-1)mod 256);
@z
- at x [90]
+ at x [90] l.1447
out('(INFINITE LIGATURE LOOP MUST BE BROKEN!)'); goto final_end;
@y
out('(INFINITE LIGATURE LOOP MUST BE BROKEN!)'); uexit(1);
@@ -305,7 +297,7 @@
% But let's do a fake definition of f here, so that it gets into web2c's
% symbol table. We also have to change the name, because there is also a
% variable named `f', and some C compilers can't deal with that.
- at x
+ at x [94] l.1500
@p function f(@!h,@!x,@!y:index):index; forward;@t\2@>
{compute $f$ for arguments known to be in |hash[h]|}
@y
@@ -315,46 +307,42 @@
{compute $f$ for arguments known to be in |hash[h]|}
endif('notdef')
@z
- at x
+ at x [94] l.1508
else eval:=f(h,x,y);
@y
else eval:=f_fn(h,x,y);
@z
-% [95] The real definition of f.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [95] l.1514 The real definition of f.
@p function f;
@y
@p function f_fn(@!h,@!x,@!y:index):index;
@z
- at x
+ at x [95] l.1527
f:=lig_z[h];
@y
f_fn:=lig_z[h];
@z
- at x [99]
+ at x [99] l.1570
if not organize then goto final_end;
@y
if not organize then uexit(1);
@z
-% [99] No final newline unless verbose.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [99] l.1574 No final newline unless verbose.
do_characters; print_ln('.');@/
@y
do_characters; if verbose then print_ln('.');@/
@z
- at x [99]
+ at x [99] l.1582
final_end:end.
@y
end.
@z
- at x [100] System-dependent changes.
+ at x [100] l.1585 System-dependent changes.
This section should be replaced, if necessary, by changes to the program
that are necessary to make \.{TFtoPL} work at a particular installation.
It is usually best to design your change file so that all changes to
Modified: trunk/Build/source/texk/web2c/vftovp.ch
===================================================================
--- trunk/Build/source/texk/web2c/vftovp.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/vftovp.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -34,7 +34,7 @@
% [2] We need to tell web2c about one special variable.
% Perhaps it would be better to allow @define's
% anywhere in a source file, but that seemed just as painful as this.
- at x
+ at x [2]
@p program VFtoVP(@!vf_file,@!tfm_file,@!vpl_file,@!output);
@y
@p
@@ -65,7 +65,7 @@
% Also, AIX defines `class' in <math.h>, so let's take this opportunity to
% define that away.
% And increase several constants.
- at x
+ at x [4]
@<Constants...@>=
@!tfm_size=30000; {maximum length of |tfm| data, in bytes}
@!vf_size=10000; {maximum length of |vf| data, in bytes}
@@ -338,7 +338,7 @@
ASCII_14:=' `abcdefghijklmnopqrstuvwxyz{|}~?';@/
@z
- at x
+ at x [50]
MBL_string:='MBL'; RI_string:='RI '; RCE_string:='RCE';
@y
MBL_string:=' MBL'; RI_string:=' RI '; RCE_string:=' RCE';
@@ -402,13 +402,13 @@
% still [112] We can't have a function named `f', because of the local
% variable in do_simple_things. It would be better, but harder, to fix
% web2c.
- at x
+ at x [112]
r:=f(r,(hash[r]-1)div 256,(hash[r]-1)mod 256);
@y
r:=lig_f(r,(hash[r]-1)div 256,(hash[r]-1)mod 256);
@z
- at x
+ at x [112]
out('(INFINITE LIGATURE LOOP MUST BE BROKEN!)'); goto final_end;
@y
out('(INFINITE LIGATURE LOOP MUST BE BROKEN!)'); uexit(1);
@@ -417,7 +417,7 @@
% [116] web2c can't handle these mutually recursive procedures.
% But let's do a fake definition of f here, so that it gets into web2c's
% symbol table...
- at x
+ at x [116]
@p function f(@!h,@!x,@!y:index):index; forward;@t\2@>
{compute $f$ for arguments known to be in |hash[h]|}
@y
@@ -428,7 +428,7 @@
endif('notdef')
@z
- at x
+ at x [116]
else eval:=f(h,x,y);
@y
else eval:=lig_f(h,x,y);
@@ -440,7 +440,7 @@
@p function lig_f(@!h,@!x,@!y:index):index;
@z
- at x
+ at x [117]
f:=lig_z[h];
@y
lig_f:=lig_z[h];
@@ -492,7 +492,7 @@
label final_end, exit;
@y
@z
- at x
+ at x [131]
vf_input:=true; return;
final_end: vf_input:=false;
exit: end;
@@ -500,11 +500,11 @@
vf_input:=true;
end;
@z
- at x
+ at x [131]
label final_end, exit;
@y
@z
- at x
+ at x [131]
organize:=vf_input; return;
final_end: organize:=false;
exit: end;
@@ -517,7 +517,7 @@
label final_end,exit;
@y
@z
- at x
+ at x [133]
do_map:=true; return;
final_end: do_map:=false;
exit:end;
Modified: trunk/Build/source/texk/web2c/vptovf.ch
===================================================================
--- trunk/Build/source/texk/web2c/vptovf.ch 2025-01-29 00:41:59 UTC (rev 73630)
+++ trunk/Build/source/texk/web2c/vptovf.ch 2025-01-29 10:15:57 UTC (rev 73631)
@@ -133,7 +133,7 @@
% [89] `index' is not a good choice for an identifier on Unix systems.
% Neither is `class', on AIX.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [89]
|k|th element of its list.
@y
|k|th element of its list.
More information about the tex-live-commits
mailing list.