-/*
- tie-engraver.cc -- implement Tie_engraver
-
+/*
+ tie-engraver.cc -- implement Tie_engraver
+
source file of the GNU LilyPond music typesetter
-
- (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "command-request.hh"
-#include "musical-request.hh"
-#include "tie.hh"
-#include "translator-group.hh"
-#include "spanner.hh"
-#include "tie-column.hh"
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
#include "engraver.hh"
-#include "item.hh"
+
+#include "context.hh"
#include "grob-pitch-tuple.hh"
-#include "warn.hh"
+#include "international.hh"
+#include "item.hh"
#include "note-head.hh"
+#include "protected-scm.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "tie-column.hh"
+#include "tie.hh"
+#include "warn.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: Remove the dependency on musical info. We should tie on the
- basis of position and duration-log of the heads (not of the reqs).
-
+ basis of position and duration-log of the heads (not of the events).
*/
+
+struct Head_event_tuple
+{
+ Grob *head_;
+ SCM tie_definition_;
+ Music *event_;
+ Head_event_tuple ()
+ {
+ }
+ Head_event_tuple (Grob *h, Music *m, SCM def)
+ {
+ head_ = h;
+ event_ = m;
+ tie_definition_ = def;
+ }
+};
+
class Tie_engraver : public Engraver
{
- Moment end_mom_;
- Moment next_end_mom_;
-
- Tie_req *req_l_;
- Link_array<Grob> now_heads_;
- Link_array<Grob> stopped_heads_;
- Link_array<Grob> tie_p_arr_;
-
- Spanner * tie_column_p_;
-
- void set_melisma (bool);
-
+ Music *event_;
+ vector<Grob*> now_heads_;
+ vector<Head_event_tuple> heads_to_tie_;
+ vector<Grob*> ties_;
+
+ Spanner *tie_column_;
+
protected:
- virtual void start_translation_timestep ();
- virtual void stop_translation_timestep ();
- virtual void acknowledge_grob (Grob_info);
- virtual bool try_music (Music*);
- virtual void create_grobs ();
- void typeset_tie (Grob*);
+ void stop_translation_timestep ();
+ virtual void derived_mark () const;
+ void start_translation_timestep ();
+ DECLARE_ACKNOWLEDGER (note_head);
+ virtual bool try_music (Music *);
+ void process_music ();
+ void typeset_tie (Grob *);
public:
- TRANSLATOR_DECLARATIONS(Tie_engraver);
+ TRANSLATOR_DECLARATIONS (Tie_engraver);
};
-
+void
+Tie_engraver::derived_mark () const
+{
+ Engraver::derived_mark ();
+ for (vsize i = 0; i < heads_to_tie_.size (); i++)
+ scm_gc_mark (heads_to_tie_[i].tie_definition_);
+}
Tie_engraver::Tie_engraver ()
{
- req_l_ = 0;
- tie_column_p_ = 0;
+ event_ = 0;
+ tie_column_ = 0;
}
-
bool
-Tie_engraver::try_music (Music *m)
+Tie_engraver::try_music (Music *mus)
{
- if (Tie_req * c = dynamic_cast<Tie_req*> (m))
- {
- /* if (end_mom_ > now_mom ())
- return false;
- */
- req_l_ = c;
- SCM m = get_property ("automaticMelismata");
- bool am = gh_boolean_p (m) &&gh_scm2bool (m);
- if (am)
- {
- set_melisma (true);
- }
- return true;
- }
- return false;
+ if (mus->is_mus_type ("tie-event"))
+ event_ = mus;
+
+ return true;
}
void
-Tie_engraver::set_melisma (bool m)
+Tie_engraver::process_music ()
{
- daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
+ if (event_)
+ context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
}
void
-Tie_engraver::acknowledge_grob (Grob_info i)
+Tie_engraver::acknowledge_note_head (Grob_info i)
{
- if (Note_head::has_interface (i.grob_l_))
+ Grob *h = i.grob ();
+ now_heads_.push_back (h);
+ for (vsize i = heads_to_tie_.size (); i--;)
{
- now_heads_.push (i.grob_l_);
+ Grob *th = heads_to_tie_[i].head_;
+ 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_is_equal (right_mus->get_property ("pitch"),
+ left_mus->get_property ("pitch")))
+ {
+ Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
+ context ()->get_grob_key ("Tie"));
+ announce_grob (p, heads_to_tie_[i].event_->self_scm ());
+ Tie::set_head (p, LEFT, th);
+ Tie::set_head (p, RIGHT, h);
+
+ ties_.push_back (p);
+ heads_to_tie_.erase (heads_to_tie_.begin () + i);
+ }
}
+
+ if (ties_.size () && ! tie_column_)
+ tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ());
+
+ if (tie_column_)
+ for (vsize i = ties_.size (); i--;)
+ Tie_column::add_tie (tie_column_, ties_[i]);
}
-int
-head_pitch_compare (Grob *const&a,Grob *const&b)
+void
+Tie_engraver::start_translation_timestep ()
{
- 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")));
+ context ()->set_property ("tieMelismaBusy",
+ ly_bool2scm (heads_to_tie_.size ()));
}
void
-Tie_engraver::create_grobs ()
+Tie_engraver::stop_translation_timestep ()
{
- if (req_l_)
+ if (ties_.size ())
{
- now_heads_.sort (&head_pitch_compare);
- stopped_heads_.sort (&head_pitch_compare);
+ if (!to_boolean (get_property ("tieWaitForNote")))
+ heads_to_tie_.clear ();
- SCM head_list = SCM_EOL;
-
- int j = stopped_heads_.size ()-1;
- int i = now_heads_.size ()-1;
+ for (vsize i = 0; i < ties_.size (); i++)
+ typeset_tie (ties_[i]);
- while (i >= 0 && j >=0)
- {
- int comp
- = head_pitch_compare (now_heads_[i], stopped_heads_[j]);
-
- if (comp)
- {
- (comp < 0) ? j -- : i--;
- continue;
- }
- else
- {
- 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--;
- }
- }
+ ties_.clear ();
+ tie_column_ = 0;
+ }
- SCM basic = get_property ("Tie");
- SCM sparse = get_property ("sparseTies");
- if (to_boolean (sparse))
- {
- int i = scm_ilength (head_list);
-
- if (!i)
- return;
-
- SCM pair = scm_list_ref (head_list, gh_int2scm (i/2));
-
- Spanner * p = new Spanner (basic);
-
- 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_->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); // 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_->self_scm());
- }
+ if (event_)
+ {
+ SCM start_definition
+ = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
- if (tie_p_arr_.size () > 1 && !tie_column_p_)
- {
- tie_column_p_ = new Spanner (get_property ("TieColumn"));
+ if (!to_boolean (get_property ("tieWaitForNote")))
+ heads_to_tie_.clear ();
- for (int i = tie_p_arr_.size (); i--;)
- Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
- announce_grob(tie_column_p_, SCM_EOL);
+ for (vsize i = 0; i < now_heads_.size (); i++)
+ {
+ heads_to_tie_.push_back (Head_event_tuple (now_heads_[i], event_,
+ start_definition));
}
}
-}
-
-
-void
-Tie_engraver::stop_translation_timestep ()
-{
- req_l_ = 0;
+ event_ = 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++)
- {
- typeset_tie (tie_p_arr_[i]);
- }
- tie_p_arr_.clear ();
- if (tie_column_p_)
- {
- typeset_grob (tie_column_p_);
- tie_column_p_ =0;
- }
}
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[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);
-}
-
-void
-Tie_engraver::start_translation_timestep ()
-{
- SCM m = get_property ("automaticMelismata");
- if (to_boolean (m))
+ new_head_drul[LEFT] = Tie::head (her, LEFT);
+ new_head_drul[RIGHT] = Tie::head (her, RIGHT);
+ do
{
- set_melisma (false);
+ if (!Tie::head (her, d))
+ new_head_drul[d] = Tie::head (her, (Direction) - d);
}
+ while (flip (&d) != LEFT);
- SCM grobs = get_property ("busyGrobs");
- Moment now = now_mom();
- stopped_heads_.clear ();
-
- for (; gh_pair_p (grobs); grobs = gh_cdr (grobs))
- {
- Grob * grob = unsmob_grob (gh_cdar (grobs));
- Moment end =*unsmob_moment (gh_caar (grobs));
-
- /*
- This is slightly ugh: we are now confunding the frontend
- (iterators) and the backend (note heads) */
- if (end > now)
- break;
- else if (end == now
- && Note_head::has_interface (grob))
- stopped_heads_.push (grob);
- }
+ Spanner *sp = dynamic_cast<Spanner*> (her);
+ sp->set_bound (LEFT, new_head_drul[LEFT]);
+ sp->set_bound (RIGHT, new_head_drul[RIGHT]);
}
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Tie_engraver, note_head);
+ADD_TRANSLATOR (Tie_engraver,
+ /* doc */ "Generate ties between noteheads of equal pitch.",
+ /* create */
+ "Tie "
+ "TieColumn",
-ENTER_DESCRIPTION(Tie_engraver,
-/* descr */ "Generate ties between noteheads of equal pitch.",
-/* creats*/ "Tie TieColumn",
-/* acks */ "rhythmic-head-interface",
-/* reads */ "sparseTies tieMelismaBusy",
-/* write */ "");
+ /* accept */ "tie-event",
+ /* read */ "tieWaitForNote",
+ /* write */ "tieMelismaBusy");
projects / lilypond.git / blobdiff