removed some macros.

diff --git a/src/texsourc/coerce.h b/src/texsourc/coerce.h
index eae0889..9c01ef9 100644 (file)
--- a/src/texsourc/coerce.h
+++ b/src/texsourc/coerce.h
@@ -26,8 +26,8 @@ void prints_(const char * s);
 #define prints(s) prints_((const char *) s)
 void slow_print_(integer s);
 #define slow_print(s) slow_print_((integer) (s))
-void print_nl(const char * s);
-void print_esc(const char * s);
+void print_nl (const char * s);
+void print_esc (const char * s);
 void print_the_digs_(eight_bits k);
 #define print_the_digs(k) print_the_digs_((eight_bits) (k))
 void print_int_(integer n);
@@ -42,15 +42,14 @@ void print_size_(integer s);
 #define print_size(s) print_size_((integer) (s))
 void print_write_whatsit_(const char * s, pointer p);
 #define print_write_whatsit(s, p) print_write_whatsit_((const char *) (s), (pointer) (p))
-void jump_out(void);
-void error(void);
-void fatal_error(const char * s);
+void jump_out (void);
+void error (void);
+void fatal_error (const char * s);
 void overflow_(const char * s, integer n);
 #define overflow(s, n) overflow_((const char *) (s), (integer) (n))
-void confusion_(const char * s);
-#define confusion(s) confusion_((const char *) (s))
-boolean init_terminal(void);
-str_number make_string(void);
+void confusion (const char * s);
+boolean init_terminal (void);
+str_number make_string (void);
 boolean str_eq_buf_(str_number s, integer k);
 #define str_eq_buf(s, k) str_eq_buf_((str_number) (s), (integer) (k))
 boolean str_eq_str_(str_number s, str_number t);
@@ -62,12 +61,12 @@ void print_hex_(integer n);
 #define print_hex(n) print_hex_((integer) (n))
 void print_roman_int_(integer n);
 #define print_roman_int(n) print_roman_int_((integer) (n))
-void print_current_string(void);
-void term_input(void);
+void print_current_string (void);
+void term_input (void);
 void int_error_(integer n);
 #define int_error(n) int_error_((integer) (n))
-void normalize_selector(void);
-void pause_for_instructions(void);
+void normalize_selector (void);
+void pause_for_instructions (void);
 integer half_(integer x);
 #define half(x) half_((integer) (x))
 scaled round_decimals_(small_number k);
@@ -86,43 +85,39 @@ void print_word_(memory_word w);
 #define print_word(w) print_word_((w))
 void show_token_list_(integer p, integer q, integer l);
 #define show_token_list(p, q, l) show_token_list_((integer) (p), (integer) (q), (integer) (l))
-void runaway(void);
-pointer get_avail(void);
+void runaway (void);
+pointer get_avail (void);
 void flush_list_(pointer p);
 #define flush_list(p) flush_list_((pointer) (p))
 pointer get_node_(integer s);
 #define get_node(s) get_node_((integer) (s))
 void free_node_(pointer p, halfword s);
 #define free_node(p, s) free_node_((pointer) (p), (halfword) (s))
-void sort_avail(void);
-pointer new_null_box(void);
-pointer new_rule(void);
+void sort_avail (void);
+pointer new_null_box (void);
+pointer new_rule (void);
 pointer new_ligature_(quarterword f, quarterword c, pointer q);
 #define new_ligature(f, c, q) new_ligature_((quarterword) (f), (quarterword) (c), (pointer) (q))
 pointer new_lig_item_(quarterword c);
 #define new_lig_item(c) new_lig_item_((quarterword) (c))
-pointer new_disc(void);
-pointer new_math_(scaled w, small_number s);
-#define new_math(w, s) new_math_((scaled) (w), (small_number) (s))
+pointer new_disc (void);
+pointer new_math (scaled w, small_number s);
 pointer new_spec_(pointer p);
 #define new_spec(p) new_spec_((pointer) (p))
-pointer new_param_glue_(small_number n);
-#define new_param_glue(n) new_param_glue_((small_number) (n))
-pointer new_glue_(pointer q);
-#define new_glue(q) new_glue_((pointer) (q))
-pointer new_skip_param_(small_number n);
-#define new_skip_param(n) new_skip_param_((small_number) (n))
-pointer new_kern(scaled w);
-pointer new_penalty(integer m);
-void check_mem(boolean print_locs);
-void search_mem_(halfword);
-#define search_mem(p) search_mem_((halfword) (p))
-void short_display_(integer);
+pointer new_param_glue (small_number n);
+pointer new_glue (pointer q);
+pointer new_skip_param (small_number n);
+pointer new_kern (scaled w);
+pointer new_penalty (integer m);
+void check_mem (boolean print_locs);
+void search_mem_(pointer p);
+#define search_mem(p) search_mem_((pointer) (p))
+void short_display_(integer p);
 #define short_display(p) short_display_((integer) (p))
-void print_font_and_char(integer);
+void print_font_and_char(integer p);
 void print_mark_(integer p);
 #define print_mark(p) print_mark_((integer) (p))
-void print_rule_dimen(scaled d);
+void print_rule_dimen (scaled d);
 void print_glue_(scaled d, integer order, const char * s);
 #define print_glue(d, order, s) print_glue_((scaled) (d), (integer) (order), (const char *) (s))
 void print_spec_(integer p, const char * s);
@@ -151,30 +146,25 @@ pointer copy_node_list_(pointer p);
 #define copy_node_list(p) copy_node_list_((pointer) (p))
 void print_mode_(integer m);
 #define print_mode(m) print_mode_((integer) (m))
-void push_nest(void);
-void pop_nest(void);
-void show_activities(void);
+void push_nest (void);
+void pop_nest (void);
+void show_activities (void);
 void print_param_(integer n);
 #define print_param(n) print_param_((integer) (n))
-void begin_diagnostic(void);
-void end_diagnostic_(boolean blank_line);
-#define end_diagnostic(blank_line) end_diagnostic_((boolean) (blank_line))
+void begin_diagnostic (void);
+void end_diagnostic (boolean blank_line);
 void print_length_param_(integer n);
 #define print_length_param(n) print_length_param_((integer) (n))
 void print_cmd_chr_(quarterword cmd, halfword chr_code);
 #define print_cmd_chr(cmd, chr_code) print_cmd_chr_((quarterword) (cmd), (halfword) (chr_code))
-void show_eqtb_(halfword n);
-#define show_eqtb(n) show_eqtb_((halfword) (n))
-halfword id_lookup_(integer j, integer l);
+void show_eqtb (pointer n);
+pointer id_lookup_(integer j, integer l);
 #define id_lookup(j, l) id_lookup_((integer) (j), (integer) (l))
 void primitive_(str_number s, quarterword c, halfword o);
 #define primitive(s, c, o) primitive_(make_string_pool((const char *) s), (quarterword) (c), (halfword) (o))
-void new_save_level_(group_code c);
-#define new_save_level(c) new_save_level_((group_code) (c))
-void eq_destroy_(memory_word w);
-#define eq_destroy(w) eq_destroy_((w))
-void eq_save_(pointer p, quarterword l);
-#define eq_save(p, l) eq_save_((pointer) (p), (quarterword) (l))
+void new_save_level (group_code c);
+void eq_destroy (memory_word w);
+void eq_save (pointer p, quarterword l);
 void eq_define_(pointer p, quarterword t, halfword e);
 #define eq_define(p, t, e) eq_define_((pointer) (p), (quarterword) (t), (halfword) (e))
 void eq_word_define_(pointer p, integer w);
