source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
automatically is the end of the trill?
*/
+#include "engraver.hh"
+
+#include "international.hh"
#include "note-column.hh"
+#include "pointer-group-interface.hh"
#include "side-position-interface.hh"
-#include "engraver.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
#include "translator.icc"
TRANSLATOR_DECLARATIONS (Trill_spanner_engraver);
protected:
virtual void finalize ();
- DECLARE_ACKNOWLEDGER(note_column);
- virtual bool try_music (Music *);
+ DECLARE_TRANSLATOR_LISTENER (trill_span);
+ DECLARE_ACKNOWLEDGER (note_column);
+
void stop_translation_timestep ();
void process_music ();
private:
Spanner *span_;
Spanner *finished_;
- Music *current_event_;
- Drul_array<Music *> event_drul_;
+ Stream_event *current_event_;
+ Drul_array<Stream_event *> event_drul_;
void typeset_all ();
};
event_drul_[STOP] = 0;
}
-bool
-Trill_spanner_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
+void
+Trill_spanner_engraver::listen_trill_span (Stream_event *ev)
{
- if (m->is_mus_type ("trill-span-event"))
- {
- Direction d = to_dir (m->get_property ("span-direction"));
- event_drul_[d] = m;
- return true;
- }
+ Direction d = to_dir (ev->get_property ("span-direction"));
+ ASSIGN_EVENT_ONCE (event_drul_[d], ev);
+}
- return false;
+void
+Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
+{
+ if (span_) {
+ Pointer_group_interface::add_grob (span_,
+ ly_symbol2scm ("note-columns"),
+ info.grob());
+ add_bound_item (span_, info.grob ());
+ } else if (finished_) {
+ Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"),
+ info.grob());
+ add_bound_item (finished_, info.grob ());
+ }
}
void
if (event_drul_[STOP])
{
if (!span_)
- {
- event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner"));
- }
+ event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
else
{
finished_ = span_;
+ announce_end_grob (finished_, SCM_EOL);
span_ = 0;
current_event_ = 0;
}
if (event_drul_[START])
{
if (current_event_)
- {
- event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
- }
+ event_drul_[START]->origin ()->warning (_ ("already have a trill spanner"));
else
{
current_event_ = event_drul_[START];
}
}
-void
-Trill_spanner_engraver::acknowledge_note_column (Grob_info info)
-{
- Spanner *spans[2] ={span_, finished_};
- for (int i = 0; i < 2; i++)
- {
- if (spans[i])
- {
- Side_position_interface::add_support (spans[i], info.grob ());
- add_bound_item (spans[i], dynamic_cast<Item *> (info.grob ()));
- }
- }
-}
-
void
Trill_spanner_engraver::typeset_all ()
{
typeset_all ();
if (span_)
{
- current_event_->origin ()->warning (_ ("unterminated trill spanner"));
- span_->suicide ();
- span_ = 0;
+ finished_ = span_;
+ typeset_all ();
}
}
-ADD_ACKNOWLEDGER(Trill_spanner_engraver,note_column);
+
+ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
+
ADD_TRANSLATOR (Trill_spanner_engraver,
- /* descr */ "Create trill spanner from a Music.",
- /* creats*/ "TrillSpanner",
- /* accepts */ "trill-span-event",
- /* reads */ "",
- /* write */ "");
+ /* doc */
+ "Create trill spanner from an event.",
+
+ /* create */
+ "TrillSpanner ",
+
+ /* read */
+ "",
+
+ /* write */
+ ""
+ );