X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fphrasing-slur-engraver.cc;h=69865eae59b8c61853dae0b56c1e0ff43fa4bac9;hb=eb81c44025904ff450116c8c64a901d891617c23;hp=9ae400b2b650ea708756c9481ec922fdc5b5717a;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 9ae400b2b6..69865eae59 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -5,7 +5,7 @@
 */
 
 #include "event.hh"
-#include "slur.hh"
+#include "new-slur.hh"
 #include "warn.hh"
 #include "note-column.hh"
 #include "context.hh"
@@ -37,7 +37,7 @@ protected:
   virtual void process_acknowledged_grobs ();
 
 public:
-  TRANSLATOR_DECLARATIONS(Phrasing_slur_engraver);
+  TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
   
 };
 
@@ -82,9 +82,9 @@ Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
     {
       Grob *e =info.grob_;
       for (int i = 0; i < phrasing_slurs_.size (); i++)
-	Slur::add_column (phrasing_slurs_[i], e);
+	New_slur::add_column (phrasing_slurs_[i], e);
       for (int i = 0; i < end_phrasing_slurs_.size (); i++)
-	Slur::add_column (end_phrasing_slurs_[i], e);
+	New_slur::add_column (end_phrasing_slurs_[i], e);
     }
 }
 
@@ -132,18 +132,15 @@ Phrasing_slur_engraver::process_acknowledged_grobs ()
 	{
 	  // push a new phrasing_slur onto stack.
 	  // (use temp. array to wait for all phrasing_slur STOPs)
-	  Grob* phrasing_slur = make_spanner ("PhrasingSlur");
-	  Slur::set_interface (phrasing_slur); // can't remove.
-
+	  Grob* phrasing_slur = make_spanner ("PhrasingSlur", phrasing_slur_ev->self_scm ());
 
 	  if (Direction updown = to_dir (phrasing_slur_ev->get_property ("direction")))
 	    {
-	      phrasing_slur->set_property ("direction", gh_int2scm (updown));
+	      phrasing_slur->set_property ("direction", scm_int2num (updown));
 	    }
 
 	  start_phrasing_slurs.push (phrasing_slur);
 	  eventses_.push (phrasing_slur_ev);
-	  announce_grob(phrasing_slur, phrasing_slur_ev->self_scm());
 	}
     }
   for (int i=0; i < start_phrasing_slurs.size (); i++)
@@ -154,10 +151,6 @@ Phrasing_slur_engraver::process_acknowledged_grobs ()
 void
 Phrasing_slur_engraver::stop_translation_timestep ()
 {
-  for (int i = 0; i < end_phrasing_slurs_.size (); i++)
-    {
-      typeset_grob (end_phrasing_slurs_[i]);
-    }
   end_phrasing_slurs_.clear ();
 }
 
@@ -169,7 +162,7 @@ Phrasing_slur_engraver::start_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Phrasing_slur_engraver,
+ENTER_DESCRIPTION (Phrasing_slur_engraver,
 /* descr */       "Print phrasing slurs. Similar to @ref{Slur_engraver}",
 /* creats*/       "PhrasingSlur",
 /* accepts */     "phrasing-slur-event",