source file of the GNU LilyPond music typesetter
- (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+ (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>,
Erik Sandberg <mandolaerik@gmail.com>
*/
public:
DECLARE_SCHEME_CALLBACK (constructor, ());
/* construction */
- DECLARE_CLASSNAME(Time_scaled_music_iterator);
+ DECLARE_CLASSNAME (Time_scaled_music_iterator);
Time_scaled_music_iterator ();
protected:
virtual void process (Moment m);
m.main_part_ == next_split_mom_)
{
descend_to_bottom_context ();
- if (tuplet_handler_.get_outlet())
+ if (tuplet_handler_.get_outlet ())
create_event (STOP)->send_to_context (tuplet_handler_.get_outlet ());
if (m.main_part_ < music_get_length ().main_part_)
tuplet_handler_.set_context (0);
}
}
- Music_wrapper_iterator::process(m);
+ Music_wrapper_iterator::process (m);
if (child_iter_ && child_iter_->ok ())
descend_to_child (child_iter_->get_outlet ());
void
Time_scaled_music_iterator::construct_children ()
{
+ spanner_duration_ = music_get_length ();
+
Moment *mp = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
if (mp)
- {
- spanner_duration_ = mp->main_part_;
- }
- else
- {
- spanner_duration_ = music_get_length ();
- }
+ spanner_duration_ = min (mp->main_part_, spanner_duration_);
Music_wrapper_iterator::construct_children ();