/*
- ctie-engraver.cc -- implement Tie_engraver
+ new-tie-engraver.cc -- implement Tie_engraver
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "tie-engraver.hh"
-#include "command-request.hh"
-#include "note-head.hh"
-#include "musical-request.hh"
+#include "event.hh"
#include "tie.hh"
#include "translator-group.hh"
+#include "spanner.hh"
#include "tie-column.hh"
-#include "pqueue.hh"
#include "engraver.hh"
-
-struct CHead_melodic_tuple {
- Melodic_req *req_l_ ;
- Note_head *head_l_;
- Moment end_;
- CHead_melodic_tuple ();
- CHead_melodic_tuple (Note_head*, 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 "item.hh"
+#include "grob-pitch-tuple.hh"
+#include "warn.hh"
+#include "note-head.hh"
+#include "staff-symbol-referencer.hh"
/**
Manufacture ties. Acknowledge noteheads, and put them into a
- priority queue. If we have a Tie_req, connect the notes that finish
+ priority queue. If we have a TieEvent, 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: Remove the dependency on musical info. We should tie on the
+ basis of position and duration-log of the heads (not of the events).
+
+ TODO: support sparseTies.
+
+ TODO: melismata will fuck up now:
+
+ < { c8 ~ c8 }
+ { c16 c c c } >
+
+ melisma is after the 2nd 8th note, but will now be signaled as
+ lasting till the 3rd 16th.
+*/
class Tie_engraver : public Engraver
{
- PQueue<CHead_melodic_tuple> past_notes_pq_;
- Tie_req *req_l_;
- Array<CHead_melodic_tuple> now_heads_;
- Array<CHead_melodic_tuple> stopped_heads_;
- Link_array<Tie> tie_p_arr_;
-
- Tie_column * tie_column_p_;
+ Music *event_;
+ Music *last_event_;
+ Link_array<Grob> now_heads_;
+ Link_array<Grob> heads_to_tie_;
+ Link_array<Grob> ties_;
+
+ Spanner * tie_column_;
- void set_melisma (bool);
protected:
- virtual void do_post_move_processing ();
- virtual void do_pre_move_processing ();
- virtual void acknowledge_element (Score_element_info);
- virtual bool do_try_music (Music*);
- virtual void do_process_requests ();
- virtual void process_acknowledged ();
-
+ virtual void stop_translation_timestep ();
+ virtual void start_translation_timestep ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual bool try_music (Music*);
+ virtual void process_acknowledged_grobs ();
+ void typeset_tie (Grob*);
public:
- VIRTUAL_COPY_CONS(Translator);
- Tie_engraver();
+ TRANSLATOR_DECLARATIONS(Tie_engraver);
};
-Tie_engraver::Tie_engraver()
+Tie_engraver::Tie_engraver ()
{
- req_l_ = 0;
- tie_column_p_ = 0;
+ event_ = 0;
+ last_event_ = 0;
+ tie_column_ = 0;
}
bool
-Tie_engraver::do_try_music (Music *m)
+Tie_engraver::try_music (Music *mus)
{
- if (Tie_req * c = dynamic_cast<Tie_req*> (m))
+ if (mus->is_mus_type ("tie-event"))
{
- req_l_ = c;
- SCM m = get_property ("automaticMelismata");
- bool am = gh_boolean_p (m) &&gh_scm2bool (m);
- if (am)
- {
- set_melisma (true);
- }
- return true;
+ event_ = mus;
}
- return false;
+
+ return true;
}
void
-Tie_engraver::set_melisma (bool m)
+Tie_engraver::acknowledge_grob (Grob_info i)
{
- daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
+ if (Note_head::has_interface (i.grob_))
+ {
+ Grob * h = i.grob_;
+ now_heads_.push (h);
+ for (int i = heads_to_tie_.size (); i--;)
+ {
+ Grob *th = heads_to_tie_[i];
+ Music * right_mus = unsmob_music (h->get_grob_property ("cause"));
+ Music * left_mus = unsmob_music (th->get_grob_property ("cause"));
+
+ /*
+ maybe should check positions too.
+ */
+ if (right_mus && left_mus
+ && gh_equal_p (right_mus->get_mus_property ("pitch"),
+ left_mus->get_mus_property ("pitch")))
+ {
+ Grob * p = new Spanner (get_property ("Tie"));
+ Tie::set_interface (p); // cannot remove yet!
+
+ Tie::set_head (p, LEFT, th);
+ Tie::set_head (p, RIGHT, h);
+
+ ties_.push (p);
+ announce_grob(p, last_event_->self_scm());
+ }
+ }
+ }
}
void
-Tie_engraver::acknowledge_element (Score_element_info i)
+Tie_engraver::process_acknowledged_grobs ()
{
- if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
+ if (ties_.size () > 1 && !tie_column_)
{
- 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 ()));
+ 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::do_process_requests ()
+Tie_engraver::start_translation_timestep ()
{
- if (req_l_)
- {
- Moment now = now_mom ();
- Link_array<Note_head> nharr;
+ if (to_boolean (get_property ("automaticMelismata")))
+ daddy_trans_->set_property ("tieMelismaBusy",
+ gh_bool2scm (heads_to_tie_.size ()));
- stopped_heads_.clear ();
- while (past_notes_pq_.size ()
- && past_notes_pq_.front ().end_ == now)
- stopped_heads_.push (past_notes_pq_.get ());
- }
}
void
-Tie_engraver::process_acknowledged ()
+Tie_engraver::stop_translation_timestep ()
{
- if (req_l_)
+ if (ties_.size ())
{
- now_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)
+ heads_to_tie_.clear ();
+ for (int i=0; i< ties_.size (); i++)
{
- int comp
- = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
- stopped_heads_[j].req_l_->pitch_);
-
- if (comp)
- {
- (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);
-
- past_notes_pq_. insert (now_heads_[i]);
- now_heads_.del (i);
- stopped_heads_.del (j);
- i--;
- j--;
- }
+ typeset_tie (ties_[i]);
}
-
- SCM sparse = get_property ("sparseTies");
- if (to_boolean (sparse))
- {
- int i = scm_ilength (head_list);
-
- if (!i)
- return;
-
- 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_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))
+ ties_.clear();
+ last_event_ = 0;
+ if (tie_column_)
{
- 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_arr_.push (p);
- announce_element (Score_element_info (p, req_l_));
- }
-
- if (!tie_p_arr_.size ())
- {
- req_l_->warning (_ ("No ties were created!"));
- }
- else if (tie_p_arr_.size () > 1 && !tie_column_p_)
- {
- tie_column_p_ = new Tie_column;
- for (int i = tie_p_arr_.size (); i--; )
- tie_column_p_->add_tie (tie_p_arr_ [i]);
- announce_element (Score_element_info (tie_column_p_, 0));
+ typeset_grob (tie_column_);
+ tie_column_ =0;
}
}
-}
-
-
-void
-Tie_engraver::do_pre_move_processing ()
-{
- for (int i=0; i < now_heads_.size (); i++)
+
+ if (event_)
{
- past_notes_pq_.insert (now_heads_[i]);
+ heads_to_tie_ = now_heads_;
+ last_event_ = event_;
}
+ event_ = 0;
now_heads_.clear ();
-
- for (int i=0; i< tie_p_arr_.size (); i++)
- {
- typeset_element (tie_p_arr_[i]);
- }
- tie_p_arr_.clear ();
- if (tie_column_p_)
- {
- typeset_element (tie_column_p_);
- tie_column_p_ =0;
- }
}
void
-Tie_engraver::do_post_move_processing ()
+Tie_engraver::typeset_tie (Grob *her)
{
- SCM m = get_property ("automaticMelismata");
- if (to_boolean (m))
- {
- 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 ();
+ 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[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_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);
}
-ADD_THIS_TRANSLATOR(Tie_engraver);
-
-CHead_melodic_tuple::CHead_melodic_tuple ()
-{
- head_l_ =0;
- req_l_ =0;
- end_ = 0;
-}
-
-CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
-{
- head_l_ = h;
- req_l_ = m;
- end_ = mom;
-}
-
-int
-CHead_melodic_tuple::pitch_compare (CHead_melodic_tuple const&h1,
- CHead_melodic_tuple const &h2)
-{
- return Melodic_req::compare (*h1.req_l_, *h2.req_l_);
-}
-
-int
-CHead_melodic_tuple::time_compare (CHead_melodic_tuple const&h1,
- CHead_melodic_tuple const &h2)
-{
- return (h1.end_ - h2.end_ ).sign ();
-}
+ENTER_DESCRIPTION(Tie_engraver,
+/* descr */ "Generate ties between noteheads of equal pitch.",
+/* creats*/ "Tie TieColumn",
+/* accepts */ "tie-event",
+/* acks */ "rhythmic-head-interface",
+/* reads */ "tieMelismaBusy",
+/* write */ "");
projects / lilypond.git / blobdiff