X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fligature-engraver.hh;h=f74cf6b6cedfcc2c7ac42a341f45ff442468b6f3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=60b341ed996fda2f868a1ac62e74717d9df92274;hpb=8071495de682d5348d8b654b74727f3cec782189;p=lilypond.git diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh index 60b341ed99..f74cf6b6ce 100644 --- a/lily/include/ligature-engraver.hh +++ b/lily/include/ligature-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2002--2005 Juergen Reuter + (c) 2002--2008 Juergen Reuter */ #ifndef LIGATURE_ENGRAVER_HH @@ -21,11 +21,11 @@ protected: DECLARE_ACKNOWLEDGER (rest); DECLARE_ACKNOWLEDGER (note_head); - virtual bool try_music (Music *); + virtual void listen_ligature (Stream_event *ev); void process_music (); virtual Spanner *create_ligature_spanner () = 0; virtual void typeset_ligature (Spanner *ligature, - Array primitives) = 0; + vector primitives) = 0; virtual Spanner *current_ligature (); SCM brew_ligature_primitive_proc; @@ -34,15 +34,15 @@ public: // class is abstract private: - Drul_array events_drul_; + Drul_array events_drul_; Spanner *ligature_; - Array primitives_; + vector primitives_; Spanner *finished_ligature_; - Array finished_primitives_; + vector finished_primitives_; - Music *prev_start_event_; + Stream_event *prev_start_event_; // moment where ligature started. Moment ligature_start_mom_;