Issue 4906/4: Use ADD_LISTENER/ACKNOWLEDGER_FOR in slur engravers

diff --git a/lily/include/slur-engraver.hh b/lily/include/slur-engraver.hh
index 1f057069d11d2fe8783b58eb575270a5df4738d3..705ec597e8470c3edae15d7eecafcfbf092a36bb 100644 (file)
--- a/lily/include/slur-engraver.hh
+++ b/lily/include/slur-engraver.hh
@@ -48,14 +48,9 @@ protected:
   virtual SCM grob_symbol () const;
   virtual const char* object_name () const;
 
-  void acknowledge_inline_accidental (Grob_info);
-  void acknowledge_fingering (Grob_info);
   void acknowledge_note_column (Grob_info);
   void acknowledge_script (Grob_info);
-  void acknowledge_dots (Grob_info);
-  void acknowledge_text_script (Grob_info);
   void acknowledge_end_tie (Grob_info);
-  void acknowledge_tuplet_number (Grob_info);
 
   void listen_note (Stream_event *ev);
   // A slur on an in-chord note is not actually announced as an event

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index cdb50cd9c4f51a3ad20d3c48c72f00d1d33ba434..556ef092ad156afb2ee17670cd578ef85f4a807b 100644 (file)
--- 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);
@@ -71,33 +67,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_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, dots);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, text_script);
   ADD_END_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number);
+  ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tuplet_number);
 }
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index ff9065ca10ec9a8e8002afb86c82a353148cd9cf..f87e541ab0e03fd33b24ba082cd8e7297234c720 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -68,14 +68,14 @@ Slur_engraver::boot ()
 {
   ADD_LISTENER (Slur_engraver, slur);
   ADD_LISTENER (Slur_engraver, note);
-  ADD_ACKNOWLEDGER (Slur_engraver, inline_accidental);
-  ADD_ACKNOWLEDGER (Slur_engraver, fingering);
+  ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, inline_accidental);
+  ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, fingering);
   ADD_ACKNOWLEDGER (Slur_engraver, note_column);
   ADD_ACKNOWLEDGER (Slur_engraver, script);
-  ADD_ACKNOWLEDGER (Slur_engraver, text_script);
-  ADD_ACKNOWLEDGER (Slur_engraver, dots);
+  ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, text_script);
+  ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, dots);
   ADD_END_ACKNOWLEDGER (Slur_engraver, tie);
-  ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
+  ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, tuplet_number);
 }
 
 ADD_TRANSLATOR (Slur_engraver,
@@ -170,30 +170,6 @@ Slur_engraver::acknowledge_extra_object (Grob_info info)
   objects_to_acknowledge_.push_back (info);
 }
 
-void
-Slur_engraver::acknowledge_inline_accidental (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Slur_engraver::acknowledge_dots (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Slur_engraver::acknowledge_fingering (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
-void
-Slur_engraver::acknowledge_tuplet_number (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
 void
 Slur_engraver::acknowledge_script (Grob_info info)
 {
@@ -201,12 +177,6 @@ Slur_engraver::acknowledge_script (Grob_info info)
     acknowledge_extra_object (info);
 }
 
-void
-Slur_engraver::acknowledge_text_script (Grob_info info)
-{
-  acknowledge_extra_object (info);
-}
-
 void
 Slur_engraver::acknowledge_end_tie (Grob_info info)
 {