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"
-
-struct CHead_melodic_tuple {
- Melodic_req *req_l_ ;
- Grob *head_l_;
- Moment end_;
- CHead_melodic_tuple ();
- 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 &);
-};
-
-inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b)
-{
- return CHead_melodic_tuple::time_compare (a,b);
-}
-
+#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<CHead_melodic_tuple> past_notes_pq_;
Moment end_mom_;
Moment next_end_mom_;
Tie_req *req_l_;
- Array<CHead_melodic_tuple> now_heads_;
- Array<CHead_melodic_tuple> stopped_heads_;
+ Link_array<Grob> now_heads_;
+ Link_array<Grob> stopped_heads_;
Link_array<Grob> tie_p_arr_;
Spanner * tie_column_p_;
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
virtual bool try_music (Music*);
- virtual void create_grobs ();
+ virtual void process_acknowledged_grobs ();
void typeset_tie (Grob*);
public:
TRANSLATOR_DECLARATIONS(Tie_engraver);
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.req_l_);
- if (!m)
- return;
- now_heads_.push (CHead_melodic_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 ()
+Tie_engraver::process_acknowledged_grobs ()
{
if (req_l_)
{
- now_heads_.sort (CHead_melodic_tuple::pitch_compare);
- stopped_heads_.sort (CHead_melodic_tuple::pitch_compare);
+ now_heads_.sort (&head_pitch_compare);
+ /*
+ We could sort stopped_heads_ as well (and use a linear alg. in
+ stead of nested loop), but we'd have to use a stable sorting
+ algorithm, since the ordering of the stopped heads (of the
+ same pitch) is relevant.
+ */
SCM head_list = SCM_EOL;
- int j = stopped_heads_.size ()-1;
- int i = now_heads_.size ()-1;
-
- while (i >= 0 && j >=0)
+ for (int i = now_heads_.size(); i--;)
{
- int comp
- = 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)
- {
- (comp < 0) ? j -- : i--;
- continue;
- }
- else
+ for (int j = stopped_heads_.size(); j--;)
{
- head_list = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm (),
- now_heads_[i].head_l_->self_scm ()),
- head_list);
-
- past_notes_pq_. insert (now_heads_[i]);
- now_heads_.del (i);
- stopped_heads_.del (j);
- i--;
- j--;
+ int comp
+ = head_pitch_compare (now_heads_[i], stopped_heads_[j]);
+
+ if (!comp)
+ {
+ head_list = gh_cons (gh_cons (stopped_heads_[j]->self_scm (),
+ now_heads_[i]->self_scm ()),
+ head_list);
+
+ now_heads_.del (i);
+ stopped_heads_.del (j);
+ break ;
+ }
}
}
-
+
SCM basic = get_property ("Tie");
SCM sparse = get_property ("sparseTies");
if (to_boolean (sparse))
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);
}
}
}
void
Tie_engraver::stop_translation_timestep ()
{
- for (int i=0; i < now_heads_.size (); i++)
- {
- past_notes_pq_.insert (now_heads_[i]);
- }
+ req_l_ = 0;
+
now_heads_.clear ();
/*
we don't warn for no ties, since this happens naturally when you
use skipTypesetting. */
-#if 0
- if (req_l_ && !tie_p_arr_.size ())
- {
- /* How to shut up this warning, when no notes appeared because
- they were suicided by Thread_devnull_engraver? */
- req_l_->origin ()->warning (_ ("No ties were created!"));
- }
-#endif
-
for (int i=0; i< tie_p_arr_.size (); i++)
{
typeset_tie (tie_p_arr_[i]);
{
set_melisma (false);
}
- req_l_ = 0;
- 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);
+ }
-}
+ /*
+
+ The list starts with entries that start earlier. By going through
+ it, we reverse the order, where as we'd like to use the `last'
+ heads first.
+ This makes a difference for grace notes. If we have
+ c4 \grace c8 ~ c4
-CHead_melodic_tuple::CHead_melodic_tuple ()
-{
- head_l_ =0;
- req_l_ =0;
- end_ = 0;
-}
+ Then busyGrobs will have ((1/4 . gc8) (1/4 . c4)).
-CHead_melodic_tuple::CHead_melodic_tuple (Grob *h, Melodic_req*m, Moment mom)
-{
- head_l_ = h;
- req_l_ = m;
- end_ = mom;
+ We want stopped_heads_ to contain (c4 gc8), because we start with
+ it at the top.
+ */
+ stopped_heads_.reverse();
}
-/*
- signed compare, should use pitch<?
- */
-int
-CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
- CHead_melodic_tuple const &h2)
-{
- 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)
-{
- return Moment::compare(h1.end_, h2.end_);
-}
ENTER_DESCRIPTION(Tie_engraver,
/* descr */ "Generate ties between noteheads of equal pitch.",
/* creats*/ "Tie TieColumn",
projects / lilypond.git / blobdiff