release: 1.5.10

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 78fa6ca6235ce2e307aa74d82b35b9e5bc2121fd..9059624ce660f249c0ea9b2e6a1c860f65821161 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,137 +1,58 @@
 /*
-  engraver.cc -- implement Request_engraver
+  engraver.cc -- implement Engraver
 
-  Sourcefile of GNU LilyPond musictypesetter
+  Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "music-list.hh"
-#include "musical-request.hh"
+#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group.hh"
-#include "debug.hh"
+#include "engraver-group-engraver.hh"
+#include "grob.hh"
+#include "main.hh"
 
-void
-Request_engraver::post_move_processing()
-{
-        
-    if (status < CREATION_INITED) {
-       do_creation_processing();
-       status = CREATION_INITED;
-    }
-    if (status >= MOVE_INITED)
-       return;
-
-    do_post_move_processing();
-    status = MOVE_INITED;
-}
-
-bool
-Request_engraver::try_request(Request * r)
-{
-    if (status < MOVE_INITED)
-       post_move_processing();
-
-    return do_try_request(r);
-}
-
-void
-Request_engraver::process_requests()
-{
-    if (status < PROCESSED_REQS)
-       post_move_processing();
-    else if (status >= PROCESSED_REQS)
-       return; 
-    
-    status = PROCESSED_REQS;
-    do_process_requests();
-}
-
-void
-Request_engraver::pre_move_processing()
-{
-    do_pre_move_processing();
-    status = CREATION_INITED;
-}
-
-void
-Request_engraver::fill_staff_info(Staff_info&)
-{
-    
-}
-
-Scalar
-Request_engraver::get_feature(String t)
-{
-    return daddy_grav_l_->get_feature(t);
-}
-
-bool
-Request_engraver::do_try_request(Request*)
-{
-    return false;
-}
-
-Request_engraver::Request_engraver()
-{
-    status = VIRGIN;
-    daddy_grav_l_ = 0;
-}
 
 void
-Request_engraver::announce_element(Score_elem_info i)
+Engraver::announce_grob (Grob_info inf)
 {
-    i.origin_grav_l_arr_.push(this);
-    daddy_grav_l_->announce_element(i);
+  daddy_grav_l ()->announce_grob (inf);
 }
 
 void
-Request_engraver::typeset_element(Score_elem*p)
+Engraver::announce_grob (Grob* e, Music *m)
 {
-    daddy_grav_l_->typeset_element(p);
+  if (m && store_locations_global_b 
+      && m->origin ()->location_str ().length_i ())
+    {
+      e->set_grob_property ("origin", m->get_mus_property ("origin"));
+    }
+  
+  Grob_info i (e, m);
+  if (!i.origin_trans_l_)
+    i.origin_trans_l_ = this;
+  daddy_grav_l ()->announce_grob (i);
 }
 
-Paper_def*
-Request_engraver::paper()const
-{
-    return daddy_grav_l_->paper();
-}
 
+ 
 void
-Request_engraver::typeset_breakable_item(Item * nobreak_p)
+Engraver::typeset_grob (Grob*p)
 {
-    daddy_grav_l_->typeset_breakable_item(nobreak_p);
+  daddy_grav_l ()->typeset_grob (p);
 }
 
-bool
-Request_engraver::contains_b(Request_engraver *grav_l)const
-{
-    return this == grav_l;
-}
-
-Staff_info
-Request_engraver::get_staff_info() const
-{
-    return daddy_grav_l_->get_staff_info();
-}
 
-void
-Request_engraver::print() const
+Engraver_group_engraver*
+Engraver::daddy_grav_l () const
 {
-#ifndef NPRINT
-    mtor << "\n" << name() << " {";
-    do_print();
-    mtor << "}";
-#endif
+  return (daddy_trans_l_)
+       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
+       : 0;
 }
 
-IMPLEMENT_STATIC_NAME(Request_engraver);
-IMPLEMENT_IS_TYPE_B(Request_engraver);
-
 void
-Request_engraver::do_print()const
+Engraver::process_music ()
 {
+  
 }
-
-