release: 1.0.16

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

diff --git a/lily/auto-plet-engraver.cc b/lily/auto-plet-engraver.cc
index 3ed45b2a46eb6390d17a60a4e1bf0f847f0b708d..8812f6245c4e728e5563f31faffcbc0612a9d0ca 100644 (file)
--- a/lily/auto-plet-engraver.cc
+++ b/lily/auto-plet-engraver.cc
@@ -9,7 +9,7 @@
 
 #include "auto-plet-engraver.hh"
 #include "command-request.hh"
-#include "graphical-lisp-element.hh"
+#include "slur.hh"
 #include "note-column.hh"
 
 bool
@@ -27,11 +27,12 @@ Tuplet_engraver::do_try_request (Request *r)
   return true;
 }
 
+
 void
 Tuplet_engraver::do_process_requests ()
 {
   int stopcount =0;
-  Link_array<Graphical_lisp_element> start_arr;
+  Link_array<Slur> start_arr;
   
   for (int i=0; i < bracket_req_arr_.size (); i++)
     {
@@ -39,17 +40,16 @@ Tuplet_engraver::do_process_requests ()
        stopcount++;
       if (bracket_req_arr_[i]->spantype == Span_req::START)
        {
-         Graphical_lisp_element* glep = new Graphical_lisp_element ("tuplet");
-         start_arr.push  (glep);
-// lots of stuff does info->elem_l_->is_type ()
-//       announce_element (Score_element_info (glep, bracket_req_arr_[i]));
+         Slur *sp =new Slur;
+         start_arr.push  (sp);
+         announce_element (Score_element_info (sp, bracket_req_arr_[i]));
        }
     }
 
   for (; stopcount--; )
     {
-      Graphical_lisp_element* glep = started_span_p_arr_.pop ();
-      stop_now_span_p_arr_.push (glep);
+      Slur *sp = started_span_p_arr_.pop ();
+      stop_now_span_p_arr_.push (sp);
     }
 
   for (int i=0; i < start_arr.size (); i++)
@@ -63,8 +63,7 @@ Tuplet_engraver::acknowledge_element (Score_element_info i)
     {
       Note_column *nc = (Note_column*)i.elem_l_->access_Item ();
       for (int j =0; j  <started_span_p_arr_.size (); j++)
-//     started_span_p_arr_[j]->add_column (nc);
-       started_span_p_arr_[j]->call ("add-column", (void*)nc);
+       started_span_p_arr_[j]->add_column (nc);
     }
 }