#define EXTERN extern
-#include "texd.h"
+#include "yandytex.h"
#define BEGINFMTCHECKSUM 367403084L
#define ENDFMTCHECKSUM 69069L
-extern clock_t start_time, main_time, finish_time;
-
#ifdef INITEX
void do_initex (void);
#endif
/* sec 0004 */
void initialize (void)
{
- integer i;
- integer k;
- integer flag; /* bkph */
+ integer i;
+ integer k;
+ integer flag;
#ifndef ALLOCATEHYPHEN
hyph_pointer z;
}
for (i = 0; i <= 255; i++)
- xord[chr(i)] = 127;
+ xord[chr(i)] = invalid_code;
#ifdef JOKE
for (i = 128; i <= 255 ; i++)
nest_ptr = 0;
max_nest_stack = 0;
- mode = 1;
+ mode = vmode;
head = contrib_head;
tail = contrib_head;
prev_depth = ignore_depth;
#endif
link(page_head) = 0;
- last_glue = empty_flag;
+ last_glue = max_halfword;
last_penalty = 0;
last_kern = 0;
- page_so_far[7] = 0;
+ page_depth = 0;
page_max_depth = 0;
for (k = int_base; k <= eqtb_size; k++)
cur_mark[3] = 0;
cur_mark[4] = 0;
cur_val = 0;
- cur_val_level = 0;
+ cur_val_level = int_val;
radix = 0;
- cur_order = 0;
+ cur_order = normal;
for (k = 0; k <= 16; k++)
- read_open[k] = 2;
+ read_open[k] = closed;
cond_ptr = 0;
- if_limit = 0;
+ if_limit = normal;
cur_if = 0;
if_line = 0;
for (k = 0; k <= font_max; k++)
font_used[k] = false;
- null_character.b0 = 0;
- null_character.b1 = 0;
- null_character.b2 = 0;
- null_character.b3 = 0;
+ null_character.b0 = min_quarterword;
+ null_character.b1 = min_quarterword;
+ null_character.b2 = min_quarterword;
+ null_character.b3 = min_quarterword;
total_pages = 0;
max_v = 0;
max_h = 0;
#ifdef INITEX
if (is_initex)
- {
do_initex();
- }
#endif
}
/* nest_ptr = 0; */
/* max_nest_stack = 0; */
- mode = 1;
+ mode = vmode;
head = contrib_head;
tail = contrib_head;
prev_depth = ignore_depth;
page_tail = page_head;
link(page_head) = 0;
}
-#endif // end of ifdef ALLOCATEMAIN
+#endif
/* sec 0815 */
-void line_break_ (integer final_widow_penalty)
+void line_break (integer final_widow_penalty)
{
boolean auto_breaking;
pointer prev_p;
second_pass = false;
final_pass = false;
- first_pass_count++; /* 96 Feb 9 */
+ first_pass_count++;
}
else
{
goto done1;
if (hyf_char > 255)
- goto done1; /* ? */
+ goto done1;
ha = prev_s;
j = hn;
q = lig_ptr(s);
- if (q != 0) /* 94/Mar/23 BUG FIX */
+ if (q != 0)
hyf_bchar = character(q);
- while (q != 0) /* 94/Mar/23 BUG FIX */
+ while (q != 0)
{
c = character(q);
else
{
do
- {
- if (is_char_node(s))
- {
- f = font(s);
- disc_width = disc_width + char_width(f, char_info(f, character(s)));
- }
- else switch (type(s))
{
- case ligature_node:
- {
- f = font(lig_char(s));
- disc_width = disc_width + char_width(f, char_info(f, character(lig_char(s))));
- }
- break;
-
- case hlist_node:
- case vlist_node:
- case rule_node:
- case kern_node:
- disc_width = disc_width + width(s);
- break;
+ if (is_char_node(s))
+ {
+ f = font(s);
+ disc_width = disc_width + char_width(f, char_info(f, character(s)));
+ }
+ else switch (type(s))
+ {
+ case ligature_node:
+ {
+ f = font(lig_char(s));
+ disc_width = disc_width + char_width(f, char_info(f, character(lig_char(s))));
+ }
+ break;
+
+ case hlist_node:
+ case vlist_node:
+ case rule_node:
+ case kern_node:
+ disc_width = disc_width + width(s);
+ break;
+
+ default:
+ {
+ confusion("disc3");
+ return;
+ }
+ break;
+ }
- default:
- {
- confusion("disc3");
- return;
- }
- break;
+ s = link(s);
}
- s = link(s);
- }
while (!(s == 0));
act_width = act_width + disc_width;
if (looseness == 0)
{
- goto done; /* normal exit */
+ goto done;
}
{
do
{
- if (type(r) != 2)
+ if (type(r) != delta_node)
{
line_diff = toint(line_number(r)) - toint(best_line);
prints("' or `");
print_esc("outer");
prints("' with `");
- print_cmd_chr(cur_cmd, cur_chr);
+ print_cmd_chr(cur_cmd, cur_chr);
print_char('\'');
help1("I'll pretend you didn't say \\long or \\outer here.");
error();
scan_optional_equals();
scan_int();
- if (((cur_val < 0) && (p < del_code_base)) ||(cur_val > n))
+ if (((cur_val < 0) && (p < del_code_base)) || (cur_val > n))
{
print_err("Invalid code(");
print_int(cur_val);
if (trace_flag)
printf("Read from fmt file mem_top = %lld TeX words\n", x);
- mem = allocate_main_memory(x); /* allocate main memory at this point */
+ mem = allocate_main_memory(x);
if (mem == NULL)
exit(EXIT_FAILURE);
if (trace_flag)
printf("undump string pool reallocation (%lld > %d)\n", x, current_pool_size);
- str_pool = realloc_str_pool (x - current_pool_size + increment_pool_size);
+ str_pool = realloc_str_pool(x - current_pool_size + increment_pool_size);
}
if (x > current_pool_size)
str_ptr = x;
}
- if (undumpthings(str_start[0], str_ptr + 1))
- return -1;
-
- if (undumpthings(str_pool[0], pool_ptr))
- return -1;
-
+ undumpthings(str_start[0], str_ptr + 1);
+ undumpthings(str_pool[0], pool_ptr);
init_str_ptr = str_ptr;
init_pool_ptr = pool_ptr;
undump(lo_mem_stat_max + 1000, hi_mem_stat_min - 1, lo_mem_max);
if (undumpthings(mem[p], lo_mem_max + 1 - p))
return -1;
- if (mem_min < mem_bot - 2) /* ? splice in block below */
+ if (mem_min < mem_bot - 2)
{
/* or call add_variable_space(mem_bot - (mem_min + 1)) */
if (trace_flag)
}
{
- if (undumpthings(font_info[0], fmem_ptr))
- return -1;
-
- {
- undump_int(x); /* font_max */
-
- if (x < 0)
- goto bad_fmt;
-
- if (x > font_max)
- {
- puts("---! Must increase the font max");
- goto bad_fmt;
- }
- else
- font_ptr = x;
- }
-
+ undumpthings(font_info[0], fmem_ptr);
+ undump_size(font_base, font_max, "font max", font_ptr);
frozen_font_ptr = font_ptr;
-
- if (undumpthings(font_check[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_size[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_dsize[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_params[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(hyphen_char[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(skew_char[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_name[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_area[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_bc[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_ec[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(char_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(width_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(height_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(depth_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(italic_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(lig_kern_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(kern_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(exten_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(param_base[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_glue[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(bchar_label[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_bchar[0], font_ptr + 1))
- return -1;
-
- if (undumpthings(font_false_bchar[0], font_ptr + 1))
- return -1;
+ undumpthings(font_check[0], font_ptr + 1);
+ undumpthings(font_size[0], font_ptr + 1);
+ undumpthings(font_dsize[0], font_ptr + 1);
+ undumpthings(font_params[0], font_ptr + 1);
+ undumpthings(hyphen_char[0], font_ptr + 1);
+ undumpthings(skew_char[0], font_ptr + 1);
+ undumpthings(font_name[0], font_ptr + 1);
+ undumpthings(font_area[0], font_ptr + 1);
+ undumpthings(font_bc[0], font_ptr + 1);
+ undumpthings(font_ec[0], font_ptr + 1);
+ undumpthings(char_base[0], font_ptr + 1);
+ undumpthings(width_base[0], font_ptr + 1);
+ undumpthings(height_base[0], font_ptr + 1);
+ undumpthings(depth_base[0], font_ptr + 1);
+ undumpthings(italic_base[0], font_ptr + 1);
+ undumpthings(lig_kern_base[0], font_ptr + 1);
+ undumpthings(kern_base[0], font_ptr + 1);
+ undumpthings(exten_base[0], font_ptr + 1);
+ undumpthings(param_base[0], font_ptr + 1);
+ undumpthings(font_glue[0], font_ptr + 1);
+ undumpthings(bchar_label[0], font_ptr + 1);
+ undumpthings(font_bchar[0], font_ptr + 1);
+ undumpthings(font_false_bchar[0], font_ptr + 1);
}
/* log not opened yet, so can't show fonts frozen into format */
if (!is_initex)
{
allocate_tries(x); /* allocate only as much as is needed */
-/* trie_size = x; */ /* ??? */
}
#endif
trie_max = j;
#endif
- if (undumpthings(trie_trl[0], j + 1))
- return -1;
-
- if (undumpthings(trie_tro[0], j + 1))
- return -1;
-
- if (undumpthings(trie_trc[0], j + 1))
- return -1;
-
- {
- undump_int(x);
-
- if (x < 0)
- goto bad_fmt;
-
- if (x > trie_op_size)
- {
- puts("---! Must increase the trie op size\n");
- goto bad_fmt;
- }
- else
- j = x;
- }
+ undumpthings(trie_trl[0], j + 1);
+ undumpthings(trie_tro[0], j + 1);
+ undumpthings(trie_trc[0], j + 1);
+ undump_size(0, trie_op_size, "trie op size", j);
#ifdef INITEX
if (is_initex)
trie_op_ptr = j;
#endif
- if (undumpthings(hyf_distance[1], j))
- return -1;
-
- if (undumpthings(hyf_num[1], j))
- return -1;
-
- if (undumpthings(hyf_next[1], j))
- return -1;
+ undumpthings(hyf_distance[1], j);
+ undumpthings(hyf_num[1], j);
+ undumpthings(hyf_next[1], j);
#ifdef INITEX
if (is_initex)
print_nl("(");
print_esc("end occurred ");
prints("when ");
- print_cmd_chr('i', cur_if);
+ print_cmd_chr(if_test, cur_if);
if (if_line != 0)
{
}
prints(" was incomplete)");
- if_line = mem[cond_ptr + 1].cint;
+ if_line = if_line_field(cond_ptr);
cur_if = subtype(cond_ptr);
temp_ptr = cond_ptr;
cond_ptr = link(cond_ptr);
if (is_initex)
{
for (c = 0; c <= 4; c++)
- {
if (cur_mark[c] != 0)
delete_token_ref(cur_mark[c]);
- }
if (last_glue != max_halfword)
delete_glue_ref(last_glue);
void show_frozen (void)
{
- int i, j, n;
+ int i;
- fprintf(log_file, "\n");
- fprintf(log_file, "(%lld fonts frozen in format file:\n", font_ptr);
+ fprintf(log_file, "\n(%lld fonts frozen in format file:\n", font_ptr);
for (i = 1; i <= font_ptr; i++)
{
if ((i % 8) == 0)
fprintf(log_file, "\n");
- n = str_start[font_name[i] + 1] - str_start[font_name[i]];
-
- for (j = 0; j < n; j++)
- {
- putc(str_pool[str_start[font_name[i]] + j], log_file);
- }
+ fwrite(&str_pool[str_start[font_name[i]]], 1, length(font_name[i]), log_file);
}
fprintf(log_file, ") ");
history = fatal_error_stop;
if (ready_already == 314159L)
- goto lab1;
+ goto start_of_TEX;
bad = 0;
ready_already = 314159L;
-lab1:
+start_of_TEX:
selector = term_only;
tally = 0;
term_offset = 0;
file_offset = 0;
- show_line(tex_version, 0);
-
-#ifdef _WIN32
- #ifdef _WIN64
- printf(" (%s %s/Win64)", application, yandyversion);
- #else
- printf(" (%s %s/Win32)", application, yandyversion);
- #endif
-#else
- printf(" (%s %s/Linux)", application, yandyversion);
-#endif
- if (format_ident > 0)
+ print_banner();
+
+ if (format_ident == 0)
+ {
+ prints(" (preloaded format=");
+ prints(format_name);
+ prints(")");
+ print_ln();
+ }
+ else
+ {
slow_print(format_ident);
+ print_ln();
+ }
- print_ln();
update_terminal();
job_name = 0;
name_in_progress = false;
first = last + 1;
}
- if ((format_ident == 0) || (buffer[loc] == '&') ||
- (buffer[loc] == '+'))
+ if ((format_ident == 0) || (buffer[loc] == '&') || (buffer[loc] == '+'))
{
if (format_ident != 0)
initialize();
- if (!open_fmt_file ())
+ if (!open_fmt_file())
goto final_end;
- if (!load_fmt_file ())
+ if (!load_fmt_file())
{
#ifdef COMPACTFORMAT
gzclose(gz_fmt_file);
{
int code;
-#ifndef _WINDOWS
- fflush(stdout);
-#endif
-
+ update_terminal();
ready_already = 0;
if ((history != spotless) && (history != warning_issued))
{
integer k;
- for (k = -(integer)trie_op_size; k <= trie_op_size; k++)
+ for (k = -(integer) trie_op_size; k <= trie_op_size; k++)
trie_op_hash[k] = 0;
for (k = 0; k <= 255; k++)
puts("initex cs_count = 0 ");
eq_type(frozen_dont_expand) = dont_expand;
- text(frozen_dont_expand) = 499; /* notexpanded */
+ text(frozen_dont_expand) = 499; /* "notexpanded:" */
font_ptr = null_font;
fmem_ptr = 7;
reset_trie();
text(frozen_protection) = 1184; /* "inaccessible" */
- format_ident = 1251;
- text(end_write) = 1290;
+ format_ident = 1251; /* " (INITEX)" */
+ text(end_write) = 1290; /* "endwrite" */
eq_level(end_write) = level_one;
eq_type(end_write) = outer_call;
equiv(end_write) = 0;
if (g == 0)
{
- fprintf(stdout, "%s\n", "! You have to increase POOLSIZE." );
+ printf("%s\n", "! You have to increase POOLSIZE." );
return false;
}
else
{
k = str_start[s];
- l = str_start[s + 1] - k; /* small_number l */
+ l = str_start[s + 1] - k;
for (j = 0; j <= l - 1; j++)
buffer[j] = str_pool[k + j];
#ifdef INITEX
/* sec 0944 */
-trie_op_code new_trie_op_ (small_number d, small_number n, trie_op_code v)
+trie_op_code new_trie_op (small_number d, small_number n, trie_op_code v)
{
integer h;
trie_op_code u;
return u;
}
- if ((hyf_distance[l]== d) && (hyf_num[l]== n) && (hyf_next[l]== v) && (trie_op_lang[l]== cur_lang))
+ if ((hyf_distance[l] == d) && (hyf_num[l] == n) && (hyf_next[l] == v) && (trie_op_lang[l] == cur_lang))
{
return trie_op_val[l];
}
}
}
/* sec 0948 */
-trie_pointer trie_node_ (trie_pointer p)
+trie_pointer trie_node (trie_pointer p)
{
trie_pointer h;
trie_pointer q;
}
}
/* sec 0949 */
-trie_pointer compress_trie_ (trie_pointer p)
+trie_pointer compress_trie (trie_pointer p)
{
if (p == 0)
return 0;
{
trie_l[p] = compress_trie(trie_l[p]);
trie_r[p] = compress_trie(trie_r[p]);
+
return trie_node(p);
}
}
/* sec 0953 */
-void first_fit_ (trie_pointer p)
+void first_fit (trie_pointer p)
{
trie_pointer h;
trie_pointer z;
while (!(q == 0));
}
/* sec 0957 */
-void trie_pack_ (trie_pointer p)
+void trie_pack (trie_pointer p)
{
trie_pointer q;
while (!(p == 0));
}
/* sec 0959 */
-void trie_fix_ (trie_pointer p)
+void trie_fix (trie_pointer p)
{
trie_pointer q;
ASCII_code c;
/* ASCII_code c; */
int c;
- if (!trie_not_ready) /* new stuff */
+ if (!trie_not_ready)
{
if (allow_patterns)
{
if (trace_flag)
puts("Resetting patterns");
- reset_trie(); /* RESET PATTERNS - 93/Nov/26 */
+ reset_trie();
if (reset_exceptions)
{
if (trace_flag)
puts("Resetting exceptions");
- reset_hyphen(); /* RESET HYPHENEXCEPTIONS - 93/Nov/26 */
+ reset_hyphen();
}
}
}
-/* *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** */
+
if (trie_not_ready)
{
set_cur_lang();
l = k;
v = min_trie_op;
- while (true) {
+ while (true)
+ {
if (hyf[l]!= 0)
v = new_trie_op(k - l, hyf[l], v);
q = 0;
hc[0] = cur_lang;
- while (l <= k) {
+ while (l <= k)
+ {
c = hc[l];
incr(l);
p = trie_l[q];
first_child = true;
- while ((p > 0) && (c > trie_c[p])) {
+ while ((p > 0) && (c > trie_c[p]))
+ {
q = p;
p = trie_r[q];
first_child = false;
trie_l[p] = 0;
if (first_child)
- trie_l[q]= p;
+ trie_l[q] = p;
else
- trie_r[q]= p;
+ trie_r[q] = p;
trie_c[p] = c;
trie_o[p] = min_trie_op;
q = p;
}
- if (trie_o[q]!= min_trie_op)
+ if (trie_o[q] != min_trie_op)
{
print_err("Duplicate pattern");
help1("(See Appendix H.)");
error();
}
- trie_o[q]= v;
+ trie_o[q] = v;
}
if (cur_cmd == right_brace)
op_start[0] = - (integer) min_trie_op;
for (j = 1; j <= 255; j++)
- {
op_start[j] = op_start[j - 1] + trie_used[j - 1];
- }
for (j = 1; j <= trie_op_ptr; j++)
- {
trie_op_hash[j] = op_start[trie_op_lang[j]] + trie_op_val[j];
- }
for (j = 1; j <= trie_op_ptr; j++)
{
}
for (p = 0; p <= trie_size; p++)
- {
trie_hash[p] = 0;
- }
trie_l[0] = compress_trie(trie_l[0]);
for (p = 0; p <= trie_ptr; p++)
- {
- trie_hash[p]= 0;
- }
+ trie_hash[p] = 0;
for (p = 0; p <= 255; p++)
- {
trie_min[p] = p + 1;
- }
trie_trl[0] = 1;
trie_max = 0;
trie_tro[r] = min_trie_op;
trie_trc[r] = 0;
}
+
trie_max = 256;
}
else
do
{
s = trie_trl[r];
+
{
trie_trl[r] = 0;
trie_tro[r] = min_trie_op;
}
selector = new_string;
- prints(" (format=");
+ prints(" (preloaded format=");
print(job_name);
print_char(' ');
print_int(year);
print_int(day);
print_char(')');
- if (interaction == 0)
+ if (interaction == batch_mode)
selector = log_only;
else
selector = term_and_log;
pack_job_name(".fmt");
while (!w_open_out(fmt_file))
- {
prompt_file_name("format file name", ".fmt");
- }
print_nl("Beginning to dump on file ");
slow_print(w_make_name_string(fmt_file));
dump_int(hyphen_prime);
dump_int(pool_ptr);
dump_int(str_ptr);
-
- if (dumpthings(str_start[0], str_ptr + 1))
- return;
-
- if (dumpthings(str_pool[0], pool_ptr))
- return;
-
+ dumpthings(str_start[0], str_ptr + 1);
+ dumpthings(str_pool[0], pool_ptr);
print_ln();
print_int(str_ptr);
prints(" strings of total length ");
(eq_type(j) != eq_type(j + 1)) ||
(eq_level(j) != eq_level(j + 1)))
goto done1;
+
incr(j);
}
incr(cs_count);
if (trace_flag)
- puts("itex cs_count++ ");
+ puts("itex.c store_fmt_file() cs_count++ ");
}
}
dump_int(fmem_ptr);
{
- if (dumpthings(font_info[0], fmem_ptr))
- return;
-
+ dumpthings(font_info[0], fmem_ptr);
dump_int(font_ptr);
-
- if (dumpthings(font_check[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_size[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_dsize[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_params[0], font_ptr + 1))
- return;
-
- if (dumpthings(hyphen_char[0], font_ptr + 1))
- return;
-
- if (dumpthings(skew_char[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_name[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_area[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_bc[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_ec[0], font_ptr + 1))
- return;
-
- if (dumpthings(char_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(width_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(height_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(depth_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(italic_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(lig_kern_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(kern_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(exten_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(param_base[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_glue[0], font_ptr + 1))
- return;
-
- if (dumpthings(bchar_label[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_bchar[0], font_ptr + 1))
- return;
-
- if (dumpthings(font_false_bchar[0], font_ptr + 1))
- return;
+ dumpthings(font_check[0], font_ptr + 1);
+ dumpthings(font_size[0], font_ptr + 1);
+ dumpthings(font_dsize[0], font_ptr + 1);
+ dumpthings(font_params[0], font_ptr + 1);
+ dumpthings(hyphen_char[0], font_ptr + 1);
+ dumpthings(skew_char[0], font_ptr + 1);
+ dumpthings(font_name[0], font_ptr + 1);
+ dumpthings(font_area[0], font_ptr + 1);
+ dumpthings(font_bc[0], font_ptr + 1);
+ dumpthings(font_ec[0], font_ptr + 1);
+ dumpthings(char_base[0], font_ptr + 1);
+ dumpthings(width_base[0], font_ptr + 1);
+ dumpthings(height_base[0], font_ptr + 1);
+ dumpthings(depth_base[0], font_ptr + 1);
+ dumpthings(italic_base[0], font_ptr + 1);
+ dumpthings(lig_kern_base[0], font_ptr + 1);
+ dumpthings(kern_base[0], font_ptr + 1);
+ dumpthings(exten_base[0], font_ptr + 1);
+ dumpthings(param_base[0], font_ptr + 1);
+ dumpthings(font_glue[0], font_ptr + 1);
+ dumpthings(bchar_label[0], font_ptr + 1);
+ dumpthings(font_bchar[0], font_ptr + 1);
+ dumpthings(font_false_bchar[0], font_ptr + 1);
for (k = 0; k <= font_ptr; k++)
{
print_ln();
print_int(fmem_ptr - 7);
prints(" words of font info for ");
- print_int(font_ptr - 0);
+ print_int(font_ptr - font_base);
prints(" preloaded font");
- if (font_ptr != 1)
+ if (font_ptr != font_base + 1)
print_char('s');
dump_int(hyph_count);
for (k = 0; k <= hyphen_prime; k++)
{
- if (hyph_word[k]!= 0)
+ if (hyph_word[k] != 0)
{
dump_int(k);
dump_int(hyph_word[k]);
init_trie();
dump_int(trie_max);
-
- if (dumpthings(trie_trl[0], trie_max + 1))
- return;
-
- if (dumpthings(trie_tro[0], trie_max + 1))
- return;
-
- if (dumpthings(trie_trc[0], trie_max + 1))
- return;
-
+ dumpthings(trie_trl[0], trie_max + 1);
+ dumpthings(trie_tro[0], trie_max + 1);
+ dumpthings(trie_trc[0], trie_max + 1);
dump_int(trie_op_ptr);
-
- if (dumpthings(hyf_distance[1], trie_op_ptr))
- return;
-
- if (dumpthings(hyf_num[1], trie_op_ptr))
- return;
-
- if (dumpthings(hyf_next[1], trie_op_ptr))
- return;
-
+ dumpthings(hyf_distance[1], trie_op_ptr);
+ dumpthings(hyf_num[1], trie_op_ptr);
+ dumpthings(hyf_next[1], trie_op_ptr);
print_nl("Hyphenation trie of length ");
print_int(trie_max);
prints(" has ");
tracing_stats = 0;
#ifdef COMPACTFORMAT
- gzclose(gz_fmt_file);
+ gz_w_close(gz_fmt_file);
#else
w_close(fmt_file);
#endif
primitive("pagefilllstretch", set_page_dimen, 5);
primitive("pageshrink", set_page_dimen, 6);
primitive("pagedepth", set_page_dimen, 7);
- primitive("end", end_match, 0);
+ primitive("end", stop, 0);
primitive("dump", stop, 1);
primitive("hskip", hskip, skip_code);
primitive("hfil", hskip, fil_code);
OSDN Git Service
