if (!sp->get_bound (RIGHT))
{
SCM heads = sp->get_property ("heads");
- if (is_pair (heads))
+ if (ly_c_pair_p (heads))
{
Item* it = dynamic_cast<Item*> (unsmob_grob (ly_car (heads)));
if (it)
hyphen_->suicide ();
}
- typeset_grob (hyphen_);
hyphen_ = 0;
}
finished_hyphen_->warning (_("unterminated hyphen; removing"));
finished_hyphen_->suicide ();
}
- typeset_grob (finished_hyphen_);
finished_hyphen_ =0;
}
}
{
if (ev_)
{
- hyphen_ = make_spanner ("LyricHyphen");
- announce_grob (hyphen_, ev_->self_scm ());
+ hyphen_ = make_spanner ("LyricHyphen", ev_->self_scm ()
+);
}
}
{
if (finished_hyphen_ && finished_hyphen_->get_bound (RIGHT))
{
- typeset_grob (finished_hyphen_);
finished_hyphen_ = 0;
}
if (finished_hyphen_ && hyphen_)
{
programming_error ("Haven't finished hyphen yet.");
- typeset_grob (finished_hyphen_);
finished_hyphen_ =0;
}