release: 0.0.78

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

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index bcfa32a034cf5942b57c4420d5309513648c3828..a1a77d7da1e604ef930d28494e5d169081d414f6 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -13,7 +13,9 @@
 #include "debug.hh"
 #include "p-score.hh"
 #include "score-elem.hh"
-#include "input-engraver.hh"
+#include "input-translator.hh"
+
+Engraver* get_engraver_p(String);
 
 Engraver_group_engraver::~Engraver_group_engraver()
 {
@@ -30,7 +32,6 @@ Engraver_group_engraver::check_removal()
        else 
            i++;
     }
-    
 }
 
 bool
@@ -41,16 +42,17 @@ Engraver_group_engraver::removable_b()const
 
 Engraver_group_engraver::Engraver_group_engraver()
 {
-    igrav_l_ =0;
+    itrans_l_ = 0;
 }
 
 void
 Engraver_group_engraver::set_feature(Feature d)
 {
-    iter_top(grav_list_, i);
+    PCursor<Engraver*> i(grav_list_.top());
+    // why the while construct?
     while (i.ok()) {
        // this construction to ensure clean deletion
-       Request_engraver *grav_l = i++; 
+       Engraver *grav_l = i++; 
        grav_l->set_feature(d);
     }
 }
@@ -58,10 +60,9 @@ Engraver_group_engraver::set_feature(Feature d)
 void
 Engraver_group_engraver::sync_features()
 {
-    iter_top(grav_list_, i);
+    PCursor<Engraver*> i(grav_list_.top());
     while (i.ok()) {
-
-       Request_engraver *grav_l = i++; 
+       Engraver *grav_l = i++; 
        grav_l->sync_features();
     }
 }
@@ -69,10 +70,9 @@ Engraver_group_engraver::sync_features()
 void
 Engraver_group_engraver::do_pre_move_processing()
 {
-    iter_top(grav_list_, i);
+    PCursor<Engraver*> i(grav_list_.top());
     while (i.ok()) {
-       
-       Request_engraver *grav_l = i++; 
+       Engraver *grav_l = i++; 
        grav_l->pre_move_processing();
     }
 }
@@ -80,10 +80,9 @@ Engraver_group_engraver::do_pre_move_processing()
 void
 Engraver_group_engraver::do_process_requests()
 {
-    iter_top(grav_list_, i);
+    PCursor<Engraver*> i(grav_list_.top());
     while (i.ok()) {
-       
-       Request_engraver *grav_l = i++; 
+       Engraver *grav_l = i++; 
        grav_l->process_requests();
     }
 }
@@ -92,24 +91,24 @@ Engraver_group_engraver::do_process_requests()
 void
 Engraver_group_engraver::do_post_move_processing()
 {
-    iter_top(grav_list_, i);
+    PCursor<Engraver*> i(grav_list_.top());
     while (i.ok()) {
                // this construction to ensure clean deletion
-       Request_engraver *grav_l = i++; 
+       Engraver *grav_l = i++; 
        grav_l->post_move_processing();
     }
 }
 
 
 bool
-Engraver_group_engraver::contains_b(Request_engraver* grav_l)const
+Engraver_group_engraver::contains_b(Engraver* grav_l)const
 {
-    bool parent_b = Request_engraver::contains_b(grav_l);
+    bool parent_b = Engraver::contains_b(grav_l);
     
     if (parent_b)
        return true;
-    for (iter_top(grav_list_, j); j.ok(); j++)
-       if (j->contains_b(grav_l))
+    for (PCursor<Engraver*> i(grav_list_.top()); i.ok(); i++)
+       if (i->contains_b(grav_l))
            return true;
     return false;
 }
@@ -122,13 +121,19 @@ Engraver_group_engraver::do_try_request(Request*req_l)
     bool hebbes_b =false;
     for (int i =0; !hebbes_b && i < nongroup_l_arr_.size() ; i++)
        hebbes_b =nongroup_l_arr_[i]->try_request(req_l);
-    if (!hebbes_b)
+    if (!hebbes_b && daddy_grav_l_)
        hebbes_b = daddy_grav_l_->try_request(req_l);
     return hebbes_b ;
 }
 
+bool
+Engraver_group_engraver::try_request(Request* r)
+{
+    return Engraver::try_request(r);
+}
+
 void
-Engraver_group_engraver::add(Request_engraver *grav_p)
+Engraver_group_engraver::add(Engraver *grav_p)
 {
     grav_list_.bottom().add(grav_p);
     grav_p->daddy_grav_l_ = this;
@@ -141,28 +146,28 @@ Engraver_group_engraver::add(Request_engraver *grav_p)
 }
 
 
