X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=18f20f5430bc23c2422f9731893e126fc3e32310;hb=3cdc909d8cea64c8faef90d3a6a391f32a424ba2;hp=ee7a96a2d773e492c8172f0ef77bd5ba67373cab;hpb=ada469521f669f570b50b73a0037402a71cae1e9;p=lilypond.git

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index ee7a96a2d7..18f20f5430 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -17,71 +17,70 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "engraver.hh"
-
-#include "context.hh"
-#include "directional-element-interface.hh"
-#include "international.hh"
-#include "note-column.hh"
-#include "slur.hh"
-#include "slur-proto-engraver.hh"
-#include "spanner.hh"
-#include "stream-event.hh"
-#include "warn.hh"
+#include "slur-engraver.hh"
 
 #include "translator.icc"
 
-class Phrasing_slur_engraver : public Slur_proto_engraver
+class Phrasing_slur_engraver : public Slur_engraver
 {
-protected:
-  void listen_phrasing_slur (Stream_event *);
-  void acknowledge_slur (Grob_info);
+  virtual SCM event_symbol () const;
+  virtual bool double_property () const;
+  virtual SCM grob_symbol () const;
+  virtual const char* object_name () const;
+  virtual void set_melisma (bool);
 
 public:
-  SCM event_symbol ();
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
-  TRANSLATOR_INHERIT (Slur_proto_engraver);
+  TRANSLATOR_INHERIT (Slur_engraver);
 };
 
-Phrasing_slur_engraver::Phrasing_slur_engraver () :
-  Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event")
+SCM
+Phrasing_slur_engraver::event_symbol () const
+{
+  return ly_symbol2scm ("phrasing-slur-event");
+}
+
+bool
+Phrasing_slur_engraver::double_property () const
 {
+  return false;
 }
 
 SCM
-Phrasing_slur_engraver::event_symbol ()
+Phrasing_slur_engraver::grob_symbol () const
 {
-  // Need a string constant for memoization
-  return ly_symbol2scm ("phrasing-slur-event");
+  return ly_symbol2scm ("PhrasingSlur");
 }
 
-void
-Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
+const char *
+Phrasing_slur_engraver::object_name () const
 {
-  Slur_proto_engraver::listen_slur (ev);
+  return "phrasing slur";
 }
 
-void
-Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
+Phrasing_slur_engraver::Phrasing_slur_engraver ()
 {
-  acknowledge_extra_object (info);
 }
 
+void
+Phrasing_slur_engraver::set_melisma (bool)
+{
+}
 
 void
 Phrasing_slur_engraver::boot ()
 {
-  ADD_LISTENER (Phrasing_slur_engraver, phrasing_slur);
-  ADD_LISTENER (Slur_proto_engraver, note);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, note_column);
-  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, script);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, dots);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, text_script);
-  ADD_END_ACKNOWLEDGER (Slur_proto_engraver, tie);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, tuplet_number);
+  ADD_LISTENER_FOR (Phrasing_slur_engraver, slur, phrasing_slur);
+  ADD_LISTENER (Phrasing_slur_engraver, note);
+  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_FOR (Phrasing_slur_engraver, extra_object, slur);
+  ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
+  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,