/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
protected:
virtual void finalize ();
- DECLARE_TRANSLATOR_LISTENER (trill_span);
- DECLARE_ACKNOWLEDGER (note_column);
+ void listen_trill_span (Stream_event *);
+ void acknowledge_note_column (Grob_info);
void stop_translation_timestep ();
void process_music ();
void typeset_all ();
};
-Trill_spanner_engraver::Trill_spanner_engraver ()
+Trill_spanner_engraver::Trill_spanner_engraver (Context *c)
+ : Engraver (c)
{
finished_ = 0;
current_event_ = 0;
event_drul_.set (0, 0);
}
-IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
void
Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
{
if (span_)
{
Pointer_group_interface::add_grob (span_,
- ly_symbol2scm ("note-columns"),
- info.grob());
+ ly_symbol2scm ("note-columns"),
+ info.grob ());
if (!span_->get_bound (LEFT))
- add_bound_item (span_, info.grob ());
+ add_bound_item (span_, info.grob ());
}
else if (finished_)
{
Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
- info.grob());
+ info.grob ());
if (!finished_->get_bound (RIGHT))
- add_bound_item (finished_, info.grob ());
+ add_bound_item (finished_, info.grob ());
}
}
{
Stream_event *ender = event_drul_[STOP];
if (!ender)
- ender = event_drul_[START];
+ ender = event_drul_[START];
finished_ = span_;
announce_end_grob (finished_, ender->self_scm ());
span_ = 0;
if (finished_)
{
if (!finished_->get_bound (RIGHT))
- {
- Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
- finished_->set_bound (RIGHT, e);
- }
+ {
+ Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
+ finished_->set_bound (RIGHT, e);
+ }
finished_ = 0;
}
}
{
if (span_ && !span_->get_bound (LEFT))
{
- Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+ Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
span_->set_bound (LEFT, e);
}
typeset_all ();
if (span_)
{
- Grob *e = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *e = unsmob<Grob> (get_property ("currentCommandColumn"));
span_->set_bound (RIGHT, e);
}
}
-ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+
+void
+Trill_spanner_engraver::boot ()
+{
+ ADD_LISTENER (Trill_spanner_engraver, trill_span);
+ ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+}
ADD_TRANSLATOR (Trill_spanner_engraver,
- /* doc */
- "Create trill spanner from an event.",
+ /* doc */
+ "Create trill spanner from an event.",
- /* create */
- "TrillSpanner ",
+ /* create */
+ "TrillSpanner ",
- /* read */
- "currentCommandColumn "
- "currentMusicalColumn ",
+ /* read */
+ "currentCommandColumn "
+ "currentMusicalColumn ",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );