class Hyphen_engraver : public Engraver
{
- Music* ev_;
- Spanner* hyphen_;
- Spanner * finished_hyphen_;
+ Music *ev_;
+ Spanner *hyphen_;
+ Spanner *finished_hyphen_;
public:
- TRANSLATOR_DECLARATIONS(Hyphen_engraver);
+ TRANSLATOR_DECLARATIONS (Hyphen_engraver);
protected:
virtual void acknowledge_grob (Grob_info);
Hyphen_engraver::acknowledge_grob (Grob_info i)
{
Item * item = dynamic_cast<Item*> (i.grob_);
- // -> text_item
+ // -> Text_item
if (item && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
{
if (hyphen_)
if (!sp->get_bound (RIGHT))
{
SCM heads = sp->get_property ("heads");
- if (gh_pair_p (heads))
+ if (scm_is_pair (heads))
{
- Item* it = dynamic_cast<Item*> (unsmob_grob (gh_car (heads)));
+ Item* it = dynamic_cast<Item*> (unsmob_grob (scm_car (heads)));
if (it)
sp->set_bound (RIGHT, it);
}
if (!hyphen_->get_bound (RIGHT))
{
- hyphen_->warning (_ ("unterminated hyphen; removing"));
+ hyphen_->warning (_ ("removing unterminated hyphen"));
hyphen_->suicide ();
}
- typeset_grob (hyphen_);
hyphen_ = 0;
}
completize_hyphen (finished_hyphen_);
if (!finished_hyphen_->get_bound (RIGHT))
- finished_hyphen_->warning (_("unterminated hyphen"));
- typeset_grob (finished_hyphen_);
- finished_hyphen_ =0;
+ {
+ finished_hyphen_->warning (_("unterminated hyphen; removing"));
+ finished_hyphen_->suicide ();
+ }
+ 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;
+ finished_hyphen_ = 0;
}
if (hyphen_)
-ENTER_DESCRIPTION(Hyphen_engraver,
+ADD_TRANSLATOR (Hyphen_engraver,
/* descr */ "Create lyric hyphens",
/* creats*/ "LyricHyphen",
/* accepts */ "hyphen-event",