Run `make grand-replace'.

[lilypond.git] / lily / include / ligature-engraver.hh

diff --git a/lily/include/ligature-engraver.hh b/lily/include/ligature-engraver.hh
index ce3cba4aa88db8c06b2bcfb3ef02ac1c0214f93c..f74cf6b6cedfcc2c7ac42a341f45ff442468b6f3 100644 (file)
--- a/lily/include/ligature-engraver.hh
+++ b/lily/include/ligature-engraver.hh
@@ -3,8 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
 */
+
 #ifndef LIGATURE_ENGRAVER_HH
 #define LIGATURE_ENGRAVER_HH
 
@@ -18,14 +19,13 @@ protected:
   void stop_translation_timestep ();
   virtual void finalize ();
 
-
   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<Grob_info> primitives) = 0;
+                                vector<Grob_info> primitives) = 0;
   virtual Spanner *current_ligature ();
   SCM brew_ligature_primitive_proc;
 
@@ -34,23 +34,20 @@ public:
   // class is abstract
 
 private:
-  Drul_array<Music *> events_drul_;
+  Drul_array<Stream_event *> events_drul_;
 
   Spanner *ligature_;
-  Array<Grob_info> primitives_;
+  vector<Grob_info> primitives_;
 
   Spanner *finished_ligature_;
-  Array<Grob_info> finished_primitives_;
+  vector<Grob_info> finished_primitives_;
 
-  Music *prev_start_event_;
+  Stream_event *prev_start_event_;
 
   // moment where ligature started.
   Moment ligature_start_mom_;
 
   Grob *last_bound_;
-
-  void override_stencil_callback ();
-  void revert_stencil_callback ();
 };
 
 #endif // LIGATURE_ENGRAVER_HH