-Request_engraver *
-Engraver_group_engraver::remove_engraver_p(Request_engraver*grav_l)
+Engraver *
+Engraver_group_engraver::remove_engraver_p(Engraver*grav_l)
 {
     group_l_arr_.substitute((Engraver_group_engraver*)grav_l,0);
     nongroup_l_arr_.substitute(grav_l,0);
-    iterator(grav_list_) grav_cur= grav_list_.find(grav_l);
+    PCursor<Engraver*> grav_cur( grav_list_.find(grav_l) );
     
     return grav_cur.remove_p();
 }
 
 void
-Engraver_group_engraver::terminate_engraver(Request_engraver*r_l)
+Engraver_group_engraver::terminate_engraver(Engraver*r_l)
 {
     mtor << "Removing " << r_l->name() << " at " << get_staff_info().when() << "\n";
     r_l->do_removal_processing();
-    Request_engraver * grav_p =remove_engraver_p(r_l);
+    Engraver * grav_p =remove_engraver_p(r_l);
     
     delete grav_p;
 }
 
-IMPLEMENT_IS_TYPE_B2(Engraver_group_engraver,Request_engraver, Translator);
-IMPLEMENT_STATIC_NAME(Engraver_group_engraver);
+IMPLEMENT_IS_TYPE_B2(Engraver_group_engraver,Engraver, Translator);
+
 ADD_THIS_ENGRAVER(Engraver_group_engraver);
 
 void
@@ -170,7 +175,7 @@ Engraver_group_engraver::do_print()const
 {
 #ifndef NPRINT
     mtor << "ID: " << id_str_ << "\n";
-    for (iter_top(grav_list_, i); i.ok(); i++) 
+    for (PCursor<Engraver*> i(grav_list_.top()); i.ok(); i++)
        i->print();
 #endif
 }
@@ -193,17 +198,17 @@ Translator*
 Engraver_group_engraver::find_get_translator_l(String n,String id)
 {
     Translator * ret=0;
-    Input_engraver * igrav_l= igrav_l_-> recursive_find ( n );
-    if (igrav_l ) {
+    Input_translator * itrans_l= itrans_l_-> recursive_find ( n );
+    if (itrans_l ) {
        ret = find_engraver_l(n,id);
        if (!ret) {
            Engraver_group_engraver * group = 
-               igrav_l-> get_group_engraver_p();
+               itrans_l-> get_group_engraver_p();
            
            add(group);
            ret = group;
            
-           if (group->igrav_l_->is_name_b( n ) )
+           if (group->itrans_l_->is_name_b( n ) )
                ret ->id_str_ = id;
            else
                return ret->find_get_translator_l(n,id);
@@ -237,7 +242,7 @@ void
 Engraver_group_engraver::announce_element(Score_elem_info info)
 {
     announce_info_arr_.push(info);
-    Request_engraver::announce_element(info);
+    Engraver::announce_element(info);
 }
 
 void
@@ -254,7 +259,7 @@ Engraver_group_engraver::do_announces()
        
        if (!info.req_l_)
            info.req_l_ = &dummy_req;
-       for (int i=0; i < nongroup_l_arr_.size(); i++) {
+       for (int i=0; i < nongroup_l_arr_.size(); i++) {        // Is this good enough?6
           if (nongroup_l_arr_[i] != info.origin_grav_l_arr_[0])
               nongroup_l_arr_[i]->acknowledge_element(info);
        }
@@ -266,14 +271,14 @@ Engraver_group_engraver::do_announces()
 void
 Engraver_group_engraver::do_removal_processing()
 {
-    for (iter( grav_list_.top(), i); i.ok(); i++)
+    for (PCursor<Engraver*> i(grav_list_.top()); i.ok(); i++)
        i->do_removal_processing();
 }
 
 Staff_info
 Engraver_group_engraver::get_staff_info()const
 {
-    Staff_info inf = Request_engraver::get_staff_info();
+    Staff_info inf = Engraver::get_staff_info();
 
     for (int i=0; i < nongroup_l_arr_.size(); i++)
        nongroup_l_arr_[i]->fill_staff_info(inf);
@@ -284,14 +289,21 @@ Engraver_group_engraver::get_staff_info()const
 Translator*
 Engraver_group_engraver::get_default_interpreter()
 {
-    if ( interpreter_l() )
+    // ? 
+    if ( is_bottom_engraver_b() )
        return daddy_grav_l_->get_default_interpreter();
 
-    Engraver_group_engraver *grav_p= igrav_l_->
-       get_default_igrav_l()->get_group_engraver_p();
+    Engraver_group_engraver *grav_p= itrans_l_->
+       get_default_itrans_l()->get_group_engraver_p();
     add(grav_p );
-    if (grav_p->interpreter_l())
+    if (grav_p->is_bottom_engraver_b())
        return grav_p;
     else
        return grav_p->get_default_interpreter();
 }
+
+bool
+Engraver_group_engraver::is_bottom_engraver_b()const
+{
+    return !itrans_l_->get_default_itrans_l();
+}