struct CHead_melodic_tuple {
Melodic_req *req_l_ ;
- Score_element *head_l_;
+ Grob *head_l_;
Moment end_;
CHead_melodic_tuple ();
- CHead_melodic_tuple (Score_element*, Melodic_req*, Moment);
+ CHead_melodic_tuple (Grob*, Melodic_req*, Moment);
static int pitch_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &);
static int time_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &);
};
priority queue. If we have a Tie_req, connect the notes that finish
just at this time, and note that start at this time.
- TODO: junk the pq.
- */
+ TODO: junk the pq; the PQ is overkill if we assume that no
+ different durations occur in parallel.
+*/
class Tie_engraver : public Engraver
{
PQueue<CHead_melodic_tuple> past_notes_pq_;
Tie_req *req_l_;
Array<CHead_melodic_tuple> now_heads_;
Array<CHead_melodic_tuple> stopped_heads_;
- Link_array<Score_element> tie_p_arr_;
+ Link_array<Grob> tie_p_arr_;
Spanner * tie_column_p_;
void set_melisma (bool);
protected:
- virtual void do_post_move_processing ();
- virtual void do_pre_move_processing ();
- virtual void acknowledge_element (Score_element_info);
- virtual bool do_try_music (Music*);
- virtual void do_process_music ();
- virtual void process_acknowledged ();
- void typeset_tie (Score_element*);
+ virtual void start_translation_timestep ();
+ virtual void stop_translation_timestep ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual bool try_music (Music*);
+ virtual void create_grobs ();
+ void typeset_tie (Grob*);
public:
VIRTUAL_COPY_CONS(Translator);
Tie_engraver();
bool
-Tie_engraver::do_try_music (Music *m)
+Tie_engraver::try_music (Music *m)
{
if (Tie_req * c = dynamic_cast<Tie_req*> (m))
{
}
void
-Tie_engraver::acknowledge_element (Score_element_info i)
+Tie_engraver::acknowledge_grob (Grob_info i)
{
if (Rhythmic_head::has_interface (i.elem_l_))
{
}
}
-void
-Tie_engraver::do_process_music ()
-{
- if (req_l_)
- {
- Moment now = now_mom ();
- stopped_heads_.clear ();
- while (past_notes_pq_.size ()
- && past_notes_pq_.front ().end_ == now)
- stopped_heads_.push (past_notes_pq_.get ());
- }
-}
void
-Tie_engraver::process_acknowledged ()
+Tie_engraver::create_grobs ()
{
if (req_l_)
{
while (i >= 0 && j >=0)
{
int comp
- = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
- stopped_heads_[j].req_l_->pitch_);
+ = Pitch::compare (*unsmob_pitch (now_heads_[i].req_l_->get_mus_property ("pitch") ),
+ *unsmob_pitch (stopped_heads_[j].req_l_->get_mus_property ("pitch")));
if (comp)
{
SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
Spanner * p = new Spanner (basic);
- Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_element (gh_car (pair))));
- Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdr (pair))));
+ Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_grob (gh_car (pair))));
+ Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_grob (gh_cdr (pair))));
tie_p_arr_.push (p);
- announce_element (p, req_l_);
+ announce_grob (p, req_l_);
}
else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
{
- Score_element * p = new Spanner (basic);
+ Grob * p = new Spanner (basic);
Tie::set_interface (p);
- Tie::set_head (p, LEFT, dynamic_cast<Item*> (unsmob_element (gh_caar (s))));
- Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdar (s))));
+ Tie::set_head (p, LEFT, dynamic_cast<Item*> (unsmob_grob (gh_caar (s))));
+ Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_grob (gh_cdar (s))));
tie_p_arr_.push (p);
- announce_element (p, req_l_);
+ announce_grob (p, req_l_);
}
- if (!tie_p_arr_.size ())
- {
- req_l_->origin ()->warning (_ ("No ties were created!"));
- }
- else if (tie_p_arr_.size () > 1 && !tie_column_p_)
+ if (tie_p_arr_.size () > 1 && !tie_column_p_)
{
tie_column_p_ = new Spanner (get_property ("TieColumn"));
Tie_column::set_interface (tie_column_p_);
for (int i = tie_p_arr_.size (); i--; )
Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
- announce_element (tie_column_p_, 0);
+ announce_grob (tie_column_p_, 0);
}
}
}
void
-Tie_engraver::do_pre_move_processing ()
+Tie_engraver::stop_translation_timestep ()
{
for (int i=0; i < now_heads_.size (); i++)
{
}
now_heads_.clear ();
+ if (req_l_ && !tie_p_arr_.size ())
+ {
+ req_l_->origin ()->warning (_ ("No ties were created!"));
+ }
+
for (int i=0; i< tie_p_arr_.size (); i++)
{
typeset_tie (tie_p_arr_[i]);
tie_p_arr_.clear ();
if (tie_column_p_)
{
- typeset_element (tie_column_p_);
+ typeset_grob (tie_column_p_);
tie_column_p_ =0;
}
}
void
-Tie_engraver::typeset_tie (Score_element *her)
+Tie_engraver::typeset_tie (Grob *her)
{
if (!(Tie::head (her,LEFT) && Tie::head (her,RIGHT)))
warning (_ ("lonely tie"));
Direction d = LEFT;
- Drul_array<Score_element *> new_head_drul;
+ Drul_array<Grob *> new_head_drul;
new_head_drul[LEFT] = Tie::head(her,LEFT);
new_head_drul[RIGHT] = Tie::head (her,RIGHT);
do {
new_head_drul[d] = Tie::head(her,(Direction)-d);
} while (flip(&d) != LEFT);
- index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm () );
- index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm () );
+ index_set_cell (her->get_grob_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm () );
+ index_set_cell (her->get_grob_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm () );
- typeset_element (her);
+ typeset_grob (her);
}
void
-Tie_engraver::do_post_move_processing ()
+Tie_engraver::start_translation_timestep ()
{
SCM m = get_property ("automaticMelismata");
if (to_boolean (m))
Moment now = now_mom ();
while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
past_notes_pq_.delmin ();
+
+
+ stopped_heads_.clear ();
+ while (past_notes_pq_.size ()
+ && past_notes_pq_.front ().end_ == now)
+ stopped_heads_.push (past_notes_pq_.get ());
+
}
ADD_THIS_TRANSLATOR(Tie_engraver);
end_ = 0;
}
-CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom)
+CHead_melodic_tuple::CHead_melodic_tuple (Grob *h, Melodic_req*m, Moment mom)
{
head_l_ = h;
req_l_ = m;
end_ = mom;
}
+/*
+ signed compare, should use pitch<?
+ */
int
CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
CHead_melodic_tuple const &h2)
{
- return Melodic_req::compare (*h1.req_l_, *h2.req_l_);
+ SCM p1 = h1.req_l_->get_mus_property ("pitch");
+ SCM p2 = h2.req_l_->get_mus_property ("pitch");
+
+ return Pitch::compare (*unsmob_pitch (p1),
+ *unsmob_pitch (p2));
}
int
CHead_melodic_tuple::time_compare (CHead_melodic_tuple const&h1,
- CHead_melodic_tuple const &h2)
+ CHead_melodic_tuple const &h2)
{
return (h1.end_ - h2.end_ ).sign ();
}
projects / lilypond.git / blobdiff