source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Glen Prideaux <glenprideaux@iname.com>,
- Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+ (c) 1999--2006 Glen Prideaux <glenprideaux@iname.com>,
+ Han-Wen Nienhuys <hanwen@xs4all.nl>,
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "context.hh"
#include "engraver.hh"
-#include "pointer-group-interface.hh"
+#include "international.hh"
#include "item.hh"
#include "lyric-extender.hh"
#include "note-head.hh"
+#include "pointer-group-interface.hh"
+#include "stream-event.hh"
#include "warn.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
void completize_extender (Spanner *sp);
class Extender_engraver : public Engraver
{
- Music *ev_;
+ Stream_event *ev_;
Spanner *extender_;
Spanner *pending_extender_;
TRANSLATOR_DECLARATIONS (Extender_engraver);
protected:
- virtual void acknowledge_grob (Grob_info);
+ DECLARE_TRANSLATOR_LISTENER (extender);
+ DECLARE_ACKNOWLEDGER (lyric_syllable);
virtual void finalize ();
- virtual bool try_music (Music *);
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
- PRECOMPUTED_VIRTUAL void process_music ();
+ void stop_translation_timestep ();
+ void process_music ();
};
Extender_engraver::Extender_engraver ()
ev_ = 0;
}
-bool
-Extender_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender);
+void
+Extender_engraver::listen_extender (Stream_event *ev)
{
- if (!ev_)
- {
- ev_ = r;
- return true;
- }
- return false;
+ ASSIGN_EVENT_ONCE (ev_, ev);
}
void
}
void
-Extender_engraver::acknowledge_grob (Grob_info i)
+Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
{
- Item *item = dynamic_cast<Item *> (i.grob ());
+ Item *item = i.item ();
+ if (extender_)
+ extender_->set_bound (LEFT, item);
- if (item
- && item->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+ if (pending_extender_)
{
- if (extender_)
- extender_->set_bound (LEFT, item);
-
- if (pending_extender_)
- {
- pending_extender_->set_object ("next", item->self_scm ());
- completize_extender (pending_extender_);
- pending_extender_ = 0;
- }
+ pending_extender_->set_object ("next", item->self_scm ());
+ completize_extender (pending_extender_);
+ pending_extender_ = 0;
}
}
ly_symbol2scm ("heads"), h);
}
}
-
+ else
+ {
+ if (pending_extender_)
+ {
+ completize_extender (pending_extender_);
+ pending_extender_ = 0;
+ }
+
+ }
if (extender_)
{
pending_extender_ = extender_;
{
extract_item_set (sp, "heads", heads);
if (heads.size ())
- {
- sp->set_bound (RIGHT, heads.top());
- }
+ sp->set_bound (RIGHT, heads.back ());
}
}
}
}
-#include "translator.icc"
-
+ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
ADD_TRANSLATOR (Extender_engraver,
- /* descr */ "Create lyric extenders",
- /* creats*/ "LyricExtender",
- /* accepts */ "extender-event",
- /* acks */ "lyric-syllable-interface",
- /* reads */ "",
+ /* doc */ "Create lyric extenders",
+ /* create */ "LyricExtender",
+ /* read */ "",
/* write */ "");