From: Jan Nieuwenhuizen Date: Sun, 21 Nov 2004 14:57:05 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.5.14~513 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a96c695dca9d5aeb37192685383e8a06ab87ac6b;p=lilypond.git *** empty log message *** --- diff --git a/lily/afm.cc b/lily/afm.cc index 155bfa96f6..456f4893c2 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -152,15 +152,24 @@ read_afm_file (String nm) Box afm_bbox_to_box (AFM_BBox bb) { +#if 1 /* Fine for feta; ec-fonts-mftraced do not have AFM :-( */ return Box (Interval (bb.llx, bb.urx) * 0.001 PT, Interval (bb.lly, bb.ury) * 0.001 PT); +#else /* FIXME: about right for lmodern. */ + return Box (Interval (bb.llx, bb.urx) * 1.14 * 0.001 PT, + Interval (bb.lly, bb.ury) * 1.14 * 0.001 PT); +#endif } Offset Adobe_font_metric::get_indexed_wxwy (int k) const { AFM_CharMetricInfo const *mi = font_info_->cmi + k; +#if 1 /* Fine for feta; ec-fonts-mftraced do not have AFM :-( return Offset (mi->wx, mi->wy) * 0.001 PT; +#else /* FIXME: about right for lmodern. */ + return Offset (mi->wx, mi->wy) * 1.14 * 0.001 PT; +#endif } Real