source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "tie-engraver.hh"
#include "command-request.hh"
#include "rhythmic-head.hh"
#include "musical-request.hh"
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
{
- bool done_;
PQueue<CHead_melodic_tuple> past_notes_pq_;
Moment end_mom_;
Moment next_end_mom_;
virtual void create_grobs ();
void typeset_tie (Grob*);
public:
- VIRTUAL_COPY_CONS(Translator);
- Tie_engraver();
+ VIRTUAL_COPY_CONS (Translator);
+ Tie_engraver ();
};
-Tie_engraver::Tie_engraver()
+Tie_engraver::Tie_engraver ()
{
req_l_ = 0;
tie_column_p_ = 0;
Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
if (!m)
return;
- now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom()+ m->length_mom ()));
+ now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom ()+ m->length_mom ()));
}
}
+
void
Tie_engraver::create_grobs ()
{
- if (req_l_ && !done_)
- {
- 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 ());
- done_ = true;
- return;
- }
-
if (req_l_)
{
now_heads_.sort (CHead_melodic_tuple::pitch_compare);
- stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
+ stopped_heads_.sort (CHead_melodic_tuple::pitch_compare);
SCM head_list = SCM_EOL;
int j = stopped_heads_.size ()-1;
int i = now_heads_.size ()-1;
- while (i >= 0 && j >=0)
+ while (i >= 0 && j >=0)
{
int comp
- = Pitch::compare (*unsmob_pitch (now_heads_[i].req_l_->get_mus_property ("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)
{
- (comp < 0) ? j -- : i--;
+ (comp < 0) ? j -- : i--;
continue;
}
else
if (!i)
return;
- SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
+ SCM pair = scm_list_ref (head_list, gh_int2scm (i/2));
Spanner * p = new Spanner (basic);
- 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::set_interface (p);
+ 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_);
}
- else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
+ else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s))
{
Grob * p = new Spanner (basic);
Tie::set_interface (p);
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--; )
+ 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);
}
}
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]);
void
Tie_engraver::typeset_tie (Grob *her)
{
- if (!(Tie::head (her,LEFT) && Tie::head (her,RIGHT)))
+ if (! (Tie::head (her,LEFT) && Tie::head (her,RIGHT)))
warning (_ ("lonely tie"));
Direction d = LEFT;
Drul_array<Grob *> new_head_drul;
- new_head_drul[LEFT] = Tie::head(her,LEFT);
+ new_head_drul[LEFT] = Tie::head (her,LEFT);
new_head_drul[RIGHT] = Tie::head (her,RIGHT);
do {
if (!Tie::head (her,d))
- new_head_drul[d] = Tie::head(her,(Direction)-d);
- } while (flip(&d) != LEFT);
+ new_head_drul[d] = Tie::head (her, (Direction)-d);
+ } while (flip (&d) != LEFT);
- 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 () );
+ 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_grob (her);
}
set_melisma (false);
}
req_l_ = 0;
- done_ = false;
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);
+ADD_THIS_TRANSLATOR (Tie_engraver);
CHead_melodic_tuple::CHead_melodic_tuple ()
end_ = mom;
}
+/*
+ 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::equal_p (p1,p2) == SCM_BOOL_T;
+ 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 ();
+ return Moment::compare(h1.end_, h2.end_);
}
projects / lilypond.git / blobdiff