* scm/layout-page-dump.scm (scm): export utility function names,

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 55080f092b5f219f664f11a3763d4964fc763f0c..fb7a9e67c68ec86425e948ce949b0c1e72ccc9d7 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -19,17 +19,6 @@
 
 #include "translator.icc"
 
-
-/*
-  NOTE NOTE NOTE
-
-  This is largely similar to Phrasing_slur_engraver. Check if fixes
-  apply there too.
-
-  (on principle, engravers don't use inheritance for code sharing)
-  
- */
-
 /*
   It is possible that a slur starts and ends on the same note.  At
   least, it is for phrasing slurs: a note can be both beginning and
@@ -54,13 +43,10 @@ protected:
   DECLARE_ACKNOWLEDGER (text_script);
   DECLARE_ACKNOWLEDGER (tie);
   DECLARE_ACKNOWLEDGER (tuplet_number);
-
   void acknowledge_extra_object (Grob_info);
   void stop_translation_timestep ();
-  void process_music ();
-
   virtual void finalize ();
-
+  void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Slur_engraver);
@@ -77,10 +63,9 @@ Slur_engraver::listen_slur (Stream_event *ev)
 {
   Direction d = to_dir (ev->get_property ("span-direction"));
   if (d == START)
-    ASSIGN_EVENT_ONCE (events_[START], ev);
+    events_[START] = ev;
   else if (d == STOP)
-    ASSIGN_EVENT_ONCE (events_[STOP], ev);
-  else ev->origin ()->warning (_ ("Invalid direction of slur-event"));
+    events_[STOP] = ev;
 }
 
 void