/*
- new-tie-engraver.cc -- implement Tie_engraver
+ tie-engraver.cc -- implement Tie_engraver
source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "event.hh"
#include "tie.hh"
-#include "translator-group.hh"
+#include "context.hh"
+#include "protected-scm.hh"
#include "spanner.hh"
#include "tie-column.hh"
#include "engraver.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 events).
+*/
- TODO: support sparseTies.
-
- TODO: melismata will fuck up now:
-
- < { c8 ~ c8 }
- { c16 c c c } >
+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;
+ }
+};
- melisma is after the 2nd 8th note, but will now be signaled as
- lasting till the 3rd 16th.
-*/
class Tie_engraver : public Engraver
{
Music *event_;
- Music *last_event_;
Link_array<Grob> now_heads_;
- Link_array<Grob> heads_to_tie_;
+ Array<Head_event_tuple> heads_to_tie_;
Link_array<Grob> ties_;
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 ();
- virtual void process_acknowledged_grobs ();
void typeset_tie (Grob*);
public:
- TRANSLATOR_DECLARATIONS(Tie_engraver);
+ TRANSLATOR_DECLARATIONS (Tie_engraver);
};
+void
+Tie_engraver::derived_mark () const
+{
+ Engraver::derived_mark ();
+ for (int i = 0; i < heads_to_tie_.size(); i++)
+ scm_gc_mark (heads_to_tie_[i].tie_definition_);
+}
Tie_engraver::Tie_engraver ()
{
event_ = 0;
- last_event_ = 0;
tie_column_ = 0;
}
void
Tie_engraver::process_music ()
{
- if (event_ && to_boolean (get_property ("automaticMelismata")))
- daddy_trans_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+ if (event_)
+ {
+ context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+ }
}
void
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"));
+ 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
- && gh_equal_p (right_mus->get_mus_property ("pitch"),
- left_mus->get_mus_property ("pitch")))
+ && ly_c_equal_p (right_mus->get_property ("pitch"),
+ left_mus->get_property ("pitch")))
{
- Grob * p = new Spanner (get_property ("Tie"));
+ 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_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());
+ heads_to_tie_.del (i);
}
}
- }
-}
-void
-Tie_engraver::process_acknowledged_grobs ()
-{
- if (ties_.size () > 1 && !tie_column_)
- {
- tie_column_ = new Spanner (get_property ("TieColumn"));
-
- for (int i = ties_.size (); i--;)
- Tie_column::add_tie (tie_column_,ties_ [i]);
+ if (ties_.size () && ! tie_column_)
+ {
+ tie_column_ = make_spanner ("TieColumn", ties_[0]->self_scm ());
+ }
- announce_grob(tie_column_, SCM_EOL);
+ if (tie_column_)
+ for (int i = ties_.size (); i--;)
+ Tie_column::add_tie (tie_column_, ties_[i]);
}
}
void
Tie_engraver::start_translation_timestep ()
{
- if (to_boolean (get_property ("automaticMelismata")))
- daddy_trans_->set_property ("tieMelismaBusy",
- gh_bool2scm (heads_to_tie_.size ()));
+ context ()->set_property ("tieMelismaBusy",
+ ly_bool2scm (heads_to_tie_.size ()));
}
{
if (ties_.size ())
{
- heads_to_tie_.clear ();
- for (int i=0; i< ties_.size (); i++)
+ if (!to_boolean (get_property ("tieWaitForNote")))
{
- typeset_tie (ties_[i]);
+ heads_to_tie_.clear ();
}
-
- ties_.clear();
- last_event_ = 0;
- if (tie_column_)
+
+ for (int i = 0; i< ties_.size (); i++)
{
- typeset_grob (tie_column_);
- tie_column_ =0;
+ typeset_tie (ties_[i]);
}
+
+ ties_.clear ();
+ tie_column_ = 0;
}
if (event_)
{
- heads_to_tie_ = now_heads_;
- last_event_ = event_;
+ SCM start_definition
+ = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
+
+ if (!to_boolean (get_property ("tieWaitForNote")))
+ heads_to_tie_.clear();
+
+ for (int i = 0; i < now_heads_.size(); i++)
+ {
+ heads_to_tie_.push (Head_event_tuple (now_heads_[i], event_,
+ start_definition
+ ));
+ }
}
+
event_ = 0;
now_heads_.clear ();
}
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);
+ new_head_drul[LEFT] = Tie::head (her, LEFT);
+ new_head_drul[RIGHT] = Tie::head (her, RIGHT);
do {
- if (!Tie::head (her,d))
+ 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 ());
+ 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 ());
- typeset_grob (her);
}
-ENTER_DESCRIPTION(Tie_engraver,
+ADD_TRANSLATOR (Tie_engraver,
/* descr */ "Generate ties between noteheads of equal pitch.",
/* creats*/ "Tie TieColumn",
/* accepts */ "tie-event",