/*
- ctie-engraver.cc -- implement Tie_engraver
+ new-tie-engraver.cc -- implement Tie_engraver
source file of the GNU LilyPond music typesetter
- (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "tie-engraver.hh"
-#include "command-request.hh"
-#include "note-head.hh"
-#include "musical-request.hh"
#include "tie.hh"
+#include "context.hh"
+#include "protected-scm.hh"
+#include "spanner.hh"
+#include "tie-column.hh"
+#include "engraver.hh"
+#include "item.hh"
+#include "grob-pitch-tuple.hh"
+#include "warn.hh"
+#include "note-head.hh"
+#include "staff-symbol-referencer.hh"
-Tie_engraver::Tie_engraver()
+/**
+ Manufacture ties. Acknowledge noteheads, and put them into a
+ priority queue. If we have a TieEvent, connect the notes that finish
+ just at this time, and note that start at this time.
+
+ 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).
+*/
+class Tie_engraver : public Engraver
{
- req_l_ = 0;
-}
+ Music *event_;
+ Music *last_event_;
+ Link_array<Grob> now_heads_;
+ Link_array<Grob> heads_to_tie_;
+ Link_array<Grob> ties_;
+ SCM tie_start_definition_;
+
+ Spanner * tie_column_;
+
+protected:
+ virtual void stop_translation_timestep ();
+ virtual void derived_mark () const;
+ virtual void start_translation_timestep ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual bool try_music (Music*);
+ virtual void process_music ();
+ void typeset_tie (Grob*);
+public:
+ TRANSLATOR_DECLARATIONS (Tie_engraver);
+};
-bool
-Tie_engraver::do_try_music (Music *m)
+
+Tie_engraver::Tie_engraver ()
{
- if (Tie_req * c = dynamic_cast<Tie_req*> (m))
- {
- req_l_ = c;
- return true;
- }
- return false;
+ event_ = 0;
+ last_event_ = 0;
+ tie_column_ = 0;
+ tie_start_definition_ = SCM_EOL;
}
void
-Tie_engraver::acknowledge_element (Score_element_info i)
+Tie_engraver::derived_mark () const
+{
+ scm_gc_mark (tie_start_definition_);
+}
+
+
+bool
+Tie_engraver::try_music (Music *mus)
{
- if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
+ if (mus->is_mus_type ("tie-event"))
{
- 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 ()));
+ event_ = mus;
}
+
+ return true;
}
void
-Tie_engraver::do_process_requests ()
+Tie_engraver::process_music ()
{
- if (req_l_)
+ if (event_)
{
- Moment now = now_mom ();
- Link_array<Note_head> nharr;
-
- stopped_heads_.clear ();
- while (past_notes_pq_.size ()
- && past_notes_pq_.front ().end_ == now)
- stopped_heads_.push (past_notes_pq_.get ());
+ context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
}
}
void
-Tie_engraver::process_acknowledged ()
+Tie_engraver::acknowledge_grob (Grob_info i)
{
- bool old_behavior = get_property ("oldTieBehavior", 0).to_bool ();
-
- if (req_l_)
+ if (Note_head::has_interface (i.grob_))
{
-
- /*
- JUNKME!
- */
- if (old_behavior)
+ Grob * h = i.grob_;
+ now_heads_.push (h);
+ for (int i = heads_to_tie_.size (); i--;)
{
- if (now_heads_.size () != stopped_heads_.size ())
- {
- req_l_->warning ("Unequal number of note heads for tie");
- }
- int sz = now_heads_.size () <? stopped_heads_.size ();
-
- /* hmm. Should do something more sensible.
- because, we assume no more noteheads come along after the 1st pass.
- */
- if (sz <= tie_p_arr_.size ())
- return;
-
- now_heads_.sort (CHead_melodic_tuple::pitch_compare);
- stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
-
- for (int i=0; i < sz; i++)
+ Grob *th = heads_to_tie_[i];
+ Music * right_mus = unsmob_music (h->get_property ("cause"));
+ Music * left_mus = unsmob_music (th->get_property ("cause"));
+
+ /*
+ maybe should check positions too.
+ */
+ if (right_mus && left_mus
+ && ly_c_equal_p (right_mus->get_property ("pitch"),
+ left_mus->get_property ("pitch")))
{
- Tie * p = new Tie;
- p->set_head (LEFT, stopped_heads_[i].head_l_);
- p->set_head (RIGHT, now_heads_[i].head_l_);
- tie_p_arr_.push (p);
- announce_element (Score_element_info (p, req_l_));
+ Grob * p = new Spanner (tie_start_definition_, context()->get_grob_key ("Tie"));
+ announce_grob (p, last_event_->self_scm ());
+ Tie::set_interface (p); // cannot remove yet!
+
+ Tie::set_head (p, LEFT, th);
+ Tie::set_head (p, RIGHT, h);
+
+ ties_.push (p);
}
}
- else
- {
- now_heads_.sort (CHead_melodic_tuple::pitch_compare);
- stopped_heads_.sort(CHead_melodic_tuple::pitch_compare);
- int i=0;
- int j=0;
- int tie_count=0;
- while ( i < now_heads_.size () && j < stopped_heads_.size ())
- {
- int comp
- = Musical_pitch::compare (now_heads_[i].req_l_->pitch_ ,
- stopped_heads_[j].req_l_->pitch_);
-
- if (comp)
- {
- (comp < 0) ? i ++ : j++;
- continue;
- }
- else
- {
- tie_count ++;
-
- /* don't go around recreating ties that were already
- made. Not infallible. Due to reordering in sort (),
- we will make the wrong ties when noteheads are
- added. */
- if (tie_count > tie_p_arr_.size ())
- {
- Tie * p = new Tie;
- p->set_head (LEFT, stopped_heads_[j].head_l_);
- p->set_head (RIGHT, now_heads_[i].head_l_);
- tie_p_arr_.push (p);
- announce_element (Score_element_info (p, req_l_));
- }
- i++;
- j++;
-
- }
- }
- if (!tie_p_arr_.size ())
- {
- req_l_->warning (_("No ties were created!"));
- }
+ if (ties_.size () && ! tie_column_)
+ {
+ tie_column_ = make_spanner ("TieColumn", SCM_EOL);
}
+
+ if (tie_column_)
+ for (int i = ties_.size (); i--;)
+ Tie_column::add_tie (tie_column_,ties_ [i]);
}
}
void
-Tie_engraver::do_pre_move_processing ()
+Tie_engraver::start_translation_timestep ()
{
- for (int i=0; i < now_heads_.size (); i++)
- {
- past_notes_pq_.insert (now_heads_[i]);
- }
- now_heads_.clear ();
+ context ()->set_property ("tieMelismaBusy",
+ ly_bool2scm (heads_to_tie_.size ()));
+
+}
- Scalar dir (get_property ("tieVerticalDirection", 0));
- Scalar dir2 (get_property ("verticalDirection", 0));
+void
+Tie_engraver::stop_translation_timestep ()
+{
+ if (ties_.size ())
+ {
+ heads_to_tie_.clear ();
+ for (int i=0; i< ties_.size (); i++)
+ {
+ typeset_tie (ties_[i]);
+ }
- Direction tie_dir = CENTER;
- if (dir.length_i () && dir.isnum_b ())
- tie_dir = (Direction) sign (int(dir));
- else if (dir2.length_i () && dir2.isnum_b ())
- tie_dir = (Direction) sign (int (dir2));
+ ties_.clear ();
+ last_event_ = 0;
+ tie_column_ =0;
+ }
- for (int i=0; i< tie_p_arr_.size (); i++)
- {
- tie_p_arr_[i]->dir_ = tie_dir;
- typeset_element (tie_p_arr_[i]);
+ if (event_)
+ {
+ tie_start_definition_ = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
+ heads_to_tie_ = now_heads_;
+ last_event_ = event_;
}
- tie_p_arr_.clear ();
+ event_ = 0;
+ now_heads_.clear ();
}
void
-Tie_engraver::do_post_move_processing ()
+Tie_engraver::typeset_tie (Grob *her)
{
- 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"));
-ADD_THIS_TRANSLATOR(Tie_engraver);
+ 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_property ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ());
+ index_set_cell (her->get_property ("head-pair"), RIGHT, new_head_drul[RIGHT]->self_scm ());
-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