/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+ Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>,
Erik Sandberg <mandolaerik@gmail.com>
LilyPond is free software: you can redistribute it and/or modify
&& m.main_part_ == next_split_mom_)
{
descend_to_bottom_context ();
- if (tuplet_handler_.get_outlet ())
- create_event (STOP)->send_to_context (tuplet_handler_.get_outlet ());
+ if (tuplet_handler_.get_context ())
+ create_event (STOP)->send_to_context (tuplet_handler_.get_context ());
if (m.main_part_ < music_get_length ().main_part_)
{
void
Tuplet_iterator::construct_children ()
{
- spanner_duration_ = music_get_length ();
+ if (Duration *d = unsmob_duration (get_music ()->get_property ("duration")))
+ spanner_duration_ = d->get_length ();
+ else
+ {
+ spanner_duration_ = music_get_length ();
- Moment *mp
- = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
- if (mp)
- spanner_duration_ = min (mp->main_part_, spanner_duration_);
+ Moment *mp
+ = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
+ if (mp)
+ spanner_duration_ = min (mp->main_part_, spanner_duration_);
+ }
Music_wrapper_iterator::construct_children ();