X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=aeee14a1ee5d3ede63d92ee69fd5cb3d91df0fdd;hb=c6292fc9b6a3427e76a712a615897dc4088a5a17;hp=cdb50cd9c4f51a3ad20d3c48c72f00d1d33ba434;hpb=01cf114a7808fb0d519d0619f6f56c524ce60399;p=lilypond.git

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index cdb50cd9c4..aeee14a1ee 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -29,10 +29,6 @@ class Phrasing_slur_engraver : public Slur_engraver
   virtual const char* object_name () const;
   virtual void set_melisma (bool);
 
-protected:
-  void listen_phrasing_slur (Stream_event *);
-  void acknowledge_slur (Grob_info);
-
 public:
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
   TRANSLATOR_INHERIT (Slur_engraver);
@@ -62,7 +58,8 @@ Phrasing_slur_engraver::object_name () const
   return "phrasing slur";
 }
 
-Phrasing_slur_engraver::Phrasing_slur_engraver ()
+Phrasing_slur_engraver::Phrasing_slur_engraver (Context *c)
+  : Slur_engraver (c)
 {
 }
 
@@ -71,33 +68,20 @@ Phrasing_slur_engraver::set_melisma (bool)
 {
 }
 
-void
-Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
-{
-  Slur_engraver::listen_slur (ev);
-}
-
-void
-Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-
 void
 Phrasing_slur_engraver::boot ()
 {
-  ADD_LISTENER (Phrasing_slur_engraver, phrasing_slur);
+  ADD_LISTENER_FOR (Phrasing_slur_engraver, slur, phrasing_slur);
   ADD_LISTENER (Phrasing_slur_engraver, note);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_accidental);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, inline_accidental);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, fingering);
   ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, slur);
   ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dots);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
-  ADD_END_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, dots);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, text_script);
+  ADD_END_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tie);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tuplet_number);
 }
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,