@@ -183,97 +173,86 @@ void geq_define_(pointer p, quarterword t, halfword e);
 #define geq_define(p, t, e) geq_define_((pointer) (p), (quarterword) (t), (halfword) (e))
 void geq_word_define_(pointer p, integer w);
 #define geq_word_define(p, w) geq_word_define_((pointer) (p), (integer) (w))
-void save_for_after_(halfword t);
-#define save_for_after(t) save_for_after_((halfword) (t))
-void restore_trace_(pointer p, const char * s);
-#define restore_trace(p, s) restore_trace_((pointer) (p), (const char *) (s))
-void unsave(void);
-void prepare_mag(void);
-void token_show_(pointer p);
-#define token_show(p) token_show_((pointer) (p))
-void print_meaning(void);
-void show_cur_cmd_chr(void);
-void show_context(void);
+void save_for_after (halfword t);
+void restore_trace (pointer p, const char * s);
+void unsave (void);
+void prepare_mag (void);
+void token_show (pointer p);
+void print_meaning (void);
+void show_cur_cmd_chr (void);
+void show_context (void);
 void begin_token_list_(pointer p, quarterword t);
 #define begin_token_list(p, t) begin_token_list_((pointer) (p), (quarterword) (t))
-void end_token_list(void);
-void back_input(void);
-void back_error(void);
-void ins_error(void);
-void begin_file_reading(void);
-void end_file_reading(void);
-void clear_for_error_prompt(void);
-void check_outer_validity(void);
-void get_next(void);
-void firm_up_the_line(void);
-void get_token(void);
-void macro_call(void);
-void insert_relax(void);
-void expand(void);
-void get_x_token(void);
-void x_token(void);
-void scan_left_brace(void);
-void scan_optional_equals(void);
-boolean scan_keyword(const char * s);
-void mu_error(void);
-void scan_eight_bit_int(void);
-void scan_char_num(void);
-void scan_four_bit_int(void);
-void scan_fifteen_bit_int(void);
-void scan_twenty_seven_bit_int(void);
-void scan_font_ident(void);
-void find_font_dimen_(boolean writing);
-#define find_font_dimen(writing) find_font_dimen_((boolean) (writing))
-void scan_something_internal_(small_number level, boolean negative);
-#define scan_something_internal(level, negative) scan_something_internal_((small_number) (level), (boolean) (negative))
-void scan_int(void);
-void scan_dimen_(boolean mu, boolean inf, boolean shortcut);
-#define scan_dimen(mu, inf, shortcut) scan_dimen_((boolean) (mu), (boolean) (inf), (boolean) (shortcut))
-void scan_glue_(small_number level);
-#define scan_glue(level) scan_glue_((small_number) (level))
-pointer scan_rule_spec(void);
-pointer str_toks_(pool_pointer b);
-#define str_toks(b) str_toks_((pool_pointer) (b))
-pointer the_toks(void);
-void ins_the_toks(void);
-void conv_toks(void);
-pointer scan_toks_(boolean macro_def, boolean xpand);
-#define scan_toks(macro_def, xpand) scan_toks_((boolean) (macro_def), (boolean) (xpand))
-void read_toks_(integer n, pointer r);
-#define read_toks(n, r) read_toks_((integer) (n), (pointer) (r))
-void pass_text(void);
+void end_token_list (void);
+void back_input (void);
+void back_error (void);
+void ins_error (void);
+void begin_file_reading (void);
+void end_file_reading (void);
+void clear_for_error_prompt (void);
+void check_outer_validity (void);
+void get_next (void);
+void firm_up_the_line (void);
+void get_token (void);
+void macro_call (void);
+void insert_relax (void);
+void expand (void);
+void get_x_token (void);
+void x_token (void);
+void scan_left_brace (void);
+void scan_optional_equals (void);
+boolean scan_keyword (const char * s);
+void mu_error (void);
+void scan_eight_bit_int (void);
+void scan_char_num (void);
+void scan_four_bit_int (void);
+void scan_fifteen_bit_int (void);
+void scan_twenty_seven_bit_int (void);
+void scan_font_ident (void);
+void find_font_dimen (boolean writing);
+void scan_something_internal (small_number level, boolean negative);
+void scan_int (void);
+void scan_dimen (boolean mu, boolean inf, boolean shortcut);
+void scan_glue (small_number level);
+pointer scan_rule_spec (void);
+pointer str_toks (pool_pointer b);
+pointer the_toks (void);
+void ins_the_toks (void);
+void conv_toks (void);
+pointer scan_toks (boolean macro_def, boolean xpand);
+void read_toks (integer n, pointer r);
+void pass_text (void);
 void change_if_limit_(small_number l, pointer p);
 #define change_if_limit(l, p) change_if_limit_((small_number) (l), (pointer) (p))
-void conditional(void);
-void begin_name(void);
+void conditional (void);
+void begin_name (void);
 boolean more_name_(ASCII_code c);
 #define more_name(c) more_name_((ASCII_code) (c))
-void end_name(void);
+void end_name (void);
 void pack_file_name_(str_number n, str_number a, str_number e);
 #define pack_file_name(n, a, e) pack_file_name_((str_number) (n), (str_number) (a), (str_number) (e))
 void pack_buffered_name_(small_number n, integer a, integer b);
 #define pack_buffered_name(n, a, b) pack_buffered_name_((small_number) (n), (integer) (a), (integer) (b))
-str_number make_name_string(void);
+str_number make_name_string (void);
 str_number a_make_name_string_(void);
 #define a_make_name_string(f) a_make_name_string_()
 str_number b_make_name_string_(void);
 #define b_make_name_string(f) b_make_name_string_()
 str_number w_make_name_string_(void);
 #define w_make_name_string(f) w_make_name_string_()
-void scan_file_name(void);
+void scan_file_name (void);
 void pack_job_name_(str_number s);
 #define pack_job_name(s) pack_job_name_(make_string_pool((const char *) (s)))
 void prompt_file_name_(const char * s, str_number e);
 #define prompt_file_name(s, e) prompt_file_name_((const char *) s, make_string_pool((const char*) e))
-void open_log_file(void);
-void start_input(void);
-internal_font_number read_font_info_(halfword u, str_number nom, str_number arie, scaled s);
-#define read_font_info(u, nom, aire, s) read_font_info_((halfword) (u), (str_number) (nom), (str_number) (aire), (scaled) (s))
+void open_log_file (void);
+void start_input (void);
+internal_font_number read_font_info (pointer u, str_number nom, str_number arie, scaled s);
 void char_warning_(internal_font_number f, eight_bits c);
 #define char_warning(f, c) char_warning_((internal_font_number) (f), (eight_bits) (c))
 halfword new_character_(internal_font_number f, eight_bits c);
 #define new_character(f, c) new_character_((internal_font_number) (f), (eight_bits) (c))
-void dvi_swap(void);
+void dvi_swap (void);
 void dvi_four_(integer x);
 #define dvi_four(x) dvi_four_((integer) (x))
 void dvi_pop_(integer l);
