Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / phrasing-slur-engraver.cc

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index c53d242c8c30b2dcfd3103050a393668f26f6d7e..ee7a96a2d773e492c8172f0ef77bd5ba67373cab 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -35,7 +35,6 @@ class Phrasing_slur_engraver : public Slur_proto_engraver
 {
 protected:
   void listen_phrasing_slur (Stream_event *);
-  void listen_note (Stream_event *);
   void acknowledge_slur (Grob_info);
 
 public:
@@ -62,12 +61,6 @@ Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
   Slur_proto_engraver::listen_slur (ev);
 }
 
-void
-Phrasing_slur_engraver::listen_note (Stream_event *ev)
-{
-  Slur_proto_engraver::listen_note (ev);
-}
-
 void
 Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
 {
@@ -79,9 +72,9 @@ void
 Phrasing_slur_engraver::boot ()
 {
   ADD_LISTENER (Phrasing_slur_engraver, phrasing_slur);
-  ADD_LISTENER (Phrasing_slur_engraver, note);
+  ADD_LISTENER (Slur_proto_engraver, note);
   ADD_ACKNOWLEDGER (Slur_proto_engraver, inline_accidental);
-  ADD_ACKNOWLEDGER (Slur_proto_engraver, fingering)
+  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);