From 97fa7b3630528845d9934ad227bc9f3a0c9d1d98 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 5 Aug 2014 10:18:03 +0000 Subject: omfonts: General cleanup: Drop unused code. Declare functions as static git-svn-id: svn://tug.org/texlive/trunk@34847 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/omegafonts/ChangeLog | 10 + Build/source/texk/web2c/omegafonts/char_routines.c | 21 +- Build/source/texk/web2c/omegafonts/char_routines.h | 7 - .../source/texk/web2c/omegafonts/dimen_routines.c | 26 -- .../source/texk/web2c/omegafonts/dimen_routines.h | 1 - .../source/texk/web2c/omegafonts/error_routines.c | 17 -- .../source/texk/web2c/omegafonts/error_routines.h | 2 - Build/source/texk/web2c/omegafonts/font_routines.c | 20 +- Build/source/texk/web2c/omegafonts/font_routines.h | 9 - .../source/texk/web2c/omegafonts/header_routines.c | 58 +--- .../source/texk/web2c/omegafonts/header_routines.h | 16 - .../texk/web2c/omegafonts/ligkern_routines.c | 33 +-- .../texk/web2c/omegafonts/ligkern_routines.h | 8 - Build/source/texk/web2c/omegafonts/list_routines.c | 178 +---------- Build/source/texk/web2c/omegafonts/list_routines.h | 19 -- Build/source/texk/web2c/omegafonts/omfonts.c | 12 +- Build/source/texk/web2c/omegafonts/omfonts.h | 4 - Build/source/texk/web2c/omegafonts/out_ofm.c | 7 +- Build/source/texk/web2c/omegafonts/out_ofm.h | 3 - Build/source/texk/web2c/omegafonts/out_routines.c | 21 +- Build/source/texk/web2c/omegafonts/out_routines.h | 2 - .../source/texk/web2c/omegafonts/param_routines.c | 13 +- .../source/texk/web2c/omegafonts/param_routines.h | 1 - Build/source/texk/web2c/omegafonts/parse_ofm.c | 247 +-------------- Build/source/texk/web2c/omegafonts/parse_ofm.h | 31 -- .../source/texk/web2c/omegafonts/print_routines.c | 330 --------------------- .../source/texk/web2c/omegafonts/print_routines.h | 39 --- 27 files changed, 87 insertions(+), 1048 deletions(-) (limited to 'Build/source/texk/web2c/omegafonts') diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog index 05851a2a078..ab50de9cce4 100644 --- a/Build/source/texk/web2c/omegafonts/ChangeLog +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -1,3 +1,13 @@ +2014-08-05 Peter Breitenlohner + + General cleanup. + * char_routines.[ch], dimen_routines.[ch], error_routines.[ch], + font_routines.[ch], header_routines.[ch], ligkern_routines.[ch], + list_routines.[ch], omfonts.[ch], out_ofm.[ch], + out_routines.[ch], param_routines.[ch], parse_ofm.[ch], + print_routines.[ch]: Drop unused code. + Declare functions with file scope as static. + 2014-08-04 Peter Breitenlohner * char_routines.c: Compute checksum. diff --git a/Build/source/texk/web2c/omegafonts/char_routines.c b/Build/source/texk/web2c/omegafonts/char_routines.c index 0fb0cbd5033..72c880eb61e 100644 --- a/Build/source/texk/web2c/omegafonts/char_routines.c +++ b/Build/source/texk/web2c/omegafonts/char_routines.c @@ -244,7 +244,7 @@ output_ovf_chars(void) } -void +static void check_existence_all_character_fields(void) { register unsigned index, plane; @@ -347,6 +347,8 @@ doublecheck_existence(unsigned g, const_string extra, const_string fmt) } } +static void print_packet(unsigned char *, unsigned); + void print_characters(boolean read_ovf) { @@ -451,7 +453,7 @@ string_balance(unsigned char *special, int k) return (paren_level == 0); } -void +static void print_packet(unsigned char *packet_start, unsigned packet_length) { unsigned cmd, arg; @@ -716,6 +718,10 @@ print_labels(void) } } +static void check_charlist_infinite_loops(void); +static void doublecheck_extens(void); +static void build_exten_table(void); + void check_and_correct(void) { @@ -733,7 +739,7 @@ check_and_correct(void) doublecheck_extens(); } -void +static void check_charlist_infinite_loops(void) { unsigned plane, index; @@ -757,7 +763,7 @@ check_charlist_infinite_loops(void) ) } -void +static void build_exten_table(void) { list L1 = exten_queue.front, L2; @@ -813,7 +819,7 @@ print_extens(void) } } -void +static void doublecheck_extens(void) { unsigned i,j; @@ -836,11 +842,6 @@ compute_ligkern_offset(void) { } -void -compute_character_info_size(void) -{ -} - void output_ofm_extensible(void) { diff --git a/Build/source/texk/web2c/omegafonts/char_routines.h b/Build/source/texk/web2c/omegafonts/char_routines.h index b0f35256f29..9e01797e08c 100644 --- a/Build/source/texk/web2c/omegafonts/char_routines.h +++ b/Build/source/texk/web2c/omegafonts/char_routines.h @@ -65,29 +65,22 @@ extern boolean extra_loc_needed; extern void check_and_correct(void); -extern void finalize_dimension_lists(void); -extern void check_existence_all_character_fields(void); -extern void check_charlist_infinite_loops(void); extern void adjust_labels(boolean); extern void print_labels(void); extern void set_extensible_piece(unsigned,unsigned); extern void check_existence_and_safety(unsigned,unsigned,const_string,const_string); extern void clear_ligature_entries(void); -extern void doublecheck_extens(void); extern void print_extens(void); -extern void build_exten_table(void); extern void retrieve_exten_table(unsigned char *); extern void doublecheck_existence(unsigned, const_string,const_string); extern void output_ovf_chars(void); -extern void print_packet(unsigned char *, unsigned); extern unsigned bc; extern unsigned ec; extern unsigned ne; extern void compute_ligkern_offset(void); -extern void compute_character_info_size(void); extern void output_ofm_extensible(void); extern void compute_ofm_character_info(void); extern void output_ofm_character_info(void); diff --git a/Build/source/texk/web2c/omegafonts/dimen_routines.c b/Build/source/texk/web2c/omegafonts/dimen_routines.c index 384f6f099d7..95f5ab445e0 100644 --- a/Build/source/texk/web2c/omegafonts/dimen_routines.c +++ b/Build/source/texk/web2c/omegafonts/dimen_routines.c @@ -105,34 +105,8 @@ set_character_measure(int index, int val) current_character->indices[index] = L2; } } - /* print_measures(); */ } -void -print_measures(void) -{ - in_list L; - register int i,j; - - for (i=C_MIN; i<=C_MAX; i++) { - L = measure_list[i]; - if (L!=NULL) { - j=0; - out_character_measure(i); - fprintf(stdout, ":\n"); - while (L != NULL) { - fprintf(stdout, " %d: ", j++); - out_fix(lval(L)); - fprintf(stdout, "\n"); - L = L->ptr; - } - fprintf(stdout, "\n"); - } - } - fprintf(stdout, "--------------------------------\n"); -} - - int next_d; int excess; diff --git a/Build/source/texk/web2c/omegafonts/dimen_routines.h b/Build/source/texk/web2c/omegafonts/dimen_routines.h index a3894cf7f9a..152d7843db6 100644 --- a/Build/source/texk/web2c/omegafonts/dimen_routines.h +++ b/Build/source/texk/web2c/omegafonts/dimen_routines.h @@ -24,7 +24,6 @@ along with Omega; if not, write to the Free Software Foundation, Inc., extern int *dimen_tables[]; extern void set_character_measure(int, int); -extern void print_measures(void); extern void init_measures(void); extern void build_dimen_tables(void); extern void retrieve_dimen_tables(void); diff --git a/Build/source/texk/web2c/omegafonts/error_routines.c b/Build/source/texk/web2c/omegafonts/error_routines.c index b4a08a0ae90..f3d23bfe1a3 100644 --- a/Build/source/texk/web2c/omegafonts/error_routines.c +++ b/Build/source/texk/web2c/omegafonts/error_routines.c @@ -32,14 +32,6 @@ They */ -void -lex_error_0(const_string fmt) -{ - fprintf(stderr, "line %d (lexing): ", line_number); - fprintf(stderr, fmt); - fprintf(stderr, "\n"); -} - void lex_error_1(const_string fmt, int item) { @@ -174,12 +166,3 @@ internal_error_1(const_string fmt, int item) fprintf(stderr, "\n"); exit(2); } - -void -internal_error_s(const_string fmt, const_string item) -{ - fprintf(stderr, "line %d (internal): ", line_number); - fprintf(stderr, fmt, item); - fprintf(stderr, "\n"); - exit(2); -} diff --git a/Build/source/texk/web2c/omegafonts/error_routines.h b/Build/source/texk/web2c/omegafonts/error_routines.h index ada4867d69a..6a707c77aa6 100644 --- a/Build/source/texk/web2c/omegafonts/error_routines.h +++ b/Build/source/texk/web2c/omegafonts/error_routines.h @@ -21,7 +21,6 @@ along with Omega; if not, write to the Free Software Foundation, Inc., */ -extern void lex_error_0(const_string); extern void lex_error_1(const_string, int); extern void lex_error_s(const_string, const_string); extern void lex_error_s_1(const_string, const_string, int); @@ -42,4 +41,3 @@ extern void warning_s_2(const_string, const_string, int, int); extern void internal_error_0(const_string); extern void internal_error_1(const_string, int); -extern void internal_error_s(const_string, const_string); diff --git a/Build/source/texk/web2c/omegafonts/font_routines.c b/Build/source/texk/web2c/omegafonts/font_routines.c index a7966590b28..578af168d07 100644 --- a/Build/source/texk/web2c/omegafonts/font_routines.c +++ b/Build/source/texk/web2c/omegafonts/font_routines.c @@ -64,7 +64,7 @@ font_no_incr(void) no_fonts++; } -void +static void clear_map_font(int font_number) { if (cur_font==NULL) internal_error_0("clear_map_font"); @@ -81,6 +81,10 @@ clear_map_font(int font_number) cur_font->ovf_packet_length = 0; } +static void append_command(unsigned, unsigned); +static void packet_table_init(void); +static void packet_table_end(void); + void init_map_font(int font_number) { @@ -228,6 +232,8 @@ append_to_packet(unsigned val) packet_table[packet_ptr-1] = val & 0xff; } +static void move_table_init(void); + void init_map(void) { @@ -243,7 +249,7 @@ end_map(void) packet_table_end(); } -void +static void append_command_2(unsigned cmd_0, unsigned max_n, unsigned cmd_1, unsigned actual) { @@ -255,7 +261,7 @@ append_command_2(unsigned cmd_0, unsigned max_n, append_command(cmd_1, actual); } -void +static void append_command(unsigned cmd_1, unsigned actual) { if ((cmd_1 != DVI_SET_1) && (cmd_1 != DVI_FNT_1) && @@ -307,7 +313,7 @@ ovf_get_arg(unsigned char **ptr, unsigned k, boolean is_signed) return a; } -void +static void input_command(unsigned *cmd, int *actual) { unsigned the_cmd = *ovf_ptr & 0xff; @@ -353,7 +359,7 @@ input_command(unsigned *cmd, int *actual) } -void +static void append_to_packet_fix(unsigned cmd, fix fval) { unsigned k; @@ -392,7 +398,7 @@ move *move_table = NULL; move *cur_move = NULL; unsigned move_ptr = 0; -void +static void move_table_init(void) { if (move_table == NULL) { @@ -433,7 +439,7 @@ move_ptr_incr(void) cur_move = &move_table[move_ptr]; } -unsigned +static unsigned get_hex(unsigned char c) { if ((c>='0') && (c<='9')) return(c-'0'); diff --git a/Build/source/texk/web2c/omegafonts/font_routines.h b/Build/source/texk/web2c/omegafonts/font_routines.h index 8c50430474f..a7afedc93a4 100644 --- a/Build/source/texk/web2c/omegafonts/font_routines.h +++ b/Build/source/texk/web2c/omegafonts/font_routines.h @@ -56,7 +56,6 @@ extern unsigned char *packet_table; extern unsigned char *cur_packet; extern unsigned packet_ptr; -extern void clear_map_font(int); extern void init_map_font(int); extern void set_font_name(string); extern void set_font_area(string); @@ -75,21 +74,13 @@ extern void set_push(void); extern void set_pop(void); extern void set_special(string ); extern void set_special_hex(string ); -extern unsigned get_hex(unsigned char); -extern void append_command(unsigned, unsigned); -extern void append_command_2(unsigned, unsigned, unsigned, unsigned); -extern void append_to_packet_fix(unsigned, fix); -extern void move_table_init(void); extern void font_table_init(void); -extern void packet_table_init(void); -extern void packet_table_end(void); extern void out_ovf(unsigned); extern void out_ovf_4(unsigned); extern int ovf_get_arg(unsigned char **, unsigned,boolean); -extern void input_command(unsigned *, int *); extern void input_ovf_fonts(void); extern void input_ovf_chars(void); extern void input_ovf_file(void); diff --git a/Build/source/texk/web2c/omegafonts/header_routines.c b/Build/source/texk/web2c/omegafonts/header_routines.c index 160c021b7dc..3e96008aed2 100644 --- a/Build/source/texk/web2c/omegafonts/header_routines.c +++ b/Build/source/texk/web2c/omegafonts/header_routines.c @@ -77,22 +77,7 @@ unsigned font_type = FT_VANILLA; unsigned lh; -void -store_header_int(unsigned loc, unsigned val) -{ - header[loc] = 0xff & (val >> 24) ; - header[loc+1] = 0xff & (val >> 16) ; - header[loc+2] = 0xff & (val >> 8) ; - header[loc+3] = 0xff & val ; -} - -void -store_header_byte(unsigned loc, unsigned val) -{ - header[loc] = 0xff & val ; -} - -void +static void retrieve_header_int(unsigned loc, unsigned *where) { string ptr = header+loc; @@ -104,7 +89,7 @@ retrieve_header_int(unsigned loc, unsigned *where) } -void +static void retrieve_header_byte(unsigned loc, unsigned char *where) { *where = header[loc]; @@ -174,26 +159,9 @@ retrieve_header_word(void) } } -void -print_header(void) -{ - av_list L = header_list; - - print_check_sum(); - print_design_size(); - print_coding_scheme(); - print_family(); - print_face(); - print_seven_bit_safe_flag(); - while (L!=NULL) { - print_header_word(lattr(L),lval(L)); - L = L->ptr; - } -} - /* CHECKSUM */ -void +static void init_check_sum(void) { check_sum = 0; @@ -209,7 +177,7 @@ set_check_sum(unsigned cs) check_sum_specified = TRUE; } -void +static void retrieve_check_sum(void) { retrieve_header_int(LOC_CHECK_SUM, &check_sum); @@ -218,7 +186,7 @@ retrieve_check_sum(void) /* DESIGNSIZE */ -void +static void init_design_size(void) { design_size = 10*UNITY; @@ -239,7 +207,7 @@ set_design_size(fix ds) design_size_specified = TRUE; } -void +static void retrieve_design_size(void) { retrieve_header_int(LOC_DESIGN_SIZE, (unsigned *) &design_size); @@ -248,7 +216,7 @@ retrieve_design_size(void) /* DESIGNUNITS */ -void +static void init_design_units(void) { design_units = UNITY; @@ -272,7 +240,7 @@ set_design_units(fix du) /* CODINGSCHEME */ -void +static void init_coding_scheme(void) { coding_scheme = xstrdup("UNSPECIFIED"); @@ -299,7 +267,7 @@ set_coding_scheme(string sval) coding_scheme_specified = TRUE; } -void +static void retrieve_coding_scheme(void) { register unsigned i=0, j=LOC_CODING_SCHEME, len=header[LOC_CODING_SCHEME]; @@ -325,7 +293,7 @@ retrieve_coding_scheme(void) /* FAMILY */ -void +static void init_family(void) { family = xstrdup("UNSPECIFIED"); @@ -343,7 +311,7 @@ set_family(string sval) family_specified = TRUE; } -void +static void retrieve_family(void) { register unsigned i=0, j=LOC_FAMILY, len=header[LOC_FAMILY]; @@ -382,7 +350,7 @@ set_face(unsigned f) face_specified = TRUE; } -void +static void retrieve_face(void) { unsigned char face_byte; @@ -451,7 +419,7 @@ set_seven_bit_safe_flag(unsigned f) seven_bit_specified = TRUE; } -void +static void retrieve_seven_bit_safe_flag(void) { unsigned char seven_bit_byte; diff --git a/Build/source/texk/web2c/omegafonts/header_routines.h b/Build/source/texk/web2c/omegafonts/header_routines.h index 857d16fc745..af8a2b78942 100644 --- a/Build/source/texk/web2c/omegafonts/header_routines.h +++ b/Build/source/texk/web2c/omegafonts/header_routines.h @@ -56,41 +56,25 @@ extern unsigned font_type; extern unsigned header_max; extern unsigned lh; -extern void store_header_int(unsigned, unsigned); -extern void store_header_byte(unsigned, unsigned); -extern void retrieve_header_int(unsigned, unsigned *); -extern void retrieve_header_byte(unsigned, unsigned char *); extern void set_header_word(unsigned, unsigned); -extern void init_check_sum(void); extern void set_check_sum(unsigned); -extern void retrieve_check_sum(void); -extern void init_design_size(void); extern void set_design_size(fix); -extern void retrieve_design_size(void); -extern void init_design_units(void); extern void set_design_units(fix); -extern void init_coding_scheme(void); extern void set_coding_scheme(string ); -extern void retrieve_coding_scheme(void); -extern void init_family(void); extern void set_family(string ); -extern void retrieve_family(void); extern void set_face(unsigned); -extern void retrieve_face(void); extern void set_seven_bit_safe_flag(unsigned); -extern void retrieve_seven_bit_safe_flag(void); extern void calculate_seven_bit_safe_flag(void); extern void init_header(void); extern void retrieve_header(void); -extern void print_header(void); extern void output_ofm_header(void); diff --git a/Build/source/texk/web2c/omegafonts/ligkern_routines.c b/Build/source/texk/web2c/omegafonts/ligkern_routines.c index 6291b9cfb76..b2e73a5a765 100644 --- a/Build/source/texk/web2c/omegafonts/ligkern_routines.c +++ b/Build/source/texk/web2c/omegafonts/ligkern_routines.c @@ -118,6 +118,8 @@ set_ligature_command(unsigned lig, unsigned c, unsigned val) } +static int set_new_kern(fix); + void set_kerning_command(unsigned c, fix fval) { @@ -166,7 +168,7 @@ set_c_penglue_command(unsigned new_class, unsigned pen_index, unsigned glue_inde fatal_error_0("CPENGLUE not currently supported"); } -int +static int set_new_kern(fix fval) { unsigned index; @@ -209,23 +211,6 @@ build_kern_table(void) } } -void -print_kerns(void) -{ - unsigned i; - - if (nk>0) { - left(); out("COMMENT"); out_ln(); - for (i=0; inew_class) { @@ -312,7 +299,9 @@ l_f(hash_list h, unsigned x, unsigned y) return (h->lig_z); } -int +static hash_list l_hash_lookup(unsigned, unsigned); + +static int l_eval(unsigned x, unsigned y) { hash_list h; @@ -325,7 +314,7 @@ l_eval(unsigned x, unsigned y) queue hash_entries; -int +static int l_hash_input(unsigned p, unsigned c) { @@ -386,7 +375,7 @@ l_hash_input(unsigned p, unsigned c) return TRUE; } -hash_list +static hash_list l_hash_lookup(unsigned x, unsigned y) { unsigned key = (x & 0x7fff)*(y & 0x7fff) % PRIME; diff --git a/Build/source/texk/web2c/omegafonts/ligkern_routines.h b/Build/source/texk/web2c/omegafonts/ligkern_routines.h index abb2e3746c7..5ce1db918f5 100644 --- a/Build/source/texk/web2c/omegafonts/ligkern_routines.h +++ b/Build/source/texk/web2c/omegafonts/ligkern_routines.h @@ -24,14 +24,11 @@ along with Omega; if not, write to the Free Software Foundation, Inc., extern unsigned bchar; extern four_entries lig_kern_table[100000]; -extern void init_ligkern_entry(void); extern void set_label_command(unsigned); extern void set_ligature_command(unsigned, unsigned, unsigned); extern void set_kerning_command(unsigned, fix); extern void set_stop_command(void); extern void set_skip_command(unsigned); -extern int set_new_kern(fix); -extern void print_kerns(void); extern void build_kern_table(void); extern void set_boundary_character(unsigned); @@ -43,11 +40,6 @@ extern void doublecheck_ligatures(void); extern void print_ligkern_table(void); extern void init_ligkern(void); -extern int l_f(hash_list, unsigned, unsigned); -extern int l_eval(unsigned, unsigned); -extern int l_hash_input(unsigned, unsigned); -extern hash_list l_hash_lookup(unsigned, unsigned); - #define PRIME 1009 #define KERN_FLAG 128 diff --git a/Build/source/texk/web2c/omegafonts/list_routines.c b/Build/source/texk/web2c/omegafonts/list_routines.c index 1c1d109e8ff..adb5cd68891 100644 --- a/Build/source/texk/web2c/omegafonts/list_routines.c +++ b/Build/source/texk/web2c/omegafonts/list_routines.c @@ -24,17 +24,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc., #include "cpascal.h" #include "list_routines.h" -list -cons (void *x, list L) -{ -list temp; -temp = (list) xmalloc(sizeof(cell)); -temp->contents = x; -temp->ptr = L; -return temp; -} - -list +static list list1 (void *x) { list temp; @@ -44,45 +34,7 @@ temp->ptr = NULL; return temp; } -list -list2 (void *x, void *y) -{ -list temp, temp1; -temp = (list) xmalloc(sizeof(cell)); -temp1 = (list) xmalloc(sizeof(cell)); -temp->contents = x; -temp->ptr = temp1; -temp1->contents = y; -temp1->ptr = NULL; -return temp; -} - -list -append (list K, list L) -{ -if (K==NULL) return L; -return cons(K->contents, append(K->ptr, L)); -} - -list -append1 (list L, void *x) -{ -return (append(L,list1(x))); -} - - -/* Attribute-value list functions */ - -av_list -av_cons (int attr, int val, av_list L) -{ -av_list temp; -temp = (av_list) xmalloc(sizeof(av_cell)); -temp->attribute = attr; -temp->value = val; -temp->ptr = L; -return temp; -} +/* Attribute-value list function */ av_list av_list1 (int attr, int val) @@ -95,48 +47,7 @@ temp->ptr = NULL; return temp; } -av_list -av_list2 (int attr, int val, int attr1, int val1) -{ -av_list temp, temp1; -temp = (av_list) xmalloc(sizeof(av_cell)); -temp1 = (av_list) xmalloc(sizeof(av_cell)); -temp->attribute = attr; -temp->value = val; -temp->ptr = temp1; -temp1->attribute = attr1; -temp1->value = val1; -temp1->ptr = NULL; -return temp; -} - -av_list -av_append (av_list K, av_list L) -{ -if (K==NULL) return L; -return av_cons(K->attribute, K->value, av_append(K->ptr, L)); -} - -av_list -av_append1 (av_list L, int attr, int val) -{ -return (av_append(L,av_list1(attr, val))); -} - - -/* Index-value list functions */ - -in_list -in_cons (int val, in_list N, in_list L) -{ -in_list temp; -temp = (in_list) xmalloc(sizeof(in_cell)); -temp->index = 0; -temp->value = val; -temp->actual = N; -temp->ptr = L; -return temp; -} +/* Index-value list function */ in_list in_list1 (int val, in_list N) @@ -150,50 +61,7 @@ temp->ptr = NULL; return temp; } -in_list -in_list2 (int val, in_list N, int val1, in_list N1) -{ -in_list temp, temp1; -temp = (in_list) xmalloc(sizeof(in_cell)); -temp1 = (in_list) xmalloc(sizeof(in_cell)); -temp->index = 0; -temp->value = val; -temp->actual = N; -temp->ptr = temp1; -temp1->index = 0; -temp1->value = val1; -temp1->actual = N1; -temp1->ptr = NULL; -return temp; -} - -in_list -in_append (in_list K, in_list L) -{ -if (K==NULL) return L; -return in_cons(K->value, K->actual, in_append(K->ptr, L)); -} - -in_list -in_append1 (in_list L, int val, in_list N) -{ -return (in_append(L,in_list1(val, N))); -} - -/* Attribute-value list functions */ - -hash_list -hash_cons (int x, int y, int new_class, int lig_z, hash_list L) -{ -hash_list temp; -temp = (hash_list) xmalloc(sizeof(hash_cell)); -temp->x = x; -temp->y = y; -temp->new_class = new_class; -temp->lig_z = lig_z; -temp->ptr = L; -return temp; -} +/* Attribute-value list function */ hash_list hash_list1 (int x, int y, int new_class, int lig_z) @@ -208,44 +76,6 @@ temp->ptr = NULL; return temp; } -hash_list -hash_list2(int x,int y,int new_class,int lig_z,int x1,int y1,int class1,int lig_z1) -{ -hash_list temp, temp1; -temp = (hash_list) xmalloc(sizeof(hash_cell)); -temp1 = (hash_list) xmalloc(sizeof(hash_cell)); -temp->x = x; -temp->y = y; -temp->new_class = new_class; -temp->lig_z = lig_z; -temp->ptr = temp1; -temp1->x = x1; -temp1->y = y1; -temp1->new_class = class1; -temp1->lig_z = lig_z1; -temp1->ptr = NULL; -return temp; -} - -hash_list -hash_append (hash_list K, hash_list L) -{ -if (K==NULL) return L; -return hash_cons(K->x, K->y, K->new_class, K->lig_z, hash_append(K->ptr, L)); -} - -hash_list -hash_append1 (hash_list L, int x, int y, int new_class, int lig_z) -{ -return (hash_append(L,hash_list1(x, y, new_class, lig_z))); -} - -void -init_queue(queue *q) -{ - q->front = NULL; - q->tail = NULL; -} void append_to_queue(queue *q, void *content) diff --git a/Build/source/texk/web2c/omegafonts/list_routines.h b/Build/source/texk/web2c/omegafonts/list_routines.h index c2ca6d654dd..7b4fe6985b0 100644 --- a/Build/source/texk/web2c/omegafonts/list_routines.h +++ b/Build/source/texk/web2c/omegafonts/list_routines.h @@ -59,29 +59,11 @@ typedef struct queue_struct { struct cell_struct *tail; } queue; -extern list cons(void *, list); -extern list list1(void *); -extern list list2(void *, void *); -extern list append(list, list); -extern list append1(list, void *); - -extern av_list av_cons(int,int, av_list); extern av_list av_list1(int,int); -extern av_list av_list2(int,int, int,int); -extern av_list av_append(av_list, av_list); -extern av_list av_append1(av_list, int,int); -extern in_list in_cons(int,in_list, in_list); extern in_list in_list1(int,in_list); -extern in_list in_list2(int,in_list, int,in_list); -extern in_list in_append(in_list, in_list); -extern in_list in_append1(in_list, int,in_list); -extern hash_list hash_cons(int,int,int,int, hash_list); extern hash_list hash_list1(int,int,int,int); -extern hash_list hash_list2(int,int,int,int, int,int,int,int); -extern hash_list hash_append(hash_list, hash_list); -extern hash_list hash_append1(hash_list, int,int,int,int); #define lattr(L) (L->attribute) #define lval(L) (L->value) @@ -100,5 +82,4 @@ typedef struct four_entries_struct { #define lb3(L) (((four_entries *)((L)->contents))->entries[3]) -extern void init_queue(queue *); extern void append_to_queue(queue *, void *); diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c index c44ae04b521..3b836716fd4 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.c +++ b/Build/source/texk/web2c/omegafonts/omfonts.c @@ -116,6 +116,9 @@ static struct option long_options[] = { {0, 0, 0, 0} }; +static void read_in_whole(unsigned char **, unsigned *, FILE *, const_string ); +static void init_tables(void); + int main (int argc, string *argv) { @@ -312,7 +315,7 @@ main (int argc, string *argv) #define BIG_BLOCK 0x20000 #define LITTLE_BLOCK 0x1000 -void +static void read_in_whole(unsigned char **contents_loc, unsigned *length_loc, FILE *file, @@ -346,7 +349,7 @@ read_in_whole(unsigned char **contents_loc, *length_loc = no_total_read; } -void +static void init_tables(void) { font_table_init(); /* subsidiary fonts in virtual fonts */ @@ -355,8 +358,3 @@ init_tables(void) init_measures(); } -void -output_text_file(FILE *dest) -{ -} - diff --git a/Build/source/texk/web2c/omegafonts/omfonts.h b/Build/source/texk/web2c/omegafonts/omfonts.h index 006915e3aaa..6486c15c0c8 100644 --- a/Build/source/texk/web2c/omegafonts/omfonts.h +++ b/Build/source/texk/web2c/omegafonts/omfonts.h @@ -42,9 +42,5 @@ extern unsigned length_ovf; extern unsigned char *ofm; extern unsigned char *ovf; -extern int main(int, string *); -extern void read_in_whole(unsigned char **, unsigned *, FILE *, const_string ); -extern void init_tables(void); extern void output_ovf_file(void); -extern void output_text_file(FILE *); diff --git a/Build/source/texk/web2c/omegafonts/out_ofm.c b/Build/source/texk/web2c/omegafonts/out_ofm.c index 2bc0a48cc32..0f8f515cd9a 100644 --- a/Build/source/texk/web2c/omegafonts/out_ofm.c +++ b/Build/source/texk/web2c/omegafonts/out_ofm.c @@ -35,6 +35,9 @@ along with Omega; if not, write to the Free Software Foundation, Inc., #include "error_routines.h" #include "parse_ofm.h" +static void compute_ofm_subsizes(void); +static void output_ofm_subsizes(void); + void output_ofm_file(void) { @@ -52,7 +55,7 @@ output_ofm_file(void) output_ofm_parameter(); } -void +static void compute_ofm_subsizes(void) { switch(ofm_level) { @@ -85,7 +88,7 @@ compute_ofm_subsizes(void) } } -void +static void output_ofm_subsizes(void) { switch(ofm_level) { diff --git a/Build/source/texk/web2c/omegafonts/out_ofm.h b/Build/source/texk/web2c/omegafonts/out_ofm.h index 183be26f7f6..7feac5b0d5c 100644 --- a/Build/source/texk/web2c/omegafonts/out_ofm.h +++ b/Build/source/texk/web2c/omegafonts/out_ofm.h @@ -27,6 +27,3 @@ extern void out_ofm_2(unsigned); extern void out_ofm_char(unsigned); extern void out_ofm_scaled(fix); extern void out_ofm(unsigned); - -extern void compute_ofm_subsizes(void); -extern void output_ofm_subsizes(void); diff --git a/Build/source/texk/web2c/omegafonts/out_routines.c b/Build/source/texk/web2c/omegafonts/out_routines.c index 38c7947a6fb..3428cd8e769 100644 --- a/Build/source/texk/web2c/omegafonts/out_routines.c +++ b/Build/source/texk/web2c/omegafonts/out_routines.c @@ -296,6 +296,8 @@ out_num(unsigned val) else out_int(val, 16); } +static void out_digits(unsigned); + void out_int(unsigned val, unsigned base) { @@ -318,23 +320,6 @@ out_int(unsigned val, unsigned base) out_digits(j); } -void -out_as_fix(fix fval) -{ - register fix x=0; - - if (fval<0) { - x = 0xff000000; - fval = fval + 0x1000000; - } - x = x | (fval & 0xff); - fval = fval % 0x100; - x = x | ((fval & 0xff) << 8); - fval = fval % 0x100; - x = x | ((fval & 0xff) << 16); - out_fix(x); -} - void out_fix(fix fval) { @@ -369,7 +354,7 @@ out_hex(unsigned char c) fprintf(file_output, "%02X", c); } -void +static void out_digits(unsigned counter) { register unsigned j=counter, c; diff --git a/Build/source/texk/web2c/omegafonts/out_routines.h b/Build/source/texk/web2c/omegafonts/out_routines.h index 4d48c8d4eff..38cfd8f7bf0 100644 --- a/Build/source/texk/web2c/omegafonts/out_routines.h +++ b/Build/source/texk/web2c/omegafonts/out_routines.h @@ -37,10 +37,8 @@ extern void out_ln(void); extern void out_char(unsigned); extern void out_num(unsigned); extern void out_int(unsigned,unsigned); -extern void out_as_fix(fix); extern void out_fix(fix); extern void out_hex(unsigned char); -extern void out_digits(unsigned); extern void out(const_string); extern void right(void); extern void left(void); diff --git a/Build/source/texk/web2c/omegafonts/param_routines.c b/Build/source/texk/web2c/omegafonts/param_routines.c index 89403874369..bdf243e659d 100644 --- a/Build/source/texk/web2c/omegafonts/param_routines.c +++ b/Build/source/texk/web2c/omegafonts/param_routines.c @@ -130,6 +130,12 @@ print_parameters(void) right(); } +static void +output_ofm_one_parameter(unsigned i, fix param) +{ + if (i==P_SLANT) out_ofm_4(param); + else out_ofm_scaled(param); +} void output_ofm_parameter(void) @@ -148,10 +154,3 @@ output_ofm_parameter(void) L = L->ptr; i++; } } - -void -output_ofm_one_parameter(unsigned i, fix param) -{ - if (i==P_SLANT) out_ofm_4(param); - else out_ofm_scaled(param); -} diff --git a/Build/source/texk/web2c/omegafonts/param_routines.h b/Build/source/texk/web2c/omegafonts/param_routines.h index a3025d7c7ec..9841ae2150e 100644 --- a/Build/source/texk/web2c/omegafonts/param_routines.h +++ b/Build/source/texk/web2c/omegafonts/param_routines.h @@ -25,6 +25,5 @@ extern void set_param_word(int, int); extern void retrieve_parameters(unsigned char *); extern void print_parameters(void); extern void output_ofm_parameter(void); -extern void output_ofm_one_parameter(unsigned, fix); extern unsigned np; diff --git a/Build/source/texk/web2c/omegafonts/parse_ofm.c b/Build/source/texk/web2c/omegafonts/parse_ofm.c index 823d68209a2..04b158e41fd 100644 --- a/Build/source/texk/web2c/omegafonts/parse_ofm.c +++ b/Build/source/texk/web2c/omegafonts/parse_ofm.c @@ -66,7 +66,7 @@ unsigned nce; unsigned nco; unsigned npc; -void +static void eval_two_bytes(unsigned *pos) { if (ofm[ofm_ptr]>127) fatal_error_0("One of the subfile sizes (2) is negative"); @@ -74,7 +74,7 @@ eval_two_bytes(unsigned *pos) { ofm_ptr += 2; } -void +static void eval_four_bytes(unsigned *pos) { if (ofm[ofm_ptr]>127) fatal_error_0("One of the subfile sizes (4) is negative"); @@ -83,6 +83,10 @@ eval_four_bytes(unsigned *pos) { ofm_ptr += 4; } +static void ofm_organize(void); +static void ofm_read_simple(void); +static void ofm_read_rest(void); + void parse_ofm(boolean read_ovf) { @@ -360,242 +364,3 @@ ofm_read_rest(void) retrieve_exten_table(ofm+(4*exten_base)); if (verbose_option==TRUE) print_extens(); } - -/* -@ Once the input data successfully passes these basic checks, -\.{TFtoPL} believes that it is a \.{TFM} file, and the conversion -to \.{PL} format will take place. Access to the various subfiles -is facilitated by computing the following base addresses. For example, -the |char_info| for character |c| in a \.{TFM} file will start in location -|4*(char_base+c)| of the |tfm| array. - -@= - -@ Of course we want to define macros that suppress the detail of how the -font information is actually encoded. Each word will be referred to by -the |tfm| index of its first byte. For example, if |c| is a character -code between |bc| and |ec|, then |tfm[char_info(c)]| will be the -first byte of its |char_info|, i.e., the |width_index|; furthermore -|width(c)| will point to the |fix_word| for |c|'s width. -*/ - -#if 0 -#define char_info(c) char_start[c] -#define nonexistent(c) ((cec)or(width_index(c)=0)) -#define width(c) 4*(width_base+width_index(c)) -#define height(c) 4*(height_base+height_index(c)) -#define depth(c) 4*(depth_base+depth_index(c)) -#define italic(c) 4*(italic_base+italic_index(c)) -#define kern(i) 4*(kern_base+i) /* i is an index, not a char */ -#define param(i) 4*(param_base+i) /* likewise */ -#endif - -/* -unsigned -width_index(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[char_info(c)]; -else - return 256*ofm[char_info(c)]+ofm[char_info(c)+1]; -} - -unsigned -height_index(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[char_info(c)+1] / 16; -else - return ofm[char_info(c)+2]; -} - -unsigned -depth_index(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[char_info(c)+1] % 16; -else - return ofm[char_info(c)+3]; -} - -unsigned -italic_index(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[char_info(c)+2] / 4; -else if (ofm_level == OFM_TFM) - return ofm[char_info(c)+4]*64 + ofm[char_info(c)+5] / 4; -else - return ofm[char_info(c)+4]; -} - -unsigned -tag(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[char_info(c)+2] % 4; -else - return ofm[char_info(c)+5] % 4; -} - -void -set_no_tag(unsigned c) -{ -if (ofm_on==FALSE) - ofm[char_info(c)+2] = (ofm[char_info(c)+2] / 64)*64 + TAG_NONE; -else - ofm[char_info(c)+5] = (ofm[char_info(c)+5] / 64)*64 + TAG_NONE; -} - -boolean -ctag(unsigned c) -{ -if (ofm_level != OFM_LEVEL1) - return FALSE; -else - return ofm[char_info(c)+5] / 4 % 2; -} - -void -set_no_ctag(unsigned c) -{ -if (ofm_level != OFM_LEVEL1) - ofm[char_info(c)+5] = - ofm[char_info(c)+5] / 8 * 8 + ofm[char_info(c)+5] % 4; -} - -unsigned -no_repeats(unsigned c) -{ -if (ofm_level == OFM_NOLEVEL) - return 0; -else - return 256*ofm[char_info(c)+8]+ofm[char_info(c)+9]; -} - -unsigned -char_param(unsigned c, unsigned i) -{ - return 256*ofm[char_info(c)+2*i+10]+ofm[char_info(c)+2*i+11]; -} - -unsigned -rremainder(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[char_info(c)+3]; -else - return 256*ofm[char_info(c)+6]+ofm[char_info(c)+7]; -} - -unsigned -lig_step(unsigned c) -{ -if (ofm_on==FALSE) - return 4*(lig_kern_base+c); -else - return 4*(lig_kern_base+2*c); -} - -unsigned -exten(unsigned c) -{ -if (ofm_on==FALSE) - return 4*(exten_base+rremainder(c)); -else - return 4*(exten_base+2*rremainder(c)); -} - -unsigned -l_skip_byte(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[c]; -else - return 256*ofm[c]+ofm[c+1]; -} - -void -set_l_skip_byte(unsigned c, unsigned newc) -{ -if (ofm_on==FALSE) - ofm[c] = newc; -else { - ofm[c] = newc / 256; - ofm[c+1] = newc % 256; -} -} - -unsigned -l_next_char(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[c+1]; -else - return 256*ofm[c+2]+ofm[c+3]; -} - -void -set_l_next_char(unsigned c, unsigned newc) -{ -if (ofm_on==FALSE) - ofm[c+1] = newc; -else { - ofm[c+2] = newc / 256; - ofm[c+3] = newc % 256; -} -} - -unsigned -l_op_byte(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[c+2]; -else - return 256*ofm[c+4]+ofm[c+5]; -} - -void -set_l_op_byte(unsigned c, unsigned newc) -{ -if (ofm_on==FALSE) - ofm[c+2] = newc; -else { - ofm[c+2] = newc / 256; - ofm[c+3] = newc % 256; -} -} - -unsigned -l_remainder(unsigned c) -{ -if (ofm_on==FALSE) - return ofm[c+3]; -else - return 256*ofm[c+6]+ofm[c+7]; -} - -void -set_l_remainder(unsigned c, unsigned newc) -{ -if (ofm_on==FALSE) - ofm[c+3] = newc; -else { - ofm[c+6] = newc / 256; - ofm[c+7] = newc % 256; -} -} - -unsigned -ofm_get_4(unsigned c) -{ - return (ofm[c]<<24) | (ofm[c+1]<<16) | (ofm[c+2]<<8) | ofm[c+3]; -} - -unsigned -ofm_get_1(unsigned c) -{ - return ofm[c]; -} - -*/ diff --git a/Build/source/texk/web2c/omegafonts/parse_ofm.h b/Build/source/texk/web2c/omegafonts/parse_ofm.h index de4d275cc33..04f46be04ea 100644 --- a/Build/source/texk/web2c/omegafonts/parse_ofm.h +++ b/Build/source/texk/web2c/omegafonts/parse_ofm.h @@ -25,34 +25,3 @@ extern unsigned char_base,width_base,height_base,depth_base,italic_base; extern unsigned npc,nco,ncw,lf; extern void parse_ofm(boolean); -extern void ofm_organize(void); -extern void ofm_read_simple(void); -extern void ofm_read_rest(void); - -extern void eval_two_bytes(unsigned *); -extern void eval_four_bytes(unsigned *); - -extern unsigned width_index(unsigned); -extern unsigned height_index(unsigned); -extern unsigned depth_index(unsigned); -extern unsigned italic_index(unsigned); -extern unsigned tag(unsigned); -extern void set_no_tag(unsigned); -extern boolean ctag(unsigned); -extern void set_no_ctag(unsigned); -extern unsigned no_repeats(unsigned); -extern unsigned char_param(unsigned, unsigned); -extern unsigned rremainder(unsigned); -extern unsigned lig_step(unsigned); -extern unsigned exten(unsigned); -extern unsigned l_skip_byte(unsigned); -extern void set_l_skip_byte(unsigned, unsigned); -extern unsigned l_next_char(unsigned); -extern void set_l_next_char(unsigned, unsigned); -extern unsigned l_op_byte(unsigned); -extern void set_l_op_byte(unsigned, unsigned); -extern unsigned l_remainder(unsigned); -extern void set_l_remainder(unsigned, unsigned); - -extern unsigned ofm_get_4(unsigned); -extern unsigned ofm_get_1(unsigned); diff --git a/Build/source/texk/web2c/omegafonts/print_routines.c b/Build/source/texk/web2c/omegafonts/print_routines.c index 678adf9b4a5..90f4226e86a 100644 --- a/Build/source/texk/web2c/omegafonts/print_routines.c +++ b/Build/source/texk/web2c/omegafonts/print_routines.c @@ -48,15 +48,6 @@ print_design_size(void) right(); } -void -print_design_units(void) -{ - left(); - out("DESIGNUNITS"); - out(" "); out_fix(design_units); - right(); -} - void print_coding_scheme(void) { @@ -98,16 +89,6 @@ print_seven_bit_safe_flag(void) } -void -print_header_word(unsigned val1, unsigned val2) -{ - left(); - out("HEADER"); - out(" "); out_int(val1,10); - out(" "); out_num(val2); - right(); -} - void print_font_dimension(void) { @@ -122,15 +103,6 @@ print_ligature_table(void) out("LIGTABLE"); out_ln(); } -void -print_boundary_character(unsigned val) -{ - left(); - out("BOUNDARYCHAR"); - out(" "); out_num(val); - right(); -} - void print_character(unsigned val) { @@ -413,299 +385,6 @@ print_character_repeat(unsigned val1, unsigned val2) out(" "); out_char(val2); out_ln(); } -void -print_font_ivalue(unsigned val) -{ - left(); - out("FONTIVALUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_mvalue(unsigned val) -{ - left(); - out("FONTMVALUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_fvalue(unsigned val) -{ - left(); - out("FONTFVALUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_penalty(unsigned val) -{ - left(); - out("FONTPENALTY"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_rule(unsigned val) -{ - left(); - out("FONTRULE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_glue(unsigned val) -{ - left(); - out("FONTGLUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_c_label_command(unsigned val) -{ - left(); - out("CLABEL"); out(" "); out_int(val,10); - right(); -} - -void -print_c_kerning_command(unsigned val1, unsigned val2) -{ - left(); - out("CKRN"); out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_c_glue_command(unsigned val1, unsigned val2) -{ - left(); - out("CGLUE"); out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_c_penalty_command(unsigned val1, unsigned val2) -{ - left(); - out("CPENALTY"); out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_c_penglue_command(unsigned val1, unsigned val2, unsigned val3) -{ - left(); - out("CPENGLUE"); out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - out(" "); out_int(val3,10); - right(); -} - -void -print_character_ivalue(unsigned val1, unsigned val2) -{ - left(); - out("CHARIVALUE"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_character_mvalue(unsigned val1, unsigned val2) -{ - left(); - out("CHARMVALUE"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_character_fvalue(unsigned val1, unsigned val2) -{ - left(); - out("CHARFVALUE"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_character_penalty(unsigned val1, unsigned val2) -{ - left(); - out("CHARPENALTY"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_character_rule(unsigned val1, unsigned val2) -{ - left(); - out("CHARRULE"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_character_glue(unsigned val1, unsigned val2) -{ - left(); - out("CHARGLUE"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_font_ivalue_entry(unsigned val) -{ - left(); - out("IVALUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_ivalue_definition(unsigned val) -{ - left(); - out("IVALUEVAL"); - out(" "); out_int(val,10); - right(); -} - -void -print_font_mvalue_entry(unsigned val) -{ - left(); - out("MVALUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_mvalue_definition(fix fval) -{ - left(); - out("MVALUEVAL"); - out(" "); out_fix(fval); - right(); -} - -void -print_font_fvalue_entry(unsigned val) -{ - left(); - out("FVALUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_fvalue_definition(fix fval) -{ - left(); - out("FVALUEVAL"); - out(" "); out_fix(fval); - right(); -} - -void -print_font_penalty_entry(unsigned val) -{ - left(); - out("PENALTY"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_penalty_definition(unsigned val) -{ - left(); - out("PENALTYVAL"); - out(" "); out_int(val,10); - right(); -} - -void -print_font_rule_entry(unsigned val) -{ - left(); - out("RULE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_rule_measure(unsigned val, fix fval) -{ - left(); - out_rule_measure(val); - out(" "); out_fix(fval); - right(); -} - -void -print_font_glue_entry(unsigned val) -{ - left(); - out("GLUE"); - out(" "); out_int(val,10); out_ln(); -} - -void -print_font_glue_type(unsigned val) -{ - left(); - out("GLUETYPE"); - out(" "); out_glue_kind(val); - right(); -} - -void -print_font_glue_width(fix fval) -{ - left(); - out("GLUEWD"); - out(" "); out_fix(fval); - right(); -} - -void -print_font_glue_character(unsigned val) -{ - left(); - out("GLUECHAR"); - out(" "); out_char(val); - right(); -} - -void -print_font_glue_rule(unsigned val1, unsigned val2) -{ - left(); - out("GLUERULE"); - out(" "); out_int(val1,10); - out(" "); out_int(val2,10); - right(); -} - -void -print_font_glue_shrink_stretch(unsigned val1, fix fval, unsigned val2) -{ - left(); - out_shrink_stretch(val1); - out(" "); out_fix(fval); - out(" "); out_glue_order(val2); - right(); -} - void print_ofm_level(unsigned val) { @@ -722,12 +401,3 @@ print_font_dir(unsigned val) out_type_direction(val); right(); } - -void -print_accent(unsigned val) -{ - left(); - out_accent_kind(val); - right(); -} - diff --git a/Build/source/texk/web2c/omegafonts/print_routines.h b/Build/source/texk/web2c/omegafonts/print_routines.h index 025a8675aeb..b95a36faf76 100644 --- a/Build/source/texk/web2c/omegafonts/print_routines.h +++ b/Build/source/texk/web2c/omegafonts/print_routines.h @@ -23,15 +23,12 @@ along with Omega; if not, write to the Free Software Foundation, Inc., extern void print_check_sum(void); extern void print_design_size(void); -extern void print_design_units(void); extern void print_coding_scheme(void); extern void print_family(void); extern void print_face(void); extern void print_seven_bit_safe_flag(void); -extern void print_header_word(unsigned, unsigned); extern void print_font_dimension(void); extern void print_ligature_table(void); -extern void print_boundary_character(unsigned); extern void print_character(unsigned); extern void print_parameter(unsigned, fix); extern void print_label_command(unsigned); @@ -64,42 +61,6 @@ extern void print_special(string); extern void print_special_hex(unsigned char *, int); extern void print_character_repeat(unsigned, unsigned); -extern void print_font_ivalue(unsigned); -extern void print_font_mvalue(unsigned); -extern void print_font_fvalue(unsigned); -extern void print_font_penalty(unsigned); -extern void print_font_rule(unsigned); -extern void print_font_glue(unsigned); -extern void print_c_label_command(unsigned); -extern void print_c_kerning_command(unsigned, unsigned); -extern void print_c_glue_command(unsigned, unsigned); -extern void print_c_penalty_command(unsigned, unsigned); -extern void print_c_penglue_command(unsigned, unsigned, unsigned); -extern void print_character_ivalue(unsigned, unsigned); -extern void print_character_mvalue(unsigned, unsigned); -extern void print_character_fvalue(unsigned, unsigned); -extern void print_character_penalty(unsigned, unsigned); -extern void print_character_rule(unsigned, unsigned); -extern void print_character_glue(unsigned, unsigned); -extern void print_font_ivalue_entry(unsigned); -extern void print_font_ivalue_definition(unsigned); -extern void print_font_mvalue_entry(unsigned); -extern void print_font_mvalue_definition(fix); -extern void print_font_fvalue_entry(unsigned); -extern void print_font_fvalue_definition(fix); -extern void print_font_penalty_entry(unsigned); -extern void print_font_penalty_definition(unsigned); -extern void print_font_rule_entry(unsigned); -extern void print_font_rule_measure(unsigned, fix); -extern void print_font_rule_height(fix); -extern void print_font_rule_depth(fix); -extern void print_font_glue_entry(unsigned); -extern void print_font_glue_type(unsigned); -extern void print_font_glue_width(fix); -extern void print_font_glue_character(unsigned); -extern void print_font_glue_rule(unsigned,unsigned); -extern void print_font_glue_shrink_stretch(unsigned, fix, unsigned); extern void print_ofm_level(unsigned); extern void print_font_dir(unsigned); -extern void print_accent(unsigned); -- cgit v1.2.3