release: 1.3.107

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 8cd767edcd94f619e5e3a0e00148aff526a4c0c3..d159020b82e1e47a7c16dd1f154788e65aa777f4 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -4,7 +4,6 @@
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
 #include "musical-request.hh"
 #include "slur-engraver.hh"
 #include "slur.hh"
@@ -14,13 +13,16 @@
 #include "engraver.hh"
 #include "spanner.hh"
 
-class Slur_engraver :public Engraver {
+class Slur_engraver : public Engraver
+{
   Link_array<Span_req> requests_arr_;
   Link_array<Span_req> new_slur_req_l_arr_;
   Link_array<Score_element> slur_l_stack_;
   Link_array<Score_element> end_slur_l_arr_;
+  Moment last_start_;
 
   void set_melisma (bool);
+
 protected:
   virtual bool do_try_music (Music*);
   virtual void do_process_music ();
@@ -31,19 +33,55 @@ protected:
 
 public:
   VIRTUAL_COPY_CONS (Translator);
-  
+  Slur_engraver ();
 };
 
+Slur_engraver::Slur_engraver ()
+{
+  last_start_ = Moment (-1);
+}
+
 bool
 Slur_engraver::do_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;
 }
@@ -72,7 +110,14 @@ Slur_engraver::do_removal_processing ()
 {
   for (int i = 0; i < slur_l_stack_.size (); i++)
     {
+#if 0
       typeset_element (slur_l_stack_[i]);
+#else
+      /*
+       Let's not typeset unterminated stuff
+       */
+      slur_l_stack_[i]->suicide ();
+#endif     
     }
   slur_l_stack_.clear ();
   SCM wg = get_property ("weAreGraceContext");
@@ -80,23 +125,22 @@ Slur_engraver::do_removal_processing ()
   if (!wgb)
     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_music ()
 {
-  Link_array<Score_element> start_slur_l_arr_;
+  Link_array<Score_element> 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")));
+           slur_req_l->origin ()->warning (_f ("can't find start of slur"));
          else
            {
              Score_element* slur = slur_l_stack_.pop ();
@@ -109,24 +153,24 @@ Slur_engraver::do_process_music ()
              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)
-         Score_element* slur = new Spanner (get_property ("basicSlurProperties"));
+         Score_element* slur = new Spanner (get_property ("Slur"));
          Slur::set_interface (slur);
          SCM s = get_property ("slurBeginAttachment");
          if (gh_symbol_p (s))
            {
              index_set_cell (slur->get_elt_property ("attachment"), START, s);
            }
-         start_slur_l_arr_.push (slur);
+         start_slur_l_arr.push (slur);
          requests_arr_.push (slur_req_l);
-         announce_element (Score_element_info (slur, slur_req_l));
+         announce_element (slur, slur_req_l);
        }
     }
-  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]);
 }
 
 void