X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=4a6a49305beb1a38c38d42a13e7053b10ad2b289;hb=37ec023ff30dca4f6850331fbd526940f8570939;hp=7441f52425278924fa1bbf4d0ef163ba1eba531e;hpb=78d515e9c342e1760b4e8a966dd77cb1cc0218d7;p=lilypond.git

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 7441f52425..4a6a49305b 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,14 +1,15 @@
 /*
   slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "event.hh"
 #include "slur.hh"
 #include "warn.hh"
 #include "note-column.hh"
-#include "translator-group.hh"
+#include "context.hh"
+
 #include "engraver.hh"
 #include "spanner.hh"
 
@@ -29,9 +30,8 @@ protected:
   virtual bool try_music (Music*);
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
   virtual void finalize ();
-  virtual void process_acknowledged_grobs ();
+  virtual void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Slur_engraver);
@@ -45,27 +45,12 @@ Slur_engraver::Slur_engraver ()
 bool
 Slur_engraver::try_music (Music *ev)
 {
-  if (ev->is_mus_type ("abort-event"))
-    {
-      for (int i = 0; i < slur_stack_.size (); i++)
-	{
-	  slur_stack_[i]->suicide ();
-	}
-      slur_stack_.clear ();
-      for (int i = 0; i < end_slurs_.size (); i++)
-	{
-	  end_slurs_[i]->suicide ();
-	}
-      end_slurs_.clear ();
-      events_.clear ();
-      new_slur_evs_.clear ();
-    }
-  else if (ev->is_mus_type ("slur-event"))
+  if (ev->is_mus_type ("slur-event"))
     {
       /*
 	Let's not start more than one slur per moment.
       */
-      Direction d = to_dir (ev->get_mus_property ("span-direction"));
+      Direction d = to_dir (ev->get_property ("span-direction"));
       if (d == START)
 	{
 	  if (now_mom () > last_start_)
@@ -79,16 +64,15 @@ Slur_engraver::try_music (Music *ev)
 	  */
 	      
 	  return true;
-
 	}
       else if (d == STOP)
 	{
 	  /*
 	    Swallow other events.
 	  */
-	  for (int j = new_slur_evs_.size(); j--;)
+	  for (int j = new_slur_evs_.size (); j--;)
 	    {
-	      Direction nd = to_dir (new_slur_evs_[j]->get_mus_property ("span-direction"));
+	      Direction nd = to_dir (new_slur_evs_[j]->get_property ("span-direction"));
 	      
 	      if (nd == STOP)
 		return true;
@@ -104,7 +88,7 @@ Slur_engraver::try_music (Music *ev)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  daddy_trans_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  daddy_context_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
@@ -139,17 +123,17 @@ Slur_engraver::finalize ()
 }
 
 void
-Slur_engraver::process_acknowledged_grobs ()
+Slur_engraver::process_music ()
 {
   Link_array<Grob> start_slurs;
   for (int i=0; i< new_slur_evs_.size (); i++)
     {
       Music* slur_ev = new_slur_evs_[i];
       // end slur: move the slur to other array
-      Direction d = to_dir (slur_ev->get_mus_property ("span-direction"));
+      Direction d = to_dir (slur_ev->get_property ("span-direction"));
       if (d== STOP)
 	{
-	  if (slur_stack_.empty ())
+	  if (slur_stack_.is_empty ())
 	    /* How to shut up this warning, when Voice_devnull_engraver has
 	       eaten start event? */
 	    slur_ev->origin ()->warning (_f ("can't find start of slur"));
@@ -165,13 +149,13 @@ Slur_engraver::process_acknowledged_grobs ()
 	{
 	  // push a new slur onto stack.
 	  // (use temp. array to wait for all slur STOPs)
-	  Grob* slur = new Spanner (get_property ("Slur"));
+	  Grob* slur = make_spanner ("Slur");
 	  Slur::set_interface (slur); // cannot remove yet!
 
 
-	  if (Direction updown = to_dir (slur_ev->get_mus_property ("direction")))
+	  if (Direction updown = to_dir (slur_ev->get_property ("direction")))
 	    {
-	      slur->set_grob_property ("direction", gh_int2scm (updown));
+	      slur->set_property ("direction", gh_int2scm (updown));
 	    }
 	  
 	  start_slurs.push (slur);
@@ -179,8 +163,11 @@ Slur_engraver::process_acknowledged_grobs ()
 	  announce_grob (slur, slur_ev->self_scm ());
 	}
     }
-  for (int i=0; i < start_slurs.size (); i++)
-    slur_stack_.push (start_slurs[i]);
+
+  slur_stack_.concat  (start_slurs);
+
+  set_melisma (slur_stack_.size ());
+
   new_slur_evs_.clear ();
 }
 
@@ -192,17 +179,7 @@ Slur_engraver::stop_translation_timestep ()
       typeset_grob (end_slurs_[i]);
     }
   end_slurs_.clear ();
-}
-
-void
-Slur_engraver::start_translation_timestep ()
-{
   new_slur_evs_.clear ();
-  SCM m = get_property ("automaticMelismata");
-  if (to_boolean (m))
-    {
-      set_melisma (slur_stack_.size ());
-    }
 }