@@ -282,31 +261,26 @@ void dvi_font_def_(internal_font_number f);
 #define dvi_font_def(f) dvi_font_def_((internal_font_number) (f))
 void zmovement(scaled w, eight_bits o);
 #define movement(w, o) zmovement((scaled) (w), (eight_bits) (o))
-void special_out_(pointer p);
-#define special_out(p) special_out_((pointer) (p))
-void hlist_out(void);
-void vlist_out(void);
+void special_out (pointer p);
+void hlist_out (void);
+void vlist_out (void);
 void ship_out_(pointer p);
 #define ship_out(p) ship_out_((pointer) (p))
-void prune_movements_(integer l);
-#define prune_movements(l) prune_movements_((integer) (l))
-void write_out_(pointer p);
-#define write_out(p) write_out_((pointer) (p))
-void out_what_(pointer p);
-#define out_what(p) out_what_((pointer) (p))
+void prune_movements (integer l);
+void write_out (pointer p);
+void out_what (pointer p);
 void scan_spec_(group_code c, boolean three_codes);
 #define scan_spec(c, three_codes) scan_spec_((group_code) (c), (boolean) (three_codes))
 pointer hpack_(pointer p, scaled w, small_number m);
 #define hpack(p, w, m) hpack_((pointer) (p), (scaled) (w), (small_number) (m))
 pointer vpackage_(pointer p, scaled h, small_number m, scaled l);
 #define vpackage(p, h, m, l) vpackage_((pointer) (p), (scaled) (h), (small_number) (m), (scaled) (l))
-void append_to_vlist_(pointer b);
-#define append_to_vlist(b) append_to_vlist_((pointer) (b))
-pointer new_noad(void);
+void append_to_vlist (pointer b);
+pointer new_noad (void);
 pointer new_style_(small_number s);
 #define new_style(s) new_style_((small_number) (s))
-pointer new_choice(void);
-void show_info(void);
+pointer new_choice (void);
+void show_info (void);
 pointer fraction_rule_(scaled t);
 #define fraction_rule(t) fraction_rule_((scaled) (t))
 pointer overbar_(pointer b, scaled k, scaled t);
@@ -325,130 +299,102 @@ pointer math_glue_(pointer g, scaled m);
 #define math_glue(g, m) math_glue_((pointer) (g), (scaled) (m))
 void math_kern_(pointer p, scaled m);
 #define math_kern(p, m) math_kern_((pointer) (p), (scaled) (m))
-void flush_math(void);
+void flush_math (void);
 pointer clean_box_(pointer p, small_number s);
 #define clean_box(p, s) clean_box_((pointer) (p), (small_number) (s))
 void fetch_(pointer a);
 #define fetch(a) fetch_((pointer) (a))
-void make_over_(pointer q);
-#define make_over(q) make_over_((pointer) (q))
-void make_under_(pointer q);
-#define make_under(q) make_under_((pointer) (q))
-void make_vcenter_(pointer q);
-#define make_vcenter(q) make_vcenter_((pointer) (q))
-void make_radical_(pointer q);
-#define make_radical(q) make_radical_((pointer) (q))
-void make_math_accent_(pointer q);
-#define make_math_accent(q) make_math_accent_((pointer) (q))
-void make_fraction_(pointer q);
-#define make_fraction(q) make_fraction_((pointer) (q))
-scaled make_op_(pointer q);
-#define make_op(q) make_op_((pointer) (q))
-void make_ord_(pointer q);
-#define make_ord(q) make_ord_((pointer) (q))
-void make_scripts_(pointer q, scaled delta);
-#define make_scripts(q, delta) make_scripts_((pointer) (q), (scaled) (delta))
-small_number make_left_right_(pointer q, small_number style, scaled max_d, scaled max_h);
-#define make_left_right(q, style, max_d, max_h) make_left_right_((pointer) (q), (small_number) (style), (scaled) (max_d), (scaled) (max_h))
-void mlist_to_hlist(void);
-void push_alignment(void);
-void pop_alignment(void);
-void get_preamble_token(void);
-void init_align(void);
-void init_span_(pointer p);
-#define init_span(p) init_span_((pointer) (p))
-void init_row(void);
-void init_col(void);
-boolean fin_col(void);
-void fin_row(void);
-void fin_align(void);
-void align_peek(void);
-pointer finite_shrink_(pointer p);
-#define finite_shrink(p) finite_shrink_((pointer) (p))
+void make_over (pointer q);
+void make_under (pointer q);
+void make_vcenter (pointer q);
+void make_radical (pointer q);
+void make_math_accent (pointer q);
+void make_fraction (pointer q);
+scaled make_op (pointer q);
+void make_ord (pointer q);
+void make_scripts (pointer q, scaled delta);
+small_number make_left_right (pointer q, small_number style, scaled max_d, scaled max_h);
+void mlist_to_hlist (void);
+void push_alignment (void);
+void pop_alignment (void);
+void get_preamble_token (void);
+void init_align (void);
+void init_span (pointer p);
+void init_row (void);
+void init_col (void);
+boolean fin_col (void);
+void fin_row (void);
+void fin_align (void);
+void align_peek (void);
+pointer finite_shrink (pointer p);
 void try_break_(integer pi, small_number breaktype);
 #define try_break(pi, breaktype) try_break_((integer) (pi), (small_number) (breaktype))
-void post_line_break_(integer final_widow_penalty);
-#define post_line_break(final_widow_penalty) post_line_break_((integer) (final_widow_penalty))
+void post_line_break (integer final_widow_penalty);
 small_number reconstitute_(small_number j, small_number n, halfword bchar, halfword hchar);
 #define reconstitute(j, n, bchar, hchar) reconstitute_((small_number) (j), (small_number) (n), (halfword) (bchar), (halfword) (hchar))
-void hyphenate(void);
+void hyphenate (void);
 trie_op_code new_trie_op_(small_number d, small_number n, trie_op_code v);
 #define new_trie_op(d, n, v) new_trie_op_((small_number) (d), (small_number) (n), (trie_op_code) (v))
 trie_pointer trie_node_(trie_pointer p);
-#define trie_node(p) trie_node_((trie_pointer) (p))
-trie_pointer compress_trie_(trie_pointer p);
-#define compress_trie(p) compress_trie_((trie_pointer) (p))
-void first_fit_(trie_pointer p);
-#define first_fit(p) first_fit_((trie_pointer) (p))
-void trie_pack_(trie_pointer p);
-#define trie_pack(p) trie_pack_((trie_pointer) (p))
-void trie_fix_(trie_pointer p);
-#define trie_fix(p) trie_fix_((trie_pointer) (p))
-void new_patterns(void);
-void init_trie(void);
-void line_break_(integer final_widow_penalty);
-#define line_break(final_widow_penalty) line_break_((integer) (final_widow_penalty))
-void new_hyph_exceptions(void);
-pointer prune_page_top_(pointer p);
-#define prune_page_top(p) prune_page_top_((pointer) (p))
-pointer vert_break_(pointer p, scaled h, scaled d);
-#define vert_break(p, h, d) vert_break_((pointer) (p), (scaled) (h), (scaled) (d))
-pointer vsplit_(eight_bits n, scaled h);
-#define vsplit(n, h) vsplit_((eight_bits) (n), (scaled) (h))
-void print_totals(void);
+trie_pointer compress_trie (trie_pointer p);
+void first_fit (trie_pointer p);
+void trie_pack (trie_pointer p);
+void trie_fix (trie_pointer p);
+void new_patterns (void);
+void init_trie (void);
+void line_break (integer final_widow_penalty);
+void new_hyph_exceptions (void);
+pointer prune_page_top (pointer p);
+pointer vert_break (pointer p, scaled h, scaled d);
+pointer vsplit (eight_bits n, scaled h);
+void print_totals (void);
 void freeze_page_specs_(small_number s);
 #define freeze_page_specs(s) freeze_page_specs_((small_number) (s))
