X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fligature-bracket-engraver.cc;h=85cd473ecd21ee4e0ffbb5bdd7a281bd9c687700;hb=5bbca339abd8ca056f1360a829cc9798bd6ecd8b;hp=acbf66b4bfa8d0ec0404e66ee5cf7ccf107c1527;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index acbf66b4bf..85cd473ecd 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -3,13 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #include "ligature-engraver.hh"
 #include "note-column.hh"
 #include "tuplet-bracket.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
+#include "spanner.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 /*
  * This engraver marks ligatures of any kind by just printing a
@@ -22,13 +27,21 @@ class Ligature_bracket_engraver : public Ligature_engraver
 protected:
   virtual Spanner *create_ligature_spanner ();
   virtual void typeset_ligature (Spanner *ligature,
-				 Array<Grob_info> primitives);
+				 vector<Grob_info> primitives);
   DECLARE_ACKNOWLEDGER (rest);
   DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (ligature);
 public:
   TRANSLATOR_DECLARATIONS (Ligature_bracket_engraver);
 };
 
+IMPLEMENT_TRANSLATOR_LISTENER (Ligature_bracket_engraver, ligature);
+void
+Ligature_bracket_engraver::listen_ligature (Stream_event *ev)
+{
+  Ligature_engraver::listen_ligature (ev);
+}
+
 Ligature_bracket_engraver::Ligature_bracket_engraver ()
 {
 }
@@ -40,7 +53,7 @@ Ligature_bracket_engraver::create_ligature_spanner ()
 }
 
 void
-Ligature_bracket_engraver::typeset_ligature (Spanner *, Array<Grob_info>)
+Ligature_bracket_engraver::typeset_ligature (Spanner *, vector<Grob_info>)
 {
   // no real ligature to typeset; the LigatureBracket just does it
 }
@@ -66,13 +79,11 @@ Ligature_bracket_engraver::acknowledge_rest (Grob_info info)
     Ligature_engraver::acknowledge_rest (info);
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest);
 ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
+
 ADD_TRANSLATOR (Ligature_bracket_engraver,
 		/* doc */ "Handles Ligature_events by engraving Ligature brackets.",
 		/* create */ "TupletBracket",
-		/* accept */ "ligature-event",
 		/* read */ "",
 		/* write */ "");