X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=1f0355795ad225c93dae1723caed7469bd1897ff;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=5d7114482de3f78055cd4f829d59ac8b08276ac9;hpb=e7d84e6728ecfdf74d8f214486a29c2aca199819;p=lilypond.git

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 5d7114482d..1f0355795a 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,48 +1,101 @@
 /*
-  slur-grav.cc -- implement Slur_engraver
+  slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
 #include "musical-request.hh"
-#include "slur-engraver.hh"
 #include "slur.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "note-column.hh"
 #include "translator-group.hh"
 #include "engraver.hh"
+#include "spanner.hh"
 
-class Slur_engraver :public Engraver {
-  Link_array<Span_req> requests_arr_;
-  Link_array<Span_req> new_slur_req_l_arr_;
-  Link_array<Slur> slur_l_stack_;
-  Link_array<Slur> end_slur_l_arr_;
+/*
+  TODO: junk nested slur functionality.
+ */
+class Slur_engraver : public Engraver
+{
+  Link_array<Span_req> requests_;
+  Link_array<Span_req> new_slur_reqs_;
+  Link_array<Grob> slur_stack_;
+  Link_array<Grob> end_slurs_;
+  Moment last_start_;
 
   void set_melisma (bool);
+
 protected:
-  virtual bool do_try_music (Music*);
-  virtual void do_process_music();
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
-  virtual void do_removal_processing ();
+  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 ();
 
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
+  TRANSLATOR_DECLARATIONS (Slur_engraver);
 };
 
+Slur_engraver::Slur_engraver ()
+{
+  last_start_ = Moment (-1);
+}
+
 bool
-Slur_engraver::do_try_music (Music *req_l)
+Slur_engraver::try_music (Music *req)
 {
-  if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
+  if (Span_req *sl = dynamic_cast <Span_req *> (req))
     {
-      if (sl->span_type_str_ != "slur")
-	return false;
-      new_slur_req_l_arr_.push (sl);
+      String t =  ly_scm2string (sl->get_mus_property ("span-type"));
+      if (t == "abort")
+	{
+	  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 ();
+	  requests_.clear ();
+	  new_slur_reqs_.clear ();
+	}
+      else if (t == "slur")
+	{
+	  /*
+	    Let's not start more than one slur per moment.
+	   */
+	  if (sl->get_span_dir () == START)
+	    {
+	      if (now_mom () > last_start_)
+	        {
+	          new_slur_reqs_.push (sl);
+		  last_start_ = now_mom ();
+		}
+
+	      /*
+		But we swallow other slur requests.
+	      */
+	      
+	      return true;
 
-      return true;
+	    }
+	  else if (sl->get_span_dir () == STOP)
+	    {
+	      /*
+		Swallow other requests.
+	       */
+	      for (int j = new_slur_reqs_.size(); j--;)
+		if (new_slur_reqs_[j]->get_span_dir() == STOP)
+		  return true;
+	      
+	      new_slur_reqs_.push (sl);
+	      return true;
+	    }
+	}
     }
   return false;
 }
@@ -50,93 +103,108 @@ Slur_engraver::do_try_music (Music *req_l)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  daddy_trans_l_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+  daddy_trans_->set_property ("slurMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
 }
 
 void
-Slur_engraver::acknowledge_element (Score_element_info info)
+Slur_engraver::acknowledge_grob (Grob_info info)
 {
-  if (dynamic_cast<Note_column *> (info.elem_l_))
+  if (Note_column::has_interface (info.grob_))
     {
-      Note_column *col_l =dynamic_cast<Note_column *> (info.elem_l_) ;// ugh
-      for (int i = 0; i < slur_l_stack_.size(); i++)
-	slur_l_stack_[i]->add_column (col_l);
-      for (int i = 0; i < end_slur_l_arr_.size(); i++)
-	end_slur_l_arr_[i]->add_column (col_l);
+      Grob *e =info.grob_;
+      for (int i = 0; i < slur_stack_.size (); i++)
+	Slur::add_column (slur_stack_[i], e);
+      for (int i = 0; i < end_slurs_.size (); i++)
+	Slur::add_column (end_slurs_[i], e);
     }
 }
 
 void
