release: 1.1.43

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 24a87c81e6da5240b78e11cd2ce3c75d16b94ffa..ed1462a58493693b8c88e262c9eb29977c89b3e6 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -1,11 +1,10 @@
 /*
   slur-grav.cc -- implement Slur_engraver
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "proto.hh"
-#include "plist.hh"
 #include "musical-request.hh"
 #include "slur-engraver.hh"
 #include "slur.hh"
@@ -15,10 +14,11 @@
 bool
 Slur_engraver::do_try_music (Music *req_l)
 {
-  Musical_req *mus_l = dynamic_cast <Musical_req *> (req_l);
-  if (Slur_req *sl = dynamic_cast <Slur_req *> (mus_l))
+  if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
     {
-      new_slur_req_l_arr_.push (dynamic_cast <Slur_req *> (mus_l));
+      if (sl->span_type_str_ != "slur")
+       return false;
+      new_slur_req_l_arr_.push (sl);
       return true;
     }
   return false;
@@ -57,9 +57,9 @@ Slur_engraver::do_process_requests()
   Array<Slur*> start_slur_l_arr_;
   for (int i=0; i< new_slur_req_l_arr_.size(); i++)
     {
-      Slur_req* slur_req_l = new_slur_req_l_arr_[i];
+      Span_req* slur_req_l = new_slur_req_l_arr_[i];
       // end slur: move the slur to other array
-      if (slur_req_l->spantype == Span_req::STOP)
+      if (slur_req_l->span_dir_ == STOP)
        {
          if (slur_l_stack_.empty())
 
@@ -70,14 +70,15 @@ Slur_engraver::do_process_requests()
              requests_arr_.pop();
            }
        }
-      else  if (slur_req_l->spantype == Span_req::START)
+      else  if (slur_req_l->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");
+         Scalar prop = get_property ("slurdash", 0);
          if (prop.isnum_b ()) 
-           s_p->dash_i_ = prop;
+           s_p->set_elt_property (dashed_scm_sym, gh_int2scm(prop));
+
          requests_arr_.push (slur_req_l);
          start_slur_l_arr_.push (s_p);
          announce_element (Score_element_info (s_p, slur_req_l));
@@ -90,8 +91,8 @@ Slur_engraver::do_process_requests()
 void
 Slur_engraver::do_pre_move_processing()
 {
-  Scalar dir (get_property ("slurydirection"));
-  Scalar dir2 (get_property ("ydirection"));
+  Scalar dir (get_property ("slurydirection", 0));
+  Scalar dir2 (get_property ("ydirection", 0));
 
   Direction slurdir = CENTER;
   if (dir.length_i () && dir.isnum_b ())