/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
int
Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
- Rhythmic_tuple const &h2)
+ Rhythmic_tuple const &h2)
{
return (h1.end_ - h2.end_).main_part_.sign ();
}
Moment now_;
Spanner *spacing_;
Stream_event *start_section_;
-
+
TRANSLATOR_DECLARATIONS (Spacing_engraver);
protected:
{
if (start_section_ && spacing_)
stop_spanner ();
-
+
if (!spacing_)
start_spanner ();
}
{
assert (!spacing_);
-
spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
spacing_->set_bound (LEFT,
- unsmob_grob (get_property ("currentCommandColumn")));
+ unsmob_grob (get_property ("currentCommandColumn")));
}
void
void
Spacing_engraver::acknowledge_rhythmic_grob (Grob_info i)
{
- add_starter_duration (i);
+ add_starter_duration (i);
}
void
add_starter_duration (i);
}
-
void
Spacing_engraver::add_starter_duration (Grob_info i)
{
{
Stream_event *r = i.event_cause ();
if (r && r->in_event_class ("rhythmic-event"))
- {
- Moment len = get_event_length (r, now_);
- Rhythmic_tuple t (i, now_mom () + len);
- now_durations_.push_back (t);
- }
+ {
+ Moment len = get_event_length (r, now_);
+ Rhythmic_tuple t (i, now_mom () + len);
+ now_durations_.push_back (t);
+ }
}
}
Paper_column *musical_column
= dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
-
if (!spacing_)
start_spanner ();
musical_column->set_object ("spacing", spacing_->self_scm ());
unsmob_grob (get_property ("currentCommandColumn"))
- ->set_object ("spacing", spacing_->self_scm ());
-
+ ->set_object ("spacing", spacing_->self_scm ());
+
SCM proportional = get_property ("proportionalNotationDuration");
if (unsmob_moment (proportional))
{
{
Stream_event *ev = playing_durations_[i].info_.event_cause ();
if (ev)
- {
- Moment now = now_mom ();
- Moment m = get_event_length (ev);
- shortest_playing = min (shortest_playing, m);
- }
+ {
+ Moment m = get_event_length (ev);
+ shortest_playing = min (shortest_playing, m);
+ }
}
Moment starter;
starter.set_infinite (1);
{
Moment m = get_event_length (now_durations_[i].info_.event_cause ());
if (m.to_bool ())
- {
- starter = min (starter, m);
- playing_durations_.insert (now_durations_[i]);
- }
+ {
+ starter = min (starter, m);
+ playing_durations_.insert (now_durations_[i]);
+ }
}
now_durations_.clear ();
musical_column->set_property ("shortest-starter-duration", st);
}
-
-
void
Spacing_engraver::start_translation_timestep ()
{
now_ = now_mom ();
stopped_durations_.clear ();
-
+
while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
playing_durations_.delmin ();
while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_grob);
ADD_TRANSLATOR (Spacing_engraver,
- /* doc */
- "Make a @code{SpacingSpanner} and do bookkeeping of shortest"
- " starting and playing notes.",
-
- /* create */
- "SpacingSpanner ",
-
- /* read */
- "currentMusicalColumn "
- "currentCommandColumn "
- "proportionalNotationDuration ",
-
- /* write */
- ""
- );
+ /* doc */
+ "Make a @code{SpacingSpanner} and do bookkeeping of shortest"
+ " starting and playing notes.",
+
+ /* create */
+ "SpacingSpanner ",
+
+ /* read */
+ "currentMusicalColumn "
+ "currentCommandColumn "
+ "proportionalNotationDuration ",
+
+ /* write */
+ ""
+ );