#include "musical-request.hh"
#include "paper-column.hh"
-#include "spacing-engraver.hh"
+
#include "spacing-spanner.hh"
+#include "engraver.hh"
+#include "pqueue.hh"
+
+struct Rhythmic_tuple
+{
+ Grob_info info_;
+ Moment end_;
+
+ Rhythmic_tuple ()
+ {
+ }
+ Rhythmic_tuple (Grob_info i, Moment m )
+ {
+ info_ = i;
+ end_ = m;
+ }
+ static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
+};
+
+/**
+ Acknowledge rhythmic elements, for initializing spacing fields in
+ the columns.
+
+ should be the last one of the toplevel context
+*/
+class Spacing_engraver : public Engraver
+{
+ PQueue<Rhythmic_tuple> playing_durations_;
+ Array<Rhythmic_tuple> now_durations_;
+ Array<Rhythmic_tuple> stopped_durations_;
+
+ Spanner * spacing_p_;
+protected:
+ VIRTUAL_COPY_CONS(Translator);
+ virtual void acknowledge_grob (Grob_info);
+ virtual void start_translation_timestep ();
+ virtual void stop_translation_timestep ();
+ virtual void initialize ();
+ virtual void finalize ();
+public:
+ Spacing_engraver ();
+};
inline int
compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
Rhythmic_tuple const &h2)
{
-
return (h1.end_ - h2.end_ ).sign ();
}
}
void
-Spacing_engraver::do_creation_processing ()
+Spacing_engraver::initialize ()
{
- spacing_p_ =new Spacing_spanner (SCM_EOL);
- spacing_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));
- announce_element (Score_element_info (spacing_p_, 0));
+ spacing_p_ =new Spanner (get_property ("SpacingSpanner"));
+ Spacing_spanner::set_interface (spacing_p_);
+ spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+ announce_grob (spacing_p_, 0);
}
void
-Spacing_engraver::do_removal_processing ()
+Spacing_engraver::finalize ()
{
- Score_element * p = unsmob_element (get_property ("currentCommandColumn"));
+ Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
spacing_p_->set_bound (RIGHT, p);
- typeset_element (spacing_p_);
+ typeset_grob (spacing_p_);
spacing_p_ =0;
}
void
-Spacing_engraver::acknowledge_element (Score_element_info i)
+Spacing_engraver::acknowledge_grob (Grob_info i)
{
- if (to_boolean (i.elem_l_->get_elt_property ("grace")))
+ if (to_boolean (i.elem_l_->get_grob_property ("grace")))
return;
- if (to_boolean (i.elem_l_->get_elt_property ("non-rhythmic")))
+ if (to_boolean (i.elem_l_->get_grob_property ("non-rhythmic")))
return;
if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*>(i.req_l_))
}
void
-Spacing_engraver::do_pre_move_processing ()
+Spacing_engraver::stop_translation_timestep ()
{
Moment shortest_playing;
shortest_playing.set_infinite (1);
shortest_playing = shortest_playing <? starter;
Paper_column * sc
- = dynamic_cast<Paper_column*> (unsmob_element (get_property ("currentMusicalColumn")));
+ = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
- SCM sh = smobify (new Moment (shortest_playing));
- SCM st = smobify (new Moment (starter));
+ SCM sh = shortest_playing.smobbed_copy( );
+ SCM st = starter.smobbed_copy();
- sc->set_elt_property ("shortest-playing-duration", sh);
- sc->set_elt_property ("shortest-starter-duration", st);
+ sc->set_grob_property ("shortest-playing-duration", sh);
+ sc->set_grob_property ("shortest-starter-duration", st);
}
void
-Spacing_engraver::do_post_move_processing ()
+Spacing_engraver::start_translation_timestep ()
{
Moment now = now_mom ();
stopped_durations_.clear ();