summaryrefslogtreecommitdiff
path: root/lily/beam.cc
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2006-10-03 12:00:17 +0000
committerHan-Wen Nienhuys <hanwen@xs4all.nl>2006-10-03 12:00:17 +0000
commit73d087a6589038ac21efe802fe6d51cafa411749 (patch)
tree385b10bae4f78ba9fa892933acd5f554d0cb9391 /lily/beam.cc
parent9a88ca226c37eb20c968ecefb2fe8657063376cd (diff)
* lily/slur.cc (outside_slur_callback): make offset_scm optional.
* lily/beam.cc (rest_collision_callback): make prev_offset optional. * lily/grob-closure.cc (chain_offset_callback): don't pass 0 but SCM_UNDEFINED for non-existent data. * lily/side-position-interface.cc (general_side_position): allow optional current_offset argument for chaining, so combinations of side-position and outside slur callback don't add up. Fixes issue #92.
Diffstat (limited to 'lily/beam.cc')
-rw-r--r--lily/beam.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lily/beam.cc b/lily/beam.cc
index c52b6f14f9..4a59a069be 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1301,7 +1301,7 @@ Beam::last_visible_stem (Grob *me)
rest -> stem -> beam -> interpolate_y_position ()
*/
-MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1);
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{