-void box_error_(eight_bits n);
-#define box_error(n) box_error_((eight_bits) (n))
+void box_error (eight_bits n);
 void ensure_vbox_(eight_bits n);
 #define ensure_vbox(n) ensure_vbox_((eight_bits) (n))
-void fire_up_(pointer c);
-#define fire_up(c) fire_up_((pointer) (c))
-void build_page(void);
-void app_space(void);
-void insert_dollar_sign(void);
-void you_cant(void);
-void report_illegal_case(void);
-boolean privileged(void);
-boolean its_all_over(void);
-void append_glue(void);
-void append_kern(void);
-void off_save(void);
-void extra_right_brace(void);
-void normal_paragraph(void);
-void box_end_(integer box_content);
-#define box_end(box_context) box_end_((integer) (box_context))
-void begin_box_(integer box_content);
-#define begin_box(box_context) begin_box_((integer) (box_context))
+void fire_up (pointer c);
+void build_page (void);
+void app_space (void);
+void insert_dollar_sign (void);
+void you_cant (void);
+void report_illegal_case (void);
+boolean privileged (void);
+boolean its_all_over (void);
+void append_glue (void);
+void append_kern (void);
+void off_save (void);
+void extra_right_brace (void);
+void normal_paragraph (void);
+void box_end (integer box_content);
+void begin_box (integer box_content);
 void scan_box_(integer box_content);
 #define scan_box(box_context) scan_box_((integer) (box_context))
-void package_(small_number c);
-#define package(c) package_((small_number) (c))
+void package (small_number c);
 small_number norm_min_(integer h);
 #define norm_min(h) norm_min_((integer) (h))
-void new_graf_(boolean indented);
-#define new_graf(indented) new_graf_((boolean) (indented))
-void indent_in_hmode(void);
-void head_for_vmode(void);
-void end_graf(void);
-void begin_insert_or_adjust(void);
-void make_mark(void);
-void append_penalty(void);
-void delete_last(void);
-void unpackage(void);
-void append_italic_correction(void);
-void append_discretionary(void);
-void build_discretionary(void);
-void make_accent(void);
-void align_error(void);
-void noalign_error(void);
-void omit_error(void);
-void do_endv(void);
-void cs_error(void);
+void new_graf (boolean indented);
+void indent_in_hmode (void);
+void head_for_vmode (void);
+void end_graf (void);
+void begin_insert_or_adjust (void);
+void make_mark (void);
+void append_penalty (void);
+void delete_last (void);
+void unpackage (void);
+void append_italic_correction (void);
+void append_discretionary (void);
+void build_discretionary (void);
+void make_accent (void);
+void align_error (void);
+void noalign_error (void);
+void omit_error (void);
+void do_endv (void);
+void cs_error (void);
 void push_math_(group_code c);
 #define push_math(c) push_math_((group_code) (c))
-void init_math(void);
-void start_eq_no(void);
+void init_math (void);
+void start_eq_no (void);
 void scan_math_(pointer p);
 #define scan_math(p) scan_math_((pointer) (p))
 void set_math_char_(integer c);
@@ -456,52 +402,50 @@ void set_math_char_(integer c);
 void math_limit_switch(void);
 void scan_delimiter_(pointer p, boolean r);
 #define scan_delimiter(p, r) scan_delimiter_((pointer) (p), (boolean) (r))
-void math_radical(void);
-void math_ac(void);
-void append_choices(void);
-halfword fin_mlist_(halfword p);
-#define fin_mlist(p) fin_mlist_((halfword) (p))
-void build_choices(void);
-void sub_sup(void);
-void math_fraction(void);
-void math_left_right(void);
-void after_math(void);
-void resume_after_display(void);
-void get_r_token(void);
-void trap_zero_glue(void);
-void do_register_command_(small_number a);
-#define do_register_command(a) do_register_command_((small_number) (a))
-void alter_aux(void);
-void alter_prev_graf(void);
-void alter_page_so_far(void);
-void alter_integer(void);
-void alter_box_dimen(void);
-void new_font_(small_number a);
-#define new_font(a) new_font_((small_number) (a))
-void new_interaction(void);
-void prefixed_command(void);
-void do_assignments(void);
-void open_or_close_in(void);
-void issue_message(void);
-void shift_case(void);
-void show_whatever(void);
-void store_fmt_file(void);
+void math_radical (void);
+void math_ac (void);
+void append_choices (void);
+pointer fin_mlist_(pointer p);
+#define fin_mlist(p) fin_mlist_((pointer) (p))
+void build_choices (void);
+void sub_sup (void);
+void math_fraction (void);
+void math_left_right (void);
+void after_math (void);
+void resume_after_display (void);
+void get_r_token (void);
+void trap_zero_glue (void);
+void do_register_command (small_number a);
+void alter_aux (void);
+void alter_prev_graf (void);
+void alter_page_so_far (void);
+void alter_integer (void);
+void alter_box_dimen (void);
+void new_font (small_number a);
+void new_interaction (void);
+void prefixed_command (void);
+void do_assignments (void);
+void open_or_close_in (void);
+void issue_message (void);
+void shift_case (void);
+void show_whatever (void);
+void store_fmt_file (void);
 void new_whatsit_(small_number s, small_number w);
 #define new_whatsit(s, w) new_whatsit_((small_number) (s), (small_number) (w))
 void new_write_whatsit_(small_number w);
 #define new_write_whatsit(w) new_write_whatsit_((small_number) (w))
-void do_extension(void);
-void fix_language(void);
-void handle_right_brace(void);
-void main_control(void);
-void give_err_help(void);
-boolean open_fmt_file(void);
-boolean load_fmt_file(void);
-void close_files_and_terminate(void);
-void final_cleanup(void);
-void init_prim(void);
-void debug_help(void);
-void fix_date_and_time(void);
+void do_extension (void);
+void fix_language (void);
+void handle_right_brace (void);
+void main_control (void);
+void give_err_help (void);
+boolean open_fmt_file (void);
+boolean load_fmt_file (void);
+void close_files_and_terminate (void);
+void final_cleanup (void);
+void init_prim (void);
+void debug_help (void);
+void fix_date_and_time (void);
 
-int main_program(void);
-int main_init(int ac, char ** av);
\ No newline at end of file
+int main_program (void);
+int main_init (int ac, char ** av);
\ No newline at end of file

diff --git a/src/texsourc/itex.c b/src/texsourc/itex.c
index 9105ad4..a3d76d7 100644 (file)
--- a/src/texsourc/itex.c
+++ b/src/texsourc/itex.c
@@ -81,7 +81,7 @@ void initialize (void)
   }
 
   for (i = 0; i <= 255; i++)
-    xord[chr(i)] = 127;
+    xord[chr(i)] = invalid_code;
 
 #ifdef JOKE
   for (i = 128; i <= 255 ; i++)
