diff options
| -rw-r--r-- | Build/source/texk/web2c/omegafonts/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/omegafonts/font_routines.c | 3 | ||||
| -rw-r--r-- | Build/source/texk/web2c/omegafonts/parse_ofm.c | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog new file mode 100644 index 00000000000..e7f8310deb3 --- /dev/null +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -0,0 +1,6 @@ +2006-05-25 Roozbeh Pournader <roozbeh@farsiweb.info> + + * font_routines.c (clear_map_font): fixed default value of font_at. + + * parse_ofm.c (ofm_organize): replaced magic number with constant. + (ofm_read_simple): fixed a 1-off offset. diff --git a/Build/source/texk/web2c/omegafonts/font_routines.c b/Build/source/texk/web2c/omegafonts/font_routines.c index 8cb763b7db0..db3413d80e1 100644 --- a/Build/source/texk/web2c/omegafonts/font_routines.c +++ b/Build/source/texk/web2c/omegafonts/font_routines.c @@ -4,6 +4,7 @@ This file is part of Omega, which is based on the web2c distribution of TeX, Copyright (c) 1994--2001 John Plaice and Yannis Haralambous +Copyright (C) 2005, 2006 Roozbeh Pournader Omega is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -70,7 +71,7 @@ clear_map_font(int font_number) cur_font->font_number = font_number; cur_font->font_name = NULL; cur_font->font_area = NULL; - cur_font->font_at = 0; + cur_font->font_at = design_units; cur_font->font_checksum = 0; cur_font->font_dsize = 10*UNITY; cur_font->font_at_defined = FALSE; diff --git a/Build/source/texk/web2c/omegafonts/parse_ofm.c b/Build/source/texk/web2c/omegafonts/parse_ofm.c index 9dc839d382d..82eb53b2237 100644 --- a/Build/source/texk/web2c/omegafonts/parse_ofm.c +++ b/Build/source/texk/web2c/omegafonts/parse_ofm.c @@ -4,6 +4,7 @@ This file is part of Omega, which is based on the web2c distribution of TeX, Copyright (c) 1994--2001 John Plaice and Yannis Haralambous +Copyright (C) 2005, 2006 Roozbeh Pournader Omega is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -119,10 +120,10 @@ ofm_organize(void) if (lf==0) { /* This is not a TFM file, it is an OFM-file */ ofm_on = TRUE; - /* next line edited by Thomas Esser, based on a patch send + /* next line edited by Thomas Esser, based on a patch sent * by Hossein Movahhedian. The old code had " + 1" - * instead of "+ 2" and caused lots of segfaults */ - ofm_level = ofm[2]*0x100 + ofm[3] + 2; + * instead of "+ OFM_LEVEL0" and caused lots of segfaults */ + ofm_level = ofm[2]*0x100 + ofm[3] + OFM_LEVEL0; if (ofm[4]>127) fatal_error_0("File length is negative"); lf = ofm[4]*0x1000000 + ofm[5]*0x10000 + ofm[6]*0x100 + ofm[7]; @@ -323,7 +324,7 @@ ofm_read_simple(void) { if (ofm_on==TRUE) { - print_ofm_level(ofm_level-1); + print_ofm_level(ofm_level-OFM_LEVEL0); print_font_dir(font_dir); } header = (char *) ofm+check_sum_pos; |