release: 1.5.10

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index fde31b7593f54abe840fc86a04bf7a17c3120836..9059624ce660f249c0ea9b2e6a1c860f65821161 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,63 +1,58 @@
 /*
   engraver.cc -- implement Engraver
 
-  Sourcefile of GNU LilyPond musictypesetter
+  Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.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 "paper-def.hh"
-
-void
-Engraver::fill_staff_info (Staff_info&)
-{
-  
-}
+#include "engraver-group-engraver.hh"
+#include "grob.hh"
+#include "main.hh"
 
 
 void
-Engraver::announce_element (Score_element_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
-Engraver::typeset_element (Score_element*p)
+Engraver::announce_grob (Grob* e, Music *m)
 {
-  daddy_grav_l()->typeset_element (p);
-}
-
-
-Paper_def*
-Engraver::paper_l () const
-{
-  return dynamic_cast<Paper_def*>(output_def_l_);
+  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);
 }
 
 
-Staff_info
-Engraver::get_staff_info() const
+ 
+void
+Engraver::typeset_grob (Grob*p)
 {
-  if (daddy_grav_l())
-    return daddy_grav_l()->get_staff_info();
-  Staff_info info;
-  return info;
+  daddy_grav_l ()->typeset_grob (p);
 }
 
 
-
-
-
 Engraver_group_engraver*
 Engraver::daddy_grav_l () const
 {
-  return (daddy_trans_l_ )
+  return (daddy_trans_l_)
        ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
        : 0;
 }
+
+void
+Engraver::process_music ()
+{
+  
+}