@@ -139,7 +139,7 @@ void initialize (void)
 
   nest_ptr = 0;
   max_nest_stack = 0;
-  mode = 1;
+  mode = vmode;
   head = contrib_head;
   tail = contrib_head;
   prev_depth = ignore_depth;
@@ -154,10 +154,10 @@ void initialize (void)
 #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++)
@@ -182,15 +182,15 @@ void initialize (void)
   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;
 
   cond_ptr = 0;
-  if_limit = 0;
+  if_limit = normal;
   cur_if = 0;
   if_line = 0;
 
@@ -294,7 +294,7 @@ void initialize_aux (void)
 }
 #endif  // end of ifdef ALLOCATEMAIN
 /* sec 0815 */
-void line_break_ (integer final_widow_penalty)
+void line_break (integer final_widow_penalty)
 {
   boolean auto_breaking;
   pointer prev_p;
@@ -2802,7 +2802,7 @@ trie_op_code new_trie_op_ (small_number d, small_number n, trie_op_code v)
   }
 }
 /* sec 0948 */
-trie_pointer trie_node_ (trie_pointer p)
+trie_pointer trie_node (trie_pointer p)
 {
   trie_pointer h;
   trie_pointer q;
@@ -2834,7 +2834,7 @@ trie_pointer trie_node_ (trie_pointer p)
   }
 }
 /* sec 0949 */
-trie_pointer compress_trie_ (trie_pointer p)
+trie_pointer compress_trie (trie_pointer p)
 {
   if (p == 0)
     return 0;
@@ -2842,11 +2842,12 @@ trie_pointer compress_trie_ (trie_pointer p)
   {
     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;
@@ -2933,7 +2934,7 @@ found:
   while (!(q == 0));
 }
 /* sec 0957 */
-void trie_pack_ (trie_pointer p)
+void trie_pack (trie_pointer p)
 {
   trie_pointer q;
 
@@ -2952,7 +2953,7 @@ void trie_pack_ (trie_pointer p)
   while (!(p == 0));
 }
 /* sec 0959 */
-void trie_fix_ (trie_pointer p)
+void trie_fix (trie_pointer p)
 {
   trie_pointer q;
   ASCII_code c;

diff --git a/src/texsourc/local.c b/src/texsourc/local.c
index 7e8c0f4..ae90a57 100644 (file)
--- a/src/texsourc/local.c
+++ b/src/texsourc/local.c
@@ -2236,7 +2236,7 @@ void knuthify (void)
 char * xchr_file = NULL;
 char * repl_file = NULL;
 
-const char * short_options = "m:e:h:0:H:g:P:o:l:a:k:wvpiKLZMdp2t?u";
+const char * short_options = "m:e:h:0:H:g:P:o:l:a:kwvpiKLZMdp2t?u";
 
 static struct option long_options[] =
 {
@@ -2652,7 +2652,7 @@ int init_commands (int ac, char **av)
   new_hyphen_prime      = 0;
 
 #ifdef VARIABLETRIESIZE
-/*  trie_size = default_trie_size; */
+  // trie_size = default_trie_size;
   trie_size = 0;
 #endif
 

diff --git a/src/texsourc/openinou.c b/src/texsourc/openinou.c
index 15e969c..d14d957 100644 (file)
--- a/src/texsourc/openinou.c
+++ b/src/texsourc/openinou.c
@@ -43,7 +43,7 @@ extern int shorten_file_name;
 
 
 #ifdef BUILDNAMEDIRECT
-char * xconcat (char *buffer, char *s1, char *s2)
+char * xconcat (char * buffer, char * s1, char * s2)
 {
   int n1 = strlen(s1);
   int n2 = strlen(s2);
@@ -173,6 +173,7 @@ void retwiddle (unsigned char *s)
       *s = '~';
     else if (*s == (unsigned char) pseudo_space)
       *s = ' ';
+
     s++;
   }
 }
@@ -264,7 +265,7 @@ boolean open_input (FILE **f, path_constant_type path_index, char *fopen_mode)
       gz_fmt_file = gzdopen(fileno(*f), "rb9");
 #endif
     }
-    else if (strstr((char *)name_of_file + 1, ".tfm") != NULL)
+    else if (strstr((char *) name_of_file + 1, ".tfm") != NULL)
     {
       if (show_tfm_flag && log_opened)
       {
@@ -382,7 +383,7 @@ boolean open_output (FILE **f, char *fopen_mode)
         unixify((char *) temp_name);
       
       /* but we can assume this is opening here for *output* */
-      *f = fopen((char*)temp_name, fopen_mode);
+      *f = fopen((char*) temp_name, fopen_mode);
       /* If this succeeded, change name_of_file accordingly.  */
       if (*f)
         strcpy((char*) name_of_file + 1, (char *) temp_name);

diff --git a/src/texsourc/tex0.c b/src/texsourc/tex0.c
index d03a1fa..8c3af1e 100644 (file)
--- a/src/texsourc/tex0.c
+++ b/src/texsourc/tex0.c
@@ -681,7 +681,7 @@ void overflow_(const char * s, integer n)
   succumb();
 }
 /* sec 0095 */
-void confusion_(const char * s)
+void confusion(const char * s)
 {
   normalize_selector();
 
@@ -1349,7 +1349,7 @@ pointer get_avail (void)
 
 #ifdef STAT
   incr(dyn_used); 
-#endif /* STAT */
+#endif
 
   return p; 
 } 
@@ -1586,7 +1586,7 @@ pointer new_disc (void)
   return p;
 }
 /* sec 0147 */
-pointer new_math_(scaled w, small_number s)
+pointer new_math (scaled w, small_number s)
 {
   pointer p;
 
@@ -1612,7 +1612,7 @@ pointer new_spec_(pointer p)
   return q;
 }
 /* se 0152 */
-pointer new_param_glue_(small_number n)
+pointer new_param_glue (small_number n)
 {
   pointer p;
   pointer q;
@@ -1628,7 +1628,7 @@ pointer new_param_glue_(small_number n)
   return p;
 }
 /* sec 0153 */
-pointer new_glue_(pointer q)
+pointer new_glue (pointer q)
 {
   pointer p;
 
@@ -1642,12 +1642,12 @@ pointer new_glue_(pointer q)
   return p;
 }
 /* sec 0154 */
-pointer new_skip_param_(small_number n)
+pointer new_skip_param (small_number n)
 {
   pointer p;
 
   temp_ptr = new_spec(glue_par(n));
-  p = new_glue(temp_ptr); 
+  p = new_glue(temp_ptr);
   glue_ref_count(temp_ptr) = 0;
   subtype(p) = n + 1;
 
@@ -1804,7 +1804,7 @@ done2:
 
 #ifdef DEBUG
 /* sec 0172 */
-void search_mem_(halfword p)
+void search_mem_(pointer p)
 {
   integer q;
 

diff --git a/src/texsourc/tex1.c b/src/texsourc/tex1.c
index 815121d..6849142 100644 (file)
--- a/src/texsourc/tex1.c
+++ b/src/texsourc/tex1.c
@@ -126,12 +126,7 @@ void flush_node_list_(pointer p)
           }
           break;
         case glue_node:
-          {
-            if (mem[mem[p + 1].hh.lh].hh.rh == 0)
-              free_node(mem[p + 1].hh.lh, 4);
-            else
-              decr(mem[mem[p + 1].hh.lh].hh.rh);
-          }
+          delete_glue_ref(p);
 
           if (leader_ptr(p) != 0)
             flush_node_list(leader_ptr(p));
@@ -865,7 +860,7 @@ void begin_diagnostic (void)
   }
 }
 /* sec 0245 */
