release: 0.1.11

[lilypond.git] / lily / script-grav.cc

diff --git a/lily/script-grav.cc b/lily/script-grav.cc
index e33f121bb178eab8ba92e740ccf85bad5c0dc295..c9c1585612c6a97bc24e1cade0de10b5517615d0 100644 (file)
--- a/lily/script-grav.cc
+++ b/lily/script-grav.cc
@@ -12,76 +12,57 @@
 
 Script_engraver::Script_engraver()
 {
-    do_post_move_processing();
+  do_post_move_processing();
 }
 
 bool
-Script_engraver::do_try_request(Request *r_l)
+Script_engraver::do_try_request (Request *r_l)
 {
-    if (!r_l->musical() || ! r_l->musical()->musicalscript())
-       return false ;
-    
-    for (int i=0; i < script_req_l_arr_.size(); i++)
-       if ( !Script_req::compare(*script_req_l_arr_[i], *r_l->script())) {
-           return true;
-       }
+  if (!r_l->musical() || ! r_l->musical ()->musicalscript ())
+    return false ;
+  
+  for (int i=0; i < script_req_l_arr_.size(); i++) 
+    {
+      if (r_l->equal_b (script_req_l_arr_[i]))
+       return true;
        
-    script_req_l_arr_.push( r_l->script());
-    
-    return true;
-}
-
-void
-Script_engraver::do_process_requests()
-{
-    for (int i=0; i < script_req_l_arr_.size(); i++){
-       Script_req* l=script_req_l_arr_[i];
-       Script *p =new Script;
-       p->dir_i_ = l->dir_i_;
-       p->specs_l_ = l->scriptdef_p_;
-       script_p_arr_.push(p);
-       announce_element(Score_elem_info(p, l));
     }
-}
-
-bool
-Script_engraver::acceptable_elem_b(Score_elem*s_l)
-{
-    char const *nC = s_l->name();
-    return (nC == Stem::static_name());
+  script_req_l_arr_.push (r_l->script());
+  
+  return true;
 }
 
 void
-Script_engraver::acknowledge_element(Score_elem_info info)
+Script_engraver::do_process_requests()
 {
-    Score_elem *elem_l = info.elem_l_;
-    if (!acceptable_elem_b(elem_l))
-       return;
-    
-    for (int i=0; i < script_p_arr_.size(); i++) {
-       Script*script_l = script_p_arr_[i];
-       if (elem_l->name() == Stem::static_name())
-           script_l->set_stem((Stem*)elem_l->item());
+  for (int i=0; i < script_req_l_arr_.size(); i++)
+    {
+      Script_req* l=script_req_l_arr_[i];
+      Script *p =new Script;
+      p->dir_ = l->dir_;
+      p->specs_l_ = l->scriptdef_p_;
+      script_p_arr_.push (p);
+      announce_element (Score_elem_info (p, l));
     }
 }
 
 void
 Script_engraver::do_pre_move_processing()
 {
-    Staff_symbol* s_l = get_staff_info().staff_sym_l_;
-    for (int i=0; i < script_p_arr_.size(); i++) {
-       
-       Script*script_p = script_p_arr_[i];
-       script_p->set_staffsym( s_l);
-       typeset_element(script_p);
+  Staff_symbol* s_l = get_staff_info().staff_sym_l_;
+  for (int i=0; i < script_p_arr_.size(); i++) 
+    {
+      Script*script_p = script_p_arr_[i];
+      script_p->set_staffsym (s_l);
+      typeset_element (script_p);
     }
-    script_p_arr_.set_size(0);
+  script_p_arr_.clear();
 }
 
 void
 Script_engraver::do_post_move_processing()
 {
-    script_req_l_arr_.set_size(0);
+  script_req_l_arr_.clear();
 }