source file of the GNU LilyPond music typesetter
- (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "command-request.hh"
-#include "rhythmic-head.hh"
#include "musical-request.hh"
#include "tie.hh"
#include "translator-group.hh"
#include "spanner.hh"
#include "tie-column.hh"
-#include "pqueue.hh"
#include "engraver.hh"
#include "item.hh"
#include "grob-pitch-tuple.hh"
-
+#include "warn.hh"
+#include "note-head.hh"
/**
Manufacture ties. Acknowledge noteheads, and put them into a
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; the PQ is overkill if we assume that no
- different durations occur in parallel.
-
TODO: Remove the dependency on musical info. We should tie on the
basis of position and duration-log of the heads (not of the reqs).
*/
class Tie_engraver : public Engraver
{
- PQueue<Grob_pitch_tuple> past_notes_pq_;
Moment end_mom_;
Moment next_end_mom_;
Tie_req *req_l_;
- Array<Grob_pitch_tuple> now_heads_;
- Array<Grob_pitch_tuple> stopped_heads_;
+ Link_array<Grob> now_heads_;
+ Link_array<Grob> stopped_heads_;
Link_array<Grob> tie_p_arr_;
Spanner * tie_column_p_;
void
Tie_engraver::acknowledge_grob (Grob_info i)
{
- if (Rhythmic_head::has_interface (i.grob_l_))
+ if (Note_head::has_interface (i.grob_l_))
{
- Note_req * m = dynamic_cast<Note_req* > (i.music_cause ());
- if (!m)
- return;
- now_heads_.push (Grob_pitch_tuple (i.grob_l_, m, now_mom () + m->length_mom ()));
+ now_heads_.push (i.grob_l_);
}
}
+int
+head_pitch_compare (Grob *const&a,Grob *const&b)
+{
+ Music *m1 =unsmob_music (a->get_grob_property ("cause"));
+ Music *m2 =unsmob_music (b->get_grob_property ("cause"));
+
+ return Pitch::compare (* unsmob_pitch (m1->get_mus_property ("pitch")),
+ * unsmob_pitch (m2->get_mus_property ("pitch")));
+}
void
Tie_engraver::create_grobs ()
{
if (req_l_)
{
- now_heads_.sort (Grob_pitch_tuple::pitch_compare);
- stopped_heads_.sort (Grob_pitch_tuple::pitch_compare);
+ now_heads_.sort (&head_pitch_compare);
+ stopped_heads_.sort (&head_pitch_compare);
SCM head_list = SCM_EOL;
while (i >= 0 && j >=0)
{
int comp
- = Pitch::compare (now_heads_[i].pitch_,
- stopped_heads_[j].pitch_);
+ = head_pitch_compare (now_heads_[i], stopped_heads_[j]);
if (comp)
{
- (comp < 0) ? j -- : i--;
+ (comp < 0) ? j -- : i--;
continue;
}
else
{
- head_list = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm (),
- now_heads_[i].head_l_->self_scm ()),
+ head_list = gh_cons (gh_cons (stopped_heads_[j]->self_scm (),
+ now_heads_[i]->self_scm ()),
head_list);
- past_notes_pq_. insert (now_heads_[i]);
now_heads_.del (i);
stopped_heads_.del (j);
i--;
Spanner * p = new Spanner (basic);
- Tie::set_interface (p);
+ Tie::set_interface (p); // cannot remove.
Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_grob (ly_car (pair))));
Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdr (pair))));
tie_p_arr_.push (p);
- announce_grob (p, req_l_);
+ announce_grob(p, req_l_->self_scm());
}
else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s))
{
Grob * p = new Spanner (basic);
- Tie::set_interface (p);
+ Tie::set_interface (p); // cannot remove yet!
Tie::set_head (p, LEFT, dynamic_cast<Item*> (unsmob_grob (ly_caar (s))));
Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdar (s))));
tie_p_arr_.push (p);
- announce_grob (p, req_l_);
+ announce_grob(p, req_l_->self_scm());
}
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_grob (tie_column_p_, 0);
+ announce_grob(tie_column_p_, SCM_EOL);
}
}
}
Tie_engraver::stop_translation_timestep ()
{
req_l_ = 0;
- for (int i=0; i < now_heads_.size (); i++)
- {
- past_notes_pq_.insert (now_heads_[i]);
- }
+
now_heads_.clear ();
/*
set_melisma (false);
}
- Moment now = now_mom ();
- while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
- past_notes_pq_.delmin ();
-
-
+ SCM grobs = get_property ("busyGrobs");
+ 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 ());
-
+
+ for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
+ {
+ Grob * grob = unsmob_grob (gh_cdar (grobs));
+ Moment end =*unsmob_moment (gh_caar (grobs));
+
+ /*
+ This is slightly ugh: we are now confunding the frontend
+ (iterators) and the backend (note heads) */
+ if (end > now)
+ break;
+ else if (end == now
+ && Note_head::has_interface (grob))
+ stopped_heads_.push (grob);
+ }
}