X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=806f5918e0b1bba4c79a738413e9a6e6e03b2de9;hb=b55303a78f027962dbebf62dbe396325f3b6e1a5;hp=6a3a72f05fe1f85ab9e77c19a33188b6a4d7dffc;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 6a3a72f05f..806f5918e0 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,27 +1,85 @@
 /*
-  slur-grav.cc -- implement Slur_engraver
+  slur-engraver.cc -- implement Slur_engraver
 
-  (c)  1997--1999 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 "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<Grob> slur_l_stack_;
+  Link_array<Grob> end_slur_l_arr_;
+  Moment last_start_;
+
+  void set_melisma (bool);
+
+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 create_grobs ();
+
+public:
+  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_l)
 {
   if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
     {
-      if (sl->span_type_str_ != "slur")
-	return false;
-      new_slur_req_l_arr_.push (sl);
-
-      return true;
+      String t =  ly_scm2string (sl->get_mus_property ("span-type"));
+      if (t == "abort")
+	{
+	  for (int i = 0; i < slur_l_stack_.size (); i++)
+	    {
+	      slur_l_stack_[i]->suicide ();
+	    }
+	  slur_l_stack_.clear ();
+	  for (int i = 0; i < end_slur_l_arr_.size (); i++)
+	    {
+	      end_slur_l_arr_[i]->suicide ();
+	    }
+	  end_slur_l_arr_.clear ();
+	  requests_arr_.clear ();
+	  new_slur_req_l_arr_.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_req_l_arr_.push (sl);
+		  last_start_ = now_mom ();
+	          return true;
+		}
+	    }
+	  else
+	    {
+	      new_slur_req_l_arr_.push (sl);
+	      return true;
+	    }
+	}
     }
   return false;
 }
@@ -29,109 +87,117 @@ Slur_engraver::do_try_music (Music *req_l)
 void
 Slur_engraver::set_melisma (bool m)
 {
-  Translator_group *where = daddy_trans_l_;
-  get_property ("slurMelismaBusy", &where);
-  if (!where)
-    where = daddy_trans_l_;
-    
-  daddy_trans_l_->set_property ("slurMelismaBusy", m ? "1" :"0");
+  daddy_trans_l_->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_l_))
     {
-      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_l_;
+      for (int i = 0; i < slur_l_stack_.size (); i++)
+	Slur::add_column (slur_l_stack_[i], e);
+      for (int i = 0; i < end_slur_l_arr_.size (); i++)
+	Slur::add_column (end_slur_l_arr_[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_l_stack_.size (); i++)
     {
-      typeset_element (slur_l_stack_[i]);
+#if 0
+      typeset_grob (slur_l_stack_[i]);
+#else
+      /*
+	Let's not typeset unterminated stuff
+       */
+      slur_l_stack_[i]->suicide ();
+#endif     
     }
   slur_l_stack_.clear ();
-  if (!get_property ("weAreGraceContext",0).to_bool ())
-    for (int i=0; i < requests_arr_.size(); i++)
+
+  for (int i=0; i < requests_arr_.size (); i++)
       {
-	requests_arr_[i]->warning (_ ("unterminated slur"));
+	requests_arr_[i]->origin ()->warning (_ ("unterminated slur"));
       }
 }
 
 void
-Slur_engraver::do_process_requests()
+Slur_engraver::create_grobs ()
 {
-  Array<Slur*> start_slur_l_arr_;
-  for (int i=0; i< new_slur_req_l_arr_.size(); i++)
+  Link_array<Grob> start_slur_l_arr;
+  for (int i=0; i< new_slur_req_l_arr_.size (); i++)
     {
       Span_req* slur_req_l = new_slur_req_l_arr_[i];
       // end slur: move the slur to other array
-      if (slur_req_l->span_dir_ == STOP)
+      if (slur_req_l->get_span_dir () == STOP)
 	{
-	  if (slur_l_stack_.empty())
-
-	    slur_req_l->warning (_f ("Can't find both ends of %s", _("slur")));
+	  if (slur_l_stack_.empty ())
+	    /* How to shut up this warning, when Voice_devnull_engraver has
+	       eaten start request? */
+	    slur_req_l->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_l_stack_.pop ();
+	      SCM s = get_property ("slurEndAttachment");
+	      if (gh_symbol_p (s))
+		{
+		  index_set_cell (slur->get_grob_property ("attachment"), STOP, s);
+		}
+	      end_slur_l_arr_.push (slur);
+	      requests_arr_.pop ();
 	    }
 	}
-      else  if (slur_req_l->span_dir_ == START)
+      else  if (slur_req_l->get_span_dir () == START)
 	{
 	  // push a new slur onto stack.
-	  //(use temp. array to wait for all slur STOPs)
-	  Slur * s_p =new Slur;
-	  Scalar prop = get_property ("slurDash", 0);
-	  if (prop.isnum_b ()) 
-	    s_p->set_elt_property (dashed_scm_sym, gh_int2scm(prop));
-
-	  
+	  // (use temp. array to wait for all slur STOPs)
+	  Grob* slur = new Spanner (get_property ("Slur"));
+	  Slur::set_interface (slur); // cannot remove yet!
+	  SCM s = get_property ("slurBeginAttachment");
+	  if (gh_symbol_p (s))
+	    {
+	      index_set_cell (slur->get_grob_property ("attachment"), START, s);
+	    }
+	  start_slur_l_arr.push (slur);
 	  requests_arr_.push (slur_req_l);
-	  start_slur_l_arr_.push (s_p);
-	  announce_element (Score_element_info (s_p, slur_req_l));
+	  announce_grob(slur, slur_req_l->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_slur_l_arr.size (); i++)
+    slur_l_stack_.push (start_slur_l_arr[i]);
+  new_slur_req_l_arr_.clear ();
 }
 
 void
-Slur_engraver::do_pre_move_processing()
+Slur_engraver::stop_translation_timestep ()
 {
-  Scalar dir (get_property ("slurVerticalDirection", 0));
-  Scalar dir2 (get_property ("verticalDirection", 0));
-
-  Direction slurdir = CENTER;
-  if (dir.length_i () && dir.isnum_b ())
-    slurdir = (Direction) sign (int(dir));
-  else if (dir2.length_i () && dir2.isnum_b ())
-    slurdir = (Direction) sign (int (dir2));
-  
-  for (int i = 0; i < end_slur_l_arr_.size(); i++)
+  for (int i = 0; i < end_slur_l_arr_.size (); i++)
     {
-      end_slur_l_arr_[i]->dir_ = slurdir;
-      typeset_element (end_slur_l_arr_[i]);
+      typeset_grob (end_slur_l_arr_[i]);
     }
-  end_slur_l_arr_.clear();
+  end_slur_l_arr_.clear ();
 }
 
 void
-Slur_engraver::do_post_move_processing()
+Slur_engraver::start_translation_timestep ()
 {
-  new_slur_req_l_arr_.clear();
-  if (get_property ("automaticMelismata",0).to_bool ())
+  new_slur_req_l_arr_.clear ();
+  SCM m = get_property ("automaticMelismata");
+  if (to_boolean (m))
     {
       set_melisma (slur_l_stack_.size ());
     }
 }
 
 
-ADD_THIS_TRANSLATOR(Slur_engraver);
+
+ENTER_DESCRIPTION(Slur_engraver,
+/* descr */       "Build slurs from Slur_reqs",
+/* creats*/       "Slur",
+/* acks  */       "note-column-interface",
+/* reads */       "slurBeginAttachment slurEndAttachment slurMelismaBusy",
+/* write */       "");