*/
-#include "event.hh"
#include "tie.hh"
#include "context.hh"
-
+#include "protected-scm.hh"
#include "spanner.hh"
#include "tie-column.hh"
#include "engraver.hh"
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*);
event_ = 0;
last_event_ = 0;
tie_column_ = 0;
+ tie_start_definition_ = SCM_EOL;
+}
+
+void
+Tie_engraver::derived_mark () const
+{
+ scm_gc_mark (tie_start_definition_);
}
Tie_engraver::process_music ()
{
if (event_)
- get_parent_context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+ {
+ context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+ }
}
void
maybe should check positions too.
*/
if (right_mus && left_mus
- && is_equal (right_mus->get_property ("pitch"),
+ && ly_c_equal_p (right_mus->get_property ("pitch"),
left_mus->get_property ("pitch")))
{
- Grob * p = make_spanner ("Tie");
+ 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);
- announce_grob (p, last_event_->self_scm ());
}
}
if (ties_.size () && ! tie_column_)
{
- tie_column_ = make_spanner ("TieColumn");
- announce_grob (tie_column_, SCM_EOL);
+ tie_column_ = make_spanner ("TieColumn", SCM_EOL);
+
}
if (tie_column_)
void
Tie_engraver::start_translation_timestep ()
{
- get_parent_context ()->set_property ("tieMelismaBusy",
+ 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++)
+ for (int i = 0; i< ties_.size (); i++)
{
typeset_tie (ties_[i]);
}
ties_.clear ();
last_event_ = 0;
- if (tie_column_)
- {
- typeset_grob (tie_column_);
- tie_column_ =0;
- }
+ tie_column_ = 0;
}
if (event_)
{
+ tie_start_definition_ = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
heads_to_tie_ = now_heads_;
last_event_ = event_;
}
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",