-Slur_engraver::do_removal_processing ()
+Slur_engraver::finalize ()
 {
-  for (int i = 0; i < slur_l_stack_.size(); i++)
+  for (int i = 0; i < slur_stack_.size (); i++)
     {
-      typeset_element (slur_l_stack_[i]);
+#if 0
+      typeset_grob (slur_stack_[i]);
+#else
+      /*
+	Let's not typeset unterminated stuff
+       */
+      slur_stack_[i]->suicide ();
+#endif     
     }
-  slur_l_stack_.clear ();
-  SCM wg = get_property ("weAreGraceContext");
-  bool wgb = to_boolean (wg);
-  if (!wgb)
-    for (int i=0; i < requests_arr_.size(); i++)
+  slur_stack_.clear ();
+
+  for (int i=0; i < requests_.size (); i++)
       {
-	requests_arr_[i]->warning (_ ("unterminated slur"));
+	requests_[i]->origin ()->warning (_ ("unterminated slur"));
       }
 }
 
 void
-Slur_engraver::do_process_music()
+Slur_engraver::process_acknowledged_grobs ()
 {
-  Array<Slur*> start_slur_l_arr_;
-  for (int i=0; i< new_slur_req_l_arr_.size(); i++)
+  Link_array<Grob> start_slurs;
+  for (int i=0; i< new_slur_reqs_.size (); i++)
     {
-      Span_req* slur_req_l = new_slur_req_l_arr_[i];
+      Span_req* slur_req = new_slur_reqs_[i];
       // end slur: move the slur to other array
-      if (slur_req_l->span_dir_ == STOP)
+      if (slur_req->get_span_dir () == STOP)
 	{
-	  if (slur_l_stack_.empty())
-
-	    slur_req_l->warning (_f ("can't find both ends of %s", _("slur")));
+	  if (slur_stack_.empty ())
+	    /* How to shut up this warning, when Voice_devnull_engraver has
+	       eaten start request? */
+	    slur_req->origin ()->warning (_f ("can't find start of slur"));
 	  else
 	    {
-	      end_slur_l_arr_.push (slur_l_stack_.pop());
-	      requests_arr_.pop();
+	      Grob* slur = slur_stack_.pop ();
+	    
+	      end_slurs_.push (slur);
+	      requests_.pop ();
 	    }
 	}
-      else  if (slur_req_l->span_dir_ == START)
+      else  if (slur_req->get_span_dir () == START)
 	{
 	  // push a new slur onto stack.
-	  //(use temp. array to wait for all slur STOPs)
-	  Slur * s_p =new Slur;
-	  
-	  requests_arr_.push (slur_req_l);
-	  start_slur_l_arr_.push (s_p);
-	  announce_element (Score_element_info (s_p, slur_req_l));
+	  // (use temp. array to wait for all slur STOPs)
+	  Grob* slur = new Spanner (get_property ("Slur"));
+	  Slur::set_interface (slur); // cannot remove yet!
+	  start_slurs.push (slur);
+	  requests_.push (slur_req);
+	  announce_grob (slur, slur_req->self_scm ());
 	}
     }
-  for (int i=0; i < start_slur_l_arr_.size(); i++)
-    slur_l_stack_.push (start_slur_l_arr_[i]);
+  for (int i=0; i < start_slurs.size (); i++)
+    slur_stack_.push (start_slurs[i]);
+  new_slur_reqs_.clear ();
 }
 
 void
-Slur_engraver::do_pre_move_processing()
+Slur_engraver::stop_translation_timestep ()
 {
-  for (int i = 0; i < end_slur_l_arr_.size(); i++)
+  for (int i = 0; i < end_slurs_.size (); i++)
     {
-      typeset_element (end_slur_l_arr_[i]);
+      typeset_grob (end_slurs_[i]);
     }
-  end_slur_l_arr_.clear();
+  end_slurs_.clear ();
 }
 
 void
-Slur_engraver::do_post_move_processing()
+Slur_engraver::start_translation_timestep ()
 {
-  new_slur_req_l_arr_.clear();
+  new_slur_reqs_.clear ();
   SCM m = get_property ("automaticMelismata");
   if (to_boolean (m))
     {
-      set_melisma (slur_l_stack_.size ());
+      set_melisma (slur_stack_.size ());
     }
 }
 
 
-ADD_THIS_TRANSLATOR(Slur_engraver);
+
+ENTER_DESCRIPTION (Slur_engraver,
+/* descr */       "Build slurs from Slur_reqs",
+/* creats*/       "Slur",
+/* acks  */       "note-column-interface",
+/* reads */       "slurMelismaBusy",
+/* write */       "");