From 9e1b530fa8405c276ea3c9059b5e3c2cef358860 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 30 Dec 2003 15:45:42 +0000 Subject: [PATCH] * scm/output-lib.scm (note-head-style->attachment-coordinates): change calling convention of stem-attachment function. * buildscripts/mf-to-table.py: read and dump WX/WY fields * mf/feta-autometric.mf: dump WX/WY fields too * mf/parmesan-heads.mf: idem. * mf/feta-bolletjes.mf (slash_slope): set WX/WY fields for attachment coordinates. * lily/note-head.cc (stem_attachment_coordinate): read stem attachment from the notehead glyphs WX/WY fields. * lily/include/font-metric.hh (struct Font_metric): add methods get_indexed_wxwy (), make a distinction between looking up by index and ASCII * mf/feta-bolletjes.mf: rewrite note head MF code. (test_outlines): make heads more rotund for smaller sizes. --- lily/note-head.cc | 3 ++- mf/feta-bolletjes.mf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lily/note-head.cc b/lily/note-head.cc index 012e7051a4..d40d2fe12f 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -293,7 +293,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a) if (!gh_procedure_p (v)) return 0.0; - SCM result = scm_call_2 (v, me->self_scm(), gh_int2scm (axis)); + SCM result = scm_call_2 (v, me->self_scm(), gh_int2scm (a)); if (!gh_pair_p (result)) return 0.0; @@ -301,6 +301,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a) return gh_number_p (result) ? gh_scm2double (result) : 0.0; } + int Note_head::get_balltype (Grob*me) { diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 0fde3f0f44..51712dbc41 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -57,7 +57,7 @@ def draw_outside_ellipse (expr ellipsidity, tilt, superness, % attachment Y charwy := ypart (right_point) * scaling#; - charwx := xpart (right_point) * scaling#; + charwx := width# ; p := p scaled scaling shifted (width/2, 0) ; if test_outlines = 1: -- 2.39.2