patch::: 1.4.0.jcn4

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 2ccf33506924ee75afc90f7ccff9c9f2ea6985e2..02e683b05501f8dfea9bdc53e159e514c1914af8 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,62 +1,56 @@
 /*
   engraver.cc -- implement Engraver
 
-  Sourcefile of GNU LilyPond musictypesetter
+  Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--1998 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"
-
-void
-Engraver::fill_staff_info (Staff_info&)
-{
-  
-}
+#include "engraver-group-engraver.hh"
+#include "grob.hh"
 
 
 void
-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
-Engraver::typeset_element (Score_elem*p)
-{
-  daddy_grav_l()->typeset_element (p);
-}
-
-Paper_def*
-Engraver::paper() const
+Engraver::announce_grob (Grob* e, Music *m)
 {
-  return (Paper_def*)output_def_l_;
+  if (m && 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);
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Engraver, Translator);
-
-
 Engraver_group_engraver*
 Engraver::daddy_grav_l () const
 {
-  return (daddy_trans_l_ )
-       ? (Engraver_group_engraver*) daddy_trans_l_->engraver_l ()
+  return (daddy_trans_l_)
+       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
        : 0;
 }
+
+void
+Engraver::process_music ()
+{
+  
+}