/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2011 Glen Prideaux <glenprideaux@iname.com>,
+ Copyright (C) 1999--2015 Glen Prideaux <glenprideaux@iname.com>,
Han-Wen Nienhuys <hanwen@xs4all.nl>,
Jan Nieuwenhuizen <janneke@gnu.org>
protected:
- DECLARE_ACKNOWLEDGER (lyric_syllable);
- DECLARE_TRANSLATOR_LISTENER (hyphen);
+ void acknowledge_lyric_syllable (Grob_info);
+ void listen_hyphen (Stream_event *);
virtual void finalize ();
void process_music ();
};
-Hyphen_engraver::Hyphen_engraver ()
+Hyphen_engraver::Hyphen_engraver (Context *c)
+ : Engraver (c)
{
hyphen_ = 0;
finished_hyphen_ = 0;
finished_hyphen_->set_bound (RIGHT, item);
}
-IMPLEMENT_TRANSLATOR_LISTENER (Hyphen_engraver, hyphen);
void
Hyphen_engraver::listen_hyphen (Stream_event *ev)
{
{
extract_item_set (sp, "heads", heads);
if (heads.size ())
- sp->set_bound (RIGHT, heads.back ());
+ sp->set_bound (RIGHT, heads.back ());
}
}
completize_hyphen (hyphen_);
if (!hyphen_->get_bound (RIGHT))
- {
- hyphen_->warning (_ ("removing unterminated hyphen"));
- hyphen_->suicide ();
- }
+ {
+ hyphen_->warning (_ ("removing unterminated hyphen"));
+ hyphen_->suicide ();
+ }
hyphen_ = 0;
}
completize_hyphen (finished_hyphen_);
if (!finished_hyphen_->get_bound (RIGHT))
- {
- if (finished_ev_)
- finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
- finished_hyphen_->suicide ();
- }
+ {
+ if (finished_ev_)
+ finished_hyphen_->warning (_ ("unterminated hyphen; removing"));
+ finished_hyphen_->suicide ();
+ }
finished_hyphen_ = 0;
}
}
ev_ = 0;
}
-ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
+
+void
+Hyphen_engraver::boot ()
+{
+ ADD_LISTENER (Hyphen_engraver, hyphen);
+ ADD_ACKNOWLEDGER (Hyphen_engraver, lyric_syllable);
+}
ADD_TRANSLATOR (Hyphen_engraver,
- /* doc */
- "Create lyric hyphens and distance constraints between words.",
+ /* doc */
+ "Create lyric hyphens and distance constraints between words.",
- /* create */
- "LyricHyphen "
- "LyricSpace ",
+ /* create */
+ "LyricHyphen "
+ "LyricSpace ",
- /* read */
- "",
+ /* read */
+ "",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );