Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / ligature-bracket-engraver.cc

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 3382193a6722063dc8972f2b24410c8f246bf6c2..6e8dd9a22a9469cb878996252023b332b5d3e6a0 100644 (file)
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -10,6 +10,11 @@
 #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,
-                                std::vector<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 *, std::vector<Grob_info>)
+Ligature_bracket_engraver::typeset_ligature (Spanner *, vector<Grob_info>)
 {
   // no real ligature to typeset; the LigatureBracket just does it
 }
@@ -66,13 +79,10 @@ 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 */ "");