release: 1.1.0

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 5ccf0386f6ea9b5a70fc84307930f69a4dcb8145..e7447b74320e71ba59d6c1c93d3ea2d0316eb746 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -15,11 +15,11 @@
 bool
 Slur_engraver::do_try_request (Request *req_l)
 {
-  Musical_req *mus_l = req_l->access_Musical_req ();
-  if (!mus_l || !mus_l->access_Slur_req ())
+  Musical_req *mus_l = dynamic_cast <Musical_req *> (req_l);
+  if (!mus_l || !dynamic_cast <Slur_req *> (mus_l))
     return false;
 
-  new_slur_req_l_arr_.push (mus_l->access_Slur_req ());
+  new_slur_req_l_arr_.push (dynamic_cast <Slur_req *> (mus_l));
   return true;
 }
 
@@ -28,7 +28,7 @@ Slur_engraver::acknowledge_element (Score_element_info info)
 {
   if (info.elem_l_->is_type_b (Note_column::static_name ()))
     {
-      Note_column *col_l =(Note_column*) info.elem_l_->access_Item() ;// ugh
+      Note_column *col_l =(Note_column*) dynamic_cast <Item *> (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++)
@@ -50,13 +50,6 @@ Slur_engraver::do_removal_processing ()
     }
 }
 
-/*
-  abracadabra
-  */
-Slur_engraver::Slur_engraver()
-{
-  dir_ =CENTER;
-}
 void
 Slur_engraver::do_process_requests()
 {
@@ -98,17 +91,16 @@ Slur_engraver::do_pre_move_processing()
 {
   Scalar dir (get_property ("slurydirection"));
   Scalar dir2 (get_property ("ydirection"));
-  if (!dir.length_i () && dir2.length_i ())
-    {
-        dir_ = (Direction) int(dir2);
-    }
-  else if (dir.length_i ())
-    dir_ = (Direction) int (dir);
+
+  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++)
     {
-      if (dir_)
-       end_slur_l_arr_[i]->dir_ = dir_;
+      end_slur_l_arr_[i]->dir_ = slurdir;
       typeset_element (end_slur_l_arr_[i]);
     }
   end_slur_l_arr_.clear();