-void end_diagnostic_(boolean blank_line)
+void end_diagnostic(boolean blank_line)
 {
   print_nl("");
 
@@ -2038,7 +2033,7 @@ void print_cmd_chr_ (quarterword cmd, halfword chr_code)
 }
 #ifdef STAT
 /* sec 0252 */
-void show_eqtb_(halfword n)
+void show_eqtb(pointer n)
 { 
   if (n < active_base)
     print_char('?');
@@ -2214,14 +2209,14 @@ void show_eqtb_(halfword n)
   else
     print_char('?');
 }
-#endif /* STAT */
+#endif
 /* sec 0259 */
-halfword id_lookup_(integer j, integer l)
+pointer id_lookup_(integer j, integer l)
 {
   integer h;
   integer d;
-  halfword p;
-  halfword k;
+  pointer p;
+  pointer k;
 
   h = buffer[j];
 
@@ -2303,7 +2298,7 @@ found:
   return p;
 }
 /* sec 0274 */
-void new_save_level_(group_code c)
+void new_save_level (group_code c)
 {
   check_full_save_stack();
   save_type(save_ptr) = level_boundary;
@@ -2322,9 +2317,9 @@ void new_save_level_(group_code c)
   cur_group = c;
 }
 /* sec 0275 */
-void eq_destroy_(memory_word w)
+void eq_destroy (memory_word w)
 {
-  halfword q;
+  pointer q;
 
   switch (eq_type_field(w))
   {
@@ -2355,7 +2350,7 @@ void eq_destroy_(memory_word w)
   }
 }
 /* sec 0276 */
-void eq_save_(pointer p, quarterword l)
+void eq_save (pointer p, quarterword l)
 {
   check_full_save_stack();
 
@@ -2410,7 +2405,7 @@ void geq_word_define_(pointer p, integer w)
   xeq_level[p]= 1;
 }
 /* sec 0280 */
-void save_for_after_(halfword t)
+void save_for_after (halfword t)
 { 
   if (cur_level > level_one)
   {

diff --git a/src/texsourc/tex2.c b/src/texsourc/tex2.c
index 3c33419..dd327fb 100644 (file)
--- a/src/texsourc/tex2.c
+++ b/src/texsourc/tex2.c
@@ -22,7 +22,7 @@
 /* following bit used to be end of tex1.c */
 #ifdef STAT
 /* sec 0284 */
-void restore_trace_(pointer p, const char * s)
+void restore_trace (pointer p, const char * s)
 {
   begin_diagnostic();
   print_char('{');
@@ -144,7 +144,7 @@ void prepare_mag (void)
   mag_set = mag;
 }
 /* sec 0295 */
-void token_show_ (pointer p)
+void token_show (pointer p)
 {
   if (p != 0)
     show_token_list(link(p), 0, 10000000L);
@@ -1487,7 +1487,7 @@ void scan_font_ident (void)
   cur_val = f;
 }
 /* sec 0578 */
-void find_font_dimen_(boolean writing)
+void find_font_dimen(boolean writing)
 {
   internal_font_number f;
   integer n;
@@ -1555,7 +1555,7 @@ void find_font_dimen_(boolean writing)
   }
 }
 /* sec 0413 */
-void scan_something_internal_(small_number level, boolean negative)
+void scan_something_internal (small_number level, boolean negative)
 {
   halfword m;
   integer p;

diff --git a/src/texsourc/tex3.c b/src/texsourc/tex3.c
index 37e42a4..1f59881 100644 (file)
--- a/src/texsourc/tex3.c
+++ b/src/texsourc/tex3.c
@@ -158,7 +158,7 @@ done:
     cur_val = - (integer) cur_val;
 }
 /* sec 0448 */
-void scan_dimen_(boolean mu, boolean inf, boolean shortcut)
+void scan_dimen (boolean mu, boolean inf, boolean shortcut)
 {
   boolean negative;
   integer f;
@@ -470,7 +470,7 @@ attach_sign:
     cur_val = - (integer) cur_val;
 }
 /* sec 0461 */
-void scan_glue_(small_number level)
+void scan_glue (small_number level)
 {
   boolean negative;
   pointer q;
@@ -581,7 +581,7 @@ reswitch:
   return q;
 }
 /* sec 0464 */
-pointer str_toks_(pool_pointer b)
+pointer str_toks (pool_pointer b)
 {
   pointer p;
   pointer q;
@@ -765,7 +765,7 @@ void conv_toks (void)
   begin_token_list(link(temp_head), 4);
 }
 /* sec 0473 */
-pointer scan_toks_(boolean macro_def, boolean xpand)
+pointer scan_toks (boolean macro_def, boolean xpand)
 {
   halfword t;
   halfword s;
@@ -933,7 +933,7 @@ found:
   return p;
 }
 /* sec 0482 */
-void read_toks_(integer n, pointer r)
+void read_toks (integer n, pointer r)
 {
   pointer p;
   pointer q;
@@ -1936,7 +1936,7 @@ done:
   }
 }
 /* sec 0560 */
-internal_font_number read_font_info_(halfword u, str_number nom, str_number aire, scaled s)
+internal_font_number read_font_info (pointer u, str_number nom, str_number aire, scaled s)
 {
   font_index k;
   boolean file_opened;

diff --git a/src/texsourc/tex4.c b/src/texsourc/tex4.c
index 6fa79a2..fadf100 100644 (file)
--- a/src/texsourc/tex4.c
+++ b/src/texsourc/tex4.c
@@ -379,7 +379,7 @@ found:
   }
 }
 /* sec 0615 */
-void prune_movements_(integer l)
+void prune_movements (integer l)
 {
   pointer p;
 
@@ -405,7 +405,7 @@ done:
   }
 }
 /* sec 1368 */
-void special_out_(pointer p)
+void special_out (pointer p)
 {
   char old_setting;
   pool_pointer k;
@@ -444,7 +444,7 @@ void special_out_(pointer p)
   pool_ptr = str_start[str_ptr];
 }
 /* sec 1370 */
-void write_out_(pointer p)
+void write_out (pointer p)
 {
   char old_setting;
 /*  integer old_mode;  */
@@ -504,7 +504,7 @@ void write_out_(pointer p)
   selector = old_setting;
 }
 /* sec 1373 */
-void out_what_(pointer p)
+void out_what (pointer p)
 {
 /*  small_number j;  */
   int j;
@@ -1854,7 +1854,7 @@ exit:
   return r;
 }
 /* sec 0679 */
-void append_to_vlist_(pointer b)
+void append_to_vlist (pointer b)
 {
   scaled d;
   pointer p;

diff --git a/src/texsourc/tex5.c b/src/texsourc/tex5.c
index defe64f..b0b2443 100644 (file)
--- a/src/texsourc/tex5.c
+++ b/src/texsourc/tex5.c
@@ -124,7 +124,7 @@ void flush_math (void)
   incompleat_noad = 0;
 }
 /* sec 0720 */
