lilypond-0.0.77.jcn1

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 224a86ac4fd13dfbc55ff99b5a164c27fe996211..50a3c605684e7c6c18aada6963bd4912dbbb979b 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -121,7 +121,7 @@ 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 ;
 }
@@ -167,7 +167,7 @@ Engraver_group_engraver::terminate_engraver(Engraver*r_l)
 }
 
 IMPLEMENT_IS_TYPE_B2(Engraver_group_engraver,Engraver, Translator);
-IMPLEMENT_STATIC_NAME(Engraver_group_engraver);
+
 ADD_THIS_ENGRAVER(Engraver_group_engraver);
 
 void

diff --git a/lily/score-align-grav.cc b/lily/score-align-grav.cc
index 7f315bcc39276de7069dc6658d797139beaf9bf6..f2845632370734786745c9cfb477d3f80966dc0f 100644 (file)
--- a/lily/score-align-grav.cc
+++ b/lily/score-align-grav.cc
@@ -42,5 +42,4 @@ Score_align_engraver::acknowledge_element(Score_elem_info inf)
     
 }
 
-IMPLEMENT_STATIC_NAME(Score_align_engraver)
 IMPLEMENT_IS_TYPE_B1(Score_align_engraver,Engraver);

diff --git a/lily/score-align-gravs.cc b/lily/score-align-gravs.cc
index 236ca211ef9b22f99bb4bac563fa81eb11cf793b..9c92ce3af4726142e04f35d6112274f62ba22bf6 100644 (file)
--- a/lily/score-align-gravs.cc
+++ b/lily/score-align-gravs.cc
@@ -21,7 +21,6 @@ public:                                                                       \
     { type_ch_C_ = T::static_name();\
     priority_i_ = p;}  \
 };                                                                     \
-IMPLEMENT_STATIC_NAME(C ## _align_engraver)    ;                       \
 ADD_THIS_ENGRAVER(C ## _align_engraver);                               \
 IMPLEMENT_IS_TYPE_B1(C ## _align_engraver, Score_align_engraver)       ;
 

diff --git a/lily/score-grav.cc b/lily/score-grav.cc
index bcec7e71fb0faa44a4f660cc7f4595f9d8787743..8c31c827c7f5b8399dba99c9dbf4768617286165 100644 (file)
--- a/lily/score-grav.cc
+++ b/lily/score-grav.cc
@@ -55,6 +55,9 @@ Score_engraver::prepare(Moment w)
 void
 Score_engraver::finish()
 {
+    if ( (breaks_i_%8))
+           *mlog << "[" << breaks_i_ << "]" << flush;
+   
     check_removal();
     do_removal_processing();
 }
@@ -198,16 +201,13 @@ Score_engraver::paper()const
 bool
 Score_engraver::do_try_request(Request*r)
 {
-    bool gotcha = false;  
-    for ( int i =0; !gotcha && i < nongroup_l_arr_.size() ; i++)
-       gotcha = nongroup_l_arr_[i]->try_request(r);
-  
-    if ( r->command() && r->command()->disallowbreak())
+    bool gotcha = Engraver_group_engraver::do_try_request(r);  
+    if ( !gotcha && r->command() && r->command()->disallowbreak())
            disallow_break_b_ = true;
     return gotcha;
 }
 
 IMPLEMENT_IS_TYPE_B1(Score_engraver,Engraver_group_engraver);
-IMPLEMENT_STATIC_NAME(Score_engraver);
+
 ADD_THIS_ENGRAVER(Score_engraver);