release: 0.1.12

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 78fa6ca6235ce2e307aa74d82b35b9e5bc2121fd..11ac18d61e62230e57f1842ca16a6e0df1a428ec 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,5 +1,5 @@
 /*
-  engraver.cc -- implement Request_engraver
+  engraver.cc -- implement Engraver
 
   Sourcefile of GNU LilyPond musictypesetter
 
@@ -13,125 +13,130 @@
 #include "debug.hh"
 
 void
-Request_engraver::post_move_processing()
+Engraver::post_move_processing()
 {
-        
-    if (status < CREATION_INITED) {
+  if (status < CREATION_INITED) 
+    {
        do_creation_processing();
        status = CREATION_INITED;
     }
-    if (status >= MOVE_INITED)
+  if (status >= MOVE_INITED)
        return;
 
-    do_post_move_processing();
-    status = MOVE_INITED;
+  do_post_move_processing();
+  status = MOVE_INITED;
+}
+
+void
+Engraver::removal_processing()
+{
+  if (status < CREATION_INITED)
+       do_creation_processing();
+  
+  do_removal_processing();
 }
 
 bool
-Request_engraver::try_request(Request * r)
+Engraver::try_request (Request * r)
 {
-    if (status < MOVE_INITED)
+  if (status < MOVE_INITED)
        post_move_processing();
 
-    return do_try_request(r);
+  return do_try_request (r);
 }
 
 void
-Request_engraver::process_requests()
+Engraver::process_requests()
 {
-    if (status < PROCESSED_REQS)
+  if (status < PROCESSED_REQS)
        post_move_processing();
-    else if (status >= PROCESSED_REQS)
+  else if (status >= PROCESSED_REQS)
        return; 
-    
-    status = PROCESSED_REQS;
-    do_process_requests();
+  
+  status = PROCESSED_REQS;
+  do_process_requests();
 }
 
 void
-Request_engraver::pre_move_processing()
+Engraver::pre_move_processing()
 {
-    do_pre_move_processing();
-    status = CREATION_INITED;
+  do_pre_move_processing();
+  status = CREATION_INITED;
 }
 
 void
-Request_engraver::fill_staff_info(Staff_info&)
+Engraver::fill_staff_info (Staff_info&)
 {
-    
+  
 }
 
 Scalar
-Request_engraver::get_feature(String t)
+Engraver::get_feature (String t)
 {
-    return daddy_grav_l_->get_feature(t);
+  return daddy_grav_l_->get_feature (t);
 }
 
 bool
-Request_engraver::do_try_request(Request*)
+Engraver::do_try_request (Request*)
 {
-    return false;
+  return false;
 }
 
-Request_engraver::Request_engraver()
+Engraver::Engraver()
 {
-    status = VIRGIN;
-    daddy_grav_l_ = 0;
+  status = VIRGIN;
+  daddy_grav_l_ = 0;
 }
 
 void
-Request_engraver::announce_element(Score_elem_info i)
+Engraver::announce_element (Score_elem_info i)
 {
-    i.origin_grav_l_arr_.push(this);
-    daddy_grav_l_->announce_element(i);
+  i.origin_grav_l_arr_.push (this);
+  daddy_grav_l_->announce_element (i);
 }
 
 void
-Request_engraver::typeset_element(Score_elem*p)
+Engraver::typeset_element (Score_elem*p)
 {
-    daddy_grav_l_->typeset_element(p);
+  daddy_grav_l_->typeset_element (p);
 }
 
 Paper_def*
-Request_engraver::paper()const
+Engraver::paper() const
 {
-    return daddy_grav_l_->paper();
-}
-
-void
-Request_engraver::typeset_breakable_item(Item * nobreak_p)
-{
-    daddy_grav_l_->typeset_breakable_item(nobreak_p);
+  return daddy_grav_l_->paper();
 }
 
 bool
-Request_engraver::contains_b(Request_engraver *grav_l)const
+Engraver::contains_b (Engraver *grav_l) const
 {
-    return this == grav_l;
+  return this == grav_l;
 }
 
 Staff_info
-Request_engraver::get_staff_info() const
+Engraver::get_staff_info() const
 {
+  if (daddy_grav_l_)
     return daddy_grav_l_->get_staff_info();
+  Staff_info info;
+  return info;
 }
 
 void
-Request_engraver::print() const
+Engraver::print() const
 {
 #ifndef NPRINT
-    mtor << "\n" << name() << " {";
-    do_print();
-    mtor << "}";
+  DOUT << "\n" << name() << " {";
+  do_print();
+  DOUT << "}";
 #endif
 }
 
-IMPLEMENT_STATIC_NAME(Request_engraver);
-IMPLEMENT_IS_TYPE_B(Request_engraver);
+
+IMPLEMENT_IS_TYPE_B(Engraver);
 
 void
-Request_engraver::do_print()const
+Engraver::do_print() const
 {
 }
 
-