-halfword clean_box_(halfword p, small_number s)
+pointer clean_box_(pointer p, small_number s)
 {
   pointer q;
   small_number save_style;
@@ -239,14 +239,14 @@ void fetch_(pointer a)
   }
 }
 /* sec 0734 */
-void make_over_(pointer q)
+void make_over (pointer q)
 {
   info(nucleus(q)) = overbar(clean_box(nucleus(q), 2 * (cur_style / 2) + 1),
       3 * default_rule_thickness, default_rule_thickness);
   math_type(nucleus(q)) = sub_box;
 }
 /* sec 0735 */
-void make_under_(pointer q)
+void make_under (pointer q)
 {
   pointer p, x, y;
   scaled delta;
@@ -263,7 +263,7 @@ void make_under_(pointer q)
   math_type(nucleus(q)) = sub_box;
 }
 /* sec 0736 */
-void make_vcenter_(pointer q)
+void make_vcenter (pointer q)
 { 
   pointer v;
   scaled delta;
@@ -281,7 +281,7 @@ void make_vcenter_(pointer q)
   depth(v) = delta - height(v);
 }
 /* sec 0737 */
-void make_radical_(pointer q)
+void make_radical (pointer q)
 {
   pointer x, y;
   scaled delta, clr;
@@ -308,7 +308,7 @@ void make_radical_(pointer q)
   math_type(nucleus(q)) = sub_box;
 }
 /* sec 0738 */
-void make_math_accent_(pointer q)
+void make_math_accent (pointer q)
 {
   pointer p, x, y;
   integer a;
@@ -431,7 +431,7 @@ done:
   }
 }
 /* sec 0743 */
-void make_fraction_(pointer q)
+void make_fraction (pointer q)
 {
   pointer p, v, x, y, z;
   scaled delta, delta1, delta2, shift_up, shift_down, clr;
@@ -531,7 +531,7 @@ void make_fraction_(pointer q)
   new_hlist(q) = hpack(x, 0, 1);
 }
 /* sec 0752 */
-void make_ord_(pointer q)
+void make_ord (pointer q)
 {
   integer a;
   pointer p, r;
@@ -576,12 +576,7 @@ restart:
                         }
                         else
                         {
-                          {
-                            if (interrupt != 0)
-                            {
-                              pause_for_instructions();
-                            }
-                          }
+                          check_interrupt();
 
                           switch (op_byte(cur_i))
                           {
@@ -639,7 +634,7 @@ restart:
       }
 }
 /* sec 0762 */
-small_number make_left_right_(pointer q, small_number style, scaled max_d, scaled max_h)
+small_number make_left_right (pointer q, small_number style, scaled max_d, scaled max_h)
 {
   scaled delta, delta1, delta2;
 
@@ -661,6 +656,7 @@ small_number make_left_right_(pointer q, small_number style, scaled max_d, scale
     delta = delta2;
 
   new_hlist(q) = var_delimiter(delimiter(q), cur_size, delta);
+
   return type(q) - (left_noad - open_noad);
 }
 /* sec 0726 */
@@ -672,9 +668,9 @@ void mlist_to_hlist (void)
   small_number save_style;
   pointer q;
   pointer r;
-/*  small_number r_type;  */
+  /* small_number r_type; */
   int r_type;
-/*  small_number t; */
+  /* small_number t; */
   int t;
   pointer p, x, y, z;
   integer pen;
@@ -1407,7 +1403,7 @@ done:
   align_peek();
 }
 /* sec 0787 */
-void init_span_ (pointer p)
+void init_span (pointer p)
 {
   push_nest();
 
@@ -2056,7 +2052,7 @@ boolean fin_col (void)
   return false;
 }
 /* sec 0749 */
-scaled make_op_(pointer q)
+scaled make_op (pointer q)
 {
   scaled delta;
   pointer p, v, x, y, z;
@@ -2164,7 +2160,7 @@ scaled make_op_(pointer q)
   return delta;
 }
 /* sec 0756 */
-void make_scripts_(pointer q, scaled delta)
+void make_scripts (pointer q, scaled delta)
 {
   pointer p, x, y, z;
   scaled shift_up, shift_down, clr;

diff --git a/src/texsourc/tex6.c b/src/texsourc/tex6.c
index fba2c75..9e55def 100644 (file)
--- a/src/texsourc/tex6.c
+++ b/src/texsourc/tex6.c
@@ -53,7 +53,7 @@ restart:
   }
 }
 /* sec 0826 */
-pointer finite_shrink_(pointer p)
+pointer finite_shrink (pointer p)
 {
   pointer q;
 
@@ -323,7 +323,7 @@ done:;
                 else
                   print_int(serial(prev_break(passive)));
               }
-#endif /* STAT */
+#endif
             }
 
             minimal_demerits[fit_class] = awful_bad;
@@ -516,7 +516,7 @@ done1:;
         else
           print_int(d);
       }
-#endif /* STAT */
+#endif
 
       d = d + total_demerits(r);
 
@@ -584,11 +584,11 @@ exit:;
           printed_node = link(printed_node);
         }
       }
-#endif /* STAT */
+#endif
 }
 /* end of the old tex5.c here */
 /* sec 0877 */
-void post_line_break_(integer final_widow_penalty)
+void post_line_break (integer final_widow_penalty)
 {
   pointer q, r, s;
   boolean disc_break;
@@ -1391,7 +1391,7 @@ common_ending:
             hyphen_passed = j - 1;
             link(hold_head) = 0;
           }
-        while (!(! odd(hyf[j - 1])));
+        while (!(!odd(hyf[j - 1])));
     }
   while (!(j > hn));
 
@@ -1553,7 +1553,7 @@ not_found:
   }
 }
 /* sec 0968 */
-pointer prune_page_top_(pointer p)
+pointer prune_page_top (pointer p)
 {
   pointer prev_p;
   pointer q;
@@ -1613,7 +1613,7 @@ pointer prune_page_top_(pointer p)
   return link(temp_head);
 }
 /* sec 0970 */
-pointer vert_break_(pointer p, scaled h, scaled d)
+pointer vert_break (pointer p, scaled h, scaled d)
 {
   pointer prev_p;
   pointer q, r;
@@ -1767,7 +1767,7 @@ done:
   return best_place;
 }
 /* sec 0977 */
-pointer vsplit_(eight_bits n, scaled h)
+pointer vsplit (eight_bits n, scaled h)
 {
   pointer v;
   pointer p;
@@ -1880,7 +1880,7 @@ void freeze_page_specs_(small_number s)
 #endif
 }
 /* sec 0992 */
-void box_error_(eight_bits n)
+void box_error (eight_bits n)
 {
   error();
   begin_diagnostic();
@@ -1908,7 +1908,7 @@ void ensure_vbox_(eight_bits n)
     }
 }
 /* sec 1012 */
-void fire_up_(pointer c)
+void fire_up (pointer c)
 {
   pointer p, q, r, s;
   pointer prev_p;

diff --git a/src/texsourc/tex7.c b/src/texsourc/tex7.c
index 460aa73..1a1d0eb 100644 (file)
--- a/src/texsourc/tex7.c
+++ b/src/texsourc/tex7.c
@@ -660,7 +660,7 @@ void normal_paragraph (void)
     eq_define(par_shape_loc, shape_ref, 0);
 }
 /* sec 1075 */
