X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=479be1df22cdf87e9d02e47c18d5c72cc0733dcf;hb=2ffbc90e9f4dece349b414f34aeffc84043ed539;hp=34b8cb09eee4f91c5e7a8925db3cc9f834529dc4;hpb=88d306d9c5666b5ade4a136df29cca19c5ff5ed7;p=lilypond.git

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 34b8cb09ee..479be1df22 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,31 +35,38 @@ class Phrasing_slur_engraver : public Slur_proto_engraver
 {
 protected:
   DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
-  DECLARE_TRANSLATOR_LISTENER (break_phrasing_slur);
+  DECLARE_TRANSLATOR_LISTENER (note);
   DECLARE_ACKNOWLEDGER (slur);
 
 public:
+  SCM event_symbol ();
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
 };
 
 Phrasing_slur_engraver::Phrasing_slur_engraver () :
   Slur_proto_engraver (0, "PhrasingSlur", "phrasing slur", "phrasing-slur-event")
 {
-  break_slur_ = 0;
+}
+
+SCM
+Phrasing_slur_engraver::event_symbol ()
+{
+  // Need a string constant for memoization
+  return ly_symbol2scm ("phrasing-slur-event");
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur);
 void
 Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
 {
-  internal_listen_slur (ev);
+  Slur_proto_engraver::listen_slur (ev);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, break_phrasing_slur);
+IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, note);
 void
-Phrasing_slur_engraver::listen_break_phrasing_slur (Stream_event *ev)
+Phrasing_slur_engraver::listen_note (Stream_event *ev)
 {
-  internal_listen_break_slur (ev);
+  Slur_proto_engraver::listen_note (ev);
 }
 
 void