#include "engraver.hh"
#include "item.hh"
#include "grob-pitch-tuple.hh"
+#include "warn.hh"
#include "note-head.hh"
/**
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).
-
- TODO: figure this out: currently, this engravers ties note heads
- that have the same Y-position (and does not look at pitch). This
- means that we will fuck up with a clef-change. How should
- clef-changes during ties be handled, or should they not?
-
-
*/
class Tie_engraver : public Engraver
{
Moment end_mom_;
Moment next_end_mom_;
- Tie_req *req_l_;
+ Tie_req *req_;
Link_array<Grob> now_heads_;
Link_array<Grob> stopped_heads_;
- Link_array<Grob> tie_p_arr_;
+ Link_array<Grob> ties_;
- Spanner * tie_column_p_;
+ Spanner * tie_column_;
void set_melisma (bool);
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);
Tie_engraver::Tie_engraver ()
{
- req_l_ = 0;
- tie_column_p_ = 0;
+ req_ = 0;
+ tie_column_ = 0;
}
/* if (end_mom_ > now_mom ())
return false;
*/
- req_l_ = c;
+ req_ = c;
SCM m = get_property ("automaticMelismata");
bool am = gh_boolean_p (m) &&gh_scm2bool (m);
if (am)
void
Tie_engraver::set_melisma (bool m)
{
- daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
+ daddy_trans_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
}
void
Tie_engraver::acknowledge_grob (Grob_info i)
{
- if (Note_head::has_interface (i.grob_l_))
+ if (Note_head::has_interface (i.grob_))
{
- now_heads_.push (i.grob_l_);
+ now_heads_.push (i.grob_);
}
}
int
-head_position_compare (Grob *const&a,Grob *const&b)
+head_pitch_compare (Grob *const&a,Grob *const&b)
{
- return sign (gh_scm2double (a->get_grob_property ("staff-position"))
- - gh_scm2double (b->get_grob_property ("staff-position")));
+ 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_)
+ if (req_)
{
- now_heads_.sort (&head_position_compare);
- stopped_heads_.sort (&head_position_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
- = head_position_compare (now_heads_[i], stopped_heads_[j]);
-
- if (comp)
- {
- (comp < 0) ? j -- : i--;
- continue;
- }
- else
+ for (int j = stopped_heads_.size(); j--;)
{
- 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);
- 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_);
+ ties_.push (p);
+ announce_grob(p, req_->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_);
+ ties_.push (p);
+ announce_grob(p, req_->self_scm());
}
- if (tie_p_arr_.size () > 1 && !tie_column_p_)
+ if (ties_.size () > 1 && !tie_column_)
{
- 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);
+ tie_column_ = new Spanner (get_property ("TieColumn"));
+
+ for (int i = ties_.size (); i--;)
+ Tie_column::add_tie (tie_column_,ties_ [i]);
+ announce_grob(tie_column_, SCM_EOL);
}
}
}
void
Tie_engraver::stop_translation_timestep ()
{
- req_l_ = 0;
+ req_ = 0;
now_heads_.clear ();
we don't warn for no ties, since this happens naturally when you
use skipTypesetting. */
- for (int i=0; i< tie_p_arr_.size (); i++)
+ for (int i=0; i< ties_.size (); i++)
{
- typeset_tie (tie_p_arr_[i]);
+ typeset_tie (ties_[i]);
}
- tie_p_arr_.clear ();
- if (tie_column_p_)
+ ties_.clear ();
+ if (tie_column_)
{
- typeset_grob (tie_column_p_);
- tie_column_p_ =0;
+ typeset_grob (tie_column_);
+ tie_column_ =0;
}
}
&& 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
+
+ Then busyGrobs will have ((1/4 . gc8) (1/4 . c4)).
+
+ We want stopped_heads_ to contain (c4 gc8), because we start with
+ it at the top.
+ */
+ stopped_heads_.reverse();
}
projects / lilypond.git / blobdiff