-void box_end_(integer box_context)
+void box_end (integer box_context)
 {
   pointer p;
 
@@ -739,7 +739,7 @@ void box_end_(integer box_context)
       ship_out(cur_box);
 }
 /* sec 1079 */
-void begin_box_(integer box_context)
+void begin_box (integer box_context)
 {
   pointer p, q;
   quarterword m;
@@ -919,7 +919,7 @@ small_number norm_min_ (integer h)
     return h;
 }
 /* sec 1091 */
-void new_graf_(boolean indented)
+void new_graf (boolean indented)
 {
   prev_graf = 0;
 
@@ -1876,7 +1876,7 @@ void append_choices (void)
   scan_left_brace();
 }
 /* sec 1184 */
-halfword fin_mlist_(halfword p)
+pointer fin_mlist_(pointer p)
 {
   pointer q;
 
@@ -1988,7 +1988,7 @@ void sub_sup (void)
   scan_math(p);
 }
 /* sec 1086 */
-void package_(small_number c)
+void package (small_number c)
 {
   scaled h;
   pointer p;

diff --git a/src/texsourc/tex8.c b/src/texsourc/tex8.c
index ea06088..6890b7b 100644 (file)
--- a/src/texsourc/tex8.c
+++ b/src/texsourc/tex8.c
@@ -233,7 +233,7 @@ void after_math (void)
 
   if (m < 0)
   {
-    tail_append(new_math(math_surround, 0));
+    tail_append(new_math(math_surround, before));
     cur_mlist = p;
     cur_style = text_style;
     mlist_penalties = (mode > 0);
@@ -243,7 +243,7 @@ void after_math (void)
     while (link(tail) != 0)
       tail = link(tail);
 
-    tail_append(new_math(math_surround, 1));
+    tail_append(new_math(math_surround, after));
     space_factor = 1000;
     unsave();
   }
@@ -455,7 +455,7 @@ void trap_zero_glue (void)
   }
 }
 /* sec 1236 */
-void do_register_command_ (small_number a)
+void do_register_command (small_number a)
 {
   pointer l, q, r, s;
   char p;
@@ -716,7 +716,7 @@ void alter_box_dimen (void)
     mem[box(b) + c].cint = cur_val;
 }
 /* sec 1257 */
-void new_font_(small_number a)
+void new_font(small_number a)
 {
   pointer u;
   scaled s;
@@ -1915,7 +1915,7 @@ reswitch:
 
     case mmode + non_script:
       {
-        tail_append(new_glue(0));
+        tail_append(new_glue(zero_glue));
         subtype(tail) = cond_math_glue;
       }
       break;

diff --git a/src/texsourc/texd.h b/src/texsourc/texd.h
index e40c3aa..a661e60 100644 (file)
--- a/src/texsourc/texd.h
+++ b/src/texsourc/texd.h
@@ -253,7 +253,7 @@ EXTERN integer var_used, dyn_used;
 /* sec 0118 */
 EXTERN pointer avail;
 EXTERN pointer mem_end;
-EXTERN pointer mem_start; // for yandytex
+EXTERN pointer mem_start;
 /* sec 0124 */
 EXTERN pointer rover;
 /* sec 0165 */
@@ -353,7 +353,7 @@ EXTERN int cur_group;
 EXTERN integer cur_boundary;
 EXTERN integer mag_set;
 EXTERN int cur_cmd;
-EXTERN int cur_chr;
+EXTERN halfword cur_chr;
 EXTERN pointer cur_cs;
 EXTERN halfword cur_tok;
 

diff --git a/src/texsourc/yandy_pool.c b/src/texsourc/yandy_pool.c
index 668e9d9..3481925 100644 (file)
--- a/src/texsourc/yandy_pool.c
+++ b/src/texsourc/yandy_pool.c
@@ -19,7 +19,7 @@
 
 #include "texd.h"
 
-static const char *pool_file_arr[] =
+static const char * pool_file_arr[] =
 {
 /* 0256 */  "", //"buffer size",
 /* 0257 */  "", //"pool size",
@@ -102,25 +102,25 @@ static const char *pool_file_arr[] =
 /* 0334 */  "", //"mu",
 /* 0335 */  "",
 /* 0336 */  "", //"leaders ",
-/* 0337 */  "kern",
+/* 0337 */  "", //"kern",
 /* 0338 */  "", //" (for accent)",
-/* 0339 */  "mkern",
-/* 0340 */  "math",
-/* 0341 */  "on",
-/* 0342 */  "off",
+/* 0339 */  "", //"mkern",
+/* 0340 */  "", //"math",
+/* 0341 */  "", //"on",
+/* 0342 */  "", //"off",
 /* 0343 */  "", //", surrounded ",
 /* 0344 */  "", //" (ligature ",
 /* 0345 */  "", //"penalty ",
 /* 0346 */  "", //"discretionary",
 /* 0347 */  "", //" replacing ",
-/* 0348 */  "mark",
-/* 0349 */  "vadjust",
+/* 0348 */  "", //"mark",
+/* 0349 */  "", //"vadjust",
 /* 0350 */  "", //"flushing",
 /* 0351 */  "", //"copying",
 /* 0352 */  "", //"vertical",
 /* 0353 */  "", //"horizontal",
 /* 0354 */  "", //"display math",
-/* 0355 */  "no",
+/* 0355 */  "", //"no",
 /* 0356 */  "", //"internal vertical",
 /* 0357 */  "", //"restricted horizontal",
 /* 0358 */  "", //" mode",
@@ -1014,7 +1014,7 @@ static const char *pool_file_arr[] =
 /* 1246 */  "", //"outer macro",
 /* 1247 */  "", //"outer endtemplate",
 /* 1248 */  "", //"> \\box",
-/* 1249 */  "OK",
+/* 1249 */  "", //"OK",
 /* 1250 */  "", //" (see the transcript file)",
 /* 1251 */  " (INITEX)",
 /* 1252 */  "", //"You can't dump inside a group",

diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h
index 596fdb5..c1efb97 100644 (file)
--- a/src/texsourc/yandytex.h
+++ b/src/texsourc/yandytex.h
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <setjmp.h>
 #include <time.h>
+#include <math.h>
 #include <signal.h>
 
 #include <kpathsea/c-auto.h>
@@ -84,14 +85,13 @@ typedef enum
   #undef link
 #endif
 
-#define abs(x)   ((integer)(x) >= 0 ? (integer)(x) : (integer)-(x))
+//#define abs(x)   ((integer)(x) >= 0 ? (integer)(x) : (integer)-(x))
+//#define fabs(x)  ((x) >= 0.0 ? (x) : -(x))
 #define chr(x)   (x)
-#define ord(x)   (x)
 #define odd(x)   ((x) % 2)
 #define round(x) web2c_round((double) (x))
 #define decr(x)  --(x)
 #define incr(x)  ++(x)
-#define fabs(x)  ((x) >= 0.0 ? (x) : -(x))
 #define toint(x) ((integer) (x))
 
 #define MAXLINE 256
@@ -102,7 +102,7 @@ extern boolean open_output (FILE ** f, char * fopen_mode);
 extern int check_fclose    (FILE * f);
 
 #define show_line(str, flag) fputs(str, stdout)
-#define show_char(chr)       putc(chr, stdout)
+#define show_char(s)         putc(s, stdout)
 extern char log_line[];
 
 #endif