diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-05-19 13:40:19 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-05-19 13:40:19 +0000 |
| commit | 0cd8c7e901b532437cef10e5b7ded91a82c9faa8 (patch) | |
| tree | ab771e76ec12d6a0ac1047b5563d0033c2fffdc7 /lily/beam.cc | |
| parent | 93e6e92a15cdb40399920498ed7fdf5f2d755b0f (diff) | |
(set_stem_lengths): trigger 'beaming callback, in
case positions is set manually. Backportme.
Diffstat (limited to 'lily/beam.cc')
| -rw-r--r-- | lily/beam.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lily/beam.cc b/lily/beam.cc index f6c07a84cb..8089cb8270 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1090,13 +1090,13 @@ where_are_the_whole_beams (SCM beaming) /* Return the Y position of the stem-end, given the Y-left, Y-right in POS for stem S. This Y position is relative to S. */ Real -Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, +Beam::calc_stem_y (Grob *me, Grob *stem, Grob **common, Real xl, Real xr, Drul_array<Real> pos, bool french) { Real beam_translation = get_beam_translation (me); - Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl; + Real r = stem->relative_coordinate (common[X_AXIS], X_AXIS) - xl; Real dy = pos[RIGHT] - pos[LEFT]; Real dx = xr - xl; Real stem_y_beam0 = (dy && dx @@ -1104,8 +1104,8 @@ Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, * dy : 0) + pos[LEFT]; - Direction my_dir = get_grob_direction (s); - SCM beaming = s->get_property ("beaming"); + Direction my_dir = get_grob_direction (stem); + SCM beaming = stem->get_property ("beaming"); Real stem_y = stem_y_beam0; if (french) @@ -1116,13 +1116,13 @@ Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, } else { - Slice bm = Stem::beam_multiplicity (s); + Slice bm = Stem::beam_multiplicity (stem); if (!bm.is_empty ()) stem_y += bm[my_dir] * beam_translation; } Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS) - - s->relative_coordinate (common[Y_AXIS], Y_AXIS); + - stem->relative_coordinate (common[Y_AXIS], Y_AXIS); return stem_y + id; } @@ -1137,8 +1137,9 @@ Beam::set_stem_lengths (SCM smob) { Grob *me = unsmob_grob (smob); - /* trigger callback. */ + /* trigger callbacks. */ (void) me->get_property ("direction"); + (void) me->get_property ("beaming"); SCM posns = me->get_property ("positions"); |