release: 1.1.0

[lilypond.git] / lily / auto-plet-engraver.cc

diff --git a/lily/auto-plet-engraver.cc b/lily/auto-plet-engraver.cc
index 8812f6245c4e728e5563f31faffcbc0612a9d0ca..254f029f59a6b5e9e554f2e840bb3880fc5c3026 100644 (file)
--- a/lily/auto-plet-engraver.cc
+++ b/lily/auto-plet-engraver.cc
@@ -9,30 +9,29 @@
 
 #include "auto-plet-engraver.hh"
 #include "command-request.hh"
-#include "slur.hh"
+#include "plet-spanner.hh"
 #include "note-column.hh"
 
 bool
 Tuplet_engraver::do_try_request (Request *r)
 {
-  Command_req * c = r->access_Command_req ();
+  Command_req * c = dynamic_cast <Command_req *> (r);
   if (!(c &&
-      c->access_Bracket_req ()))
+      dynamic_cast <Bracket_req *> (c)))
     {
       return false;
     }
 
-  Bracket_req * b = c->access_Bracket_req ();
+  Bracket_req * b = dynamic_cast <Bracket_req *> (c);
   bracket_req_arr_.push (b);
   return true;
 }
 
-
 void
 Tuplet_engraver::do_process_requests ()
 {
   int stopcount =0;
-  Link_array<Slur> start_arr;
+  Link_array<Plet_spanner> start_arr;
   
   for (int i=0; i < bracket_req_arr_.size (); i++)
     {
@@ -40,16 +39,17 @@ Tuplet_engraver::do_process_requests ()
        stopcount++;
       if (bracket_req_arr_[i]->spantype == Span_req::START)
        {
-         Slur *sp =new Slur;
-         start_arr.push  (sp);
-         announce_element (Score_element_info (sp, bracket_req_arr_[i]));
+         Plet_spanner* glep = new Plet_spanner ();
+         start_arr.push  (glep);
+// lots of stuff does info->elem_l_->is_type ()
+//       announce_element (Score_element_info (glep, bracket_req_arr_[i]));
        }
     }
 
   for (; stopcount--; )
     {
-      Slur *sp = started_span_p_arr_.pop ();
-      stop_now_span_p_arr_.push (sp);
+      Plet_spanner* glep = started_span_p_arr_.pop ();
+      stop_now_span_p_arr_.push (glep);
     }
 
   for (int i=0; i < start_arr.size (); i++)
@@ -61,9 +61,10 @@ Tuplet_engraver::acknowledge_element (Score_element_info i)
 {
   if (i.elem_l_->is_type_b (Note_column::static_name ()))
     {
-      Note_column *nc = (Note_column*)i.elem_l_->access_Item ();
+      Note_column *nc = (Note_column*)dynamic_cast <Item *> (i.elem_l_);
       for (int j =0; j  <started_span_p_arr_.size (); j++)
-       started_span_p_arr_[j]->add_column (nc);
+       // started_span_p_arr_[j]->add_column (nc);
+       ;
     }
 }