#include "tie-engraver.hh"
#include "command-request.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
#include "musical-request.hh"
#include "tie.hh"
#include "translator-group.hh"
#include "tie-column.hh"
#include "pqueue.hh"
#include "engraver.hh"
+#include "item.hh"
struct CHead_melodic_tuple {
Melodic_req *req_l_ ;
- Note_head *head_l_;
+ Score_element *head_l_;
Moment end_;
CHead_melodic_tuple ();
- CHead_melodic_tuple (Note_head*, Melodic_req*, Moment);
+ CHead_melodic_tuple (Score_element*, 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: should share code with Beam_engraver, Extender_engraver?
+ TODO: junk the pq.
*/
class Tie_engraver : public Engraver
{
virtual bool do_try_music (Music*);
virtual void do_process_music ();
virtual void process_acknowledged ();
-
+ void typeset_tie (Score_element*);
public:
VIRTUAL_COPY_CONS(Translator);
Tie_engraver();
void
Tie_engraver::acknowledge_element (Score_element_info i)
{
- if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
+ if (Rhythmic_head::has_interface (i.elem_l_))
{
Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
if (!m)
return;
- now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
+ now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom()+ m->length_mom ()));
}
}
}
}
-
+ SCM basic = get_property ("basicTieProperties");
SCM sparse = get_property ("sparseTies");
if (to_boolean (sparse))
{
SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
- Tie * p = new Tie;
- p->set_head (LEFT, dynamic_cast<Item*> (unsmob_element (gh_car (pair))));
- p->set_head (RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdr (pair))));
+ Tie * p = new Tie (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_p_arr_.push (p);
announce_element (Score_element_info (p, req_l_));
}
else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
{
- Tie * p = new Tie;
- p->set_head (LEFT, dynamic_cast<Item*> (unsmob_element (gh_caar (s))));
- p->set_head (RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdar (s))));
+ Tie * p = new Tie (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_p_arr_.push (p);
announce_element (Score_element_info (p, req_l_));
}
else if (tie_p_arr_.size () > 1 && !tie_column_p_)
{
- tie_column_p_ = new Tie_column;
+ tie_column_p_ = new Tie_column (get_property ("basicTieColumnProperties"));
+ Tie_column::set_interface (tie_column_p_);
for (int i = tie_p_arr_.size (); i--; )
- tie_column_p_->add_tie (tie_p_arr_ [i]);
+ Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
announce_element (Score_element_info (tie_column_p_, 0));
}
}
for (int i=0; i< tie_p_arr_.size (); i++)
{
- typeset_element (tie_p_arr_[i]);
+ typeset_tie (tie_p_arr_[i]);
}
tie_p_arr_.clear ();
if (tie_column_p_)
}
}
+void
+Tie_engraver::typeset_tie (Score_element *her)
+{
+ if (!(Tie::head (her,LEFT) && Tie::head (her,RIGHT)))
+ warning (_ ("lonely tie"));
+
+ Direction d = LEFT;
+ Drul_array<Score_element *> new_head_drul;
+ 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);
+
+ 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_ );
+
+ typeset_element (her);
+}
+
void
Tie_engraver::do_post_move_processing ()
{
end_ = 0;
}
-CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
+CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom)
{
head_l_ = h;
req_l_ = m;