source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "paper-column.hh"
static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
};
-
/*
TODO: allow starting & stopping of spacing regions.
- */
+*/
/*
- Acknowledge rhythmic elements, for initializing spacing fields in
- the columns.
+ Acknowledge rhythmic elements, for initializing spacing fields in
+ the columns.
*/
class Spacing_engraver : public Engraver
{
PQueue<Rhythmic_tuple> playing_durations_;
- Array<Rhythmic_tuple> now_durations_;
- Array<Rhythmic_tuple> stopped_durations_;
+ vector<Rhythmic_tuple> now_durations_;
+ vector<Rhythmic_tuple> stopped_durations_;
Moment now_;
Spanner *spacing_;
TRANSLATOR_DECLARATIONS (Spacing_engraver);
-
+
protected:
DECLARE_ACKNOWLEDGER (staff_spacing);
DECLARE_ACKNOWLEDGER (note_spacing);
DECLARE_ACKNOWLEDGER (rhythmic_head);
-
+
void start_translation_timestep ();
void stop_translation_timestep ();
void process_music ();
{
Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
}
-
+
void
Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
{
{
Moment len = r->get_length ();
Rhythmic_tuple t (i, now_mom () + len);
- now_durations_.push (t);
+ now_durations_.push_back (t);
}
}
}
{
Paper_column *musical_column
= dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
-
+
SCM proportional = get_property ("proportionalNotationDuration");
if (unsmob_moment (proportional))
{
musical_column->set_property ("shortest-playing-duration", proportional);
musical_column->set_property ("shortest-starter-duration", proportional);
- return;
+ return;
}
-
+
Moment shortest_playing;
shortest_playing.set_infinite (1);
- for (int i = 0; i < playing_durations_.size (); i++)
+ for (vsize i = 0; i < playing_durations_.size (); i++)
{
Music *mus = playing_durations_[i].info_.music_cause ();
if (mus)
Moment starter;
starter.set_infinite (1);
- for (int i = 0; i < now_durations_.size (); i++)
+ for (vsize i = 0; i < now_durations_.size (); i++)
{
Moment m = now_durations_[i].info_.music_cause ()->get_length ();
if (m.to_bool ())
shortest_playing = min (shortest_playing, starter);
-
assert (starter.to_bool ());
SCM sh = shortest_playing.smobbed_copy ();
SCM st = starter.smobbed_copy ();
while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
playing_durations_.delmin ();
while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
- stopped_durations_.push (playing_durations_.get ());
+ stopped_durations_.push_back (playing_durations_.get ());
}
ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing);
ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing);
ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head);
-
+
ADD_TRANSLATOR (Spacing_engraver,
"make a SpacingSpanner and do "
"bookkeeping of shortest starting and playing notes ",
/* create */ "SpacingSpanner",
/* accept */ "",
- /* read */ "currentMusicalColumn currentCommandColumn proportionalNotationDuration",
+ /* read */
+ "currentMusicalColumn "
+ "currentCommandColumn "
+ "proportionalNotationDuration",
+
/* write */ "");