(scm_from_double): more compat glue.

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 2badb89cd66a5614f16752bf0b5a1a3857c5004a..5f83295e18e8135c77b7bb95540b6b080ff70e3f 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -14,13 +14,22 @@
 #include "warn.hh"
 #include "spanner.hh"
 #include "item.hh"
+#include "context.hh"
+#include "score-context.hh"
+
+Engraver_group_engraver*
+Engraver::get_daddy_engraver () const
+{
+  return dynamic_cast<Engraver_group_engraver*> (get_daddy_translator ());
+}
 
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  get_daddy_grav ()->announce_grob (inf);
+  get_daddy_engraver ()->announce_grob (inf);
 }
 
+
 /*
   CAUSE is the object (typically a Music object)  that
   was the reason for making E.
@@ -28,72 +37,36 @@ Engraver::announce_grob (Grob_info inf)
 void
 Engraver::announce_grob (Grob* e, SCM cause)
 {
-  /*
-    TODO: junk grob-info, and make a cause grob-property to store
-    `causes' generically.
-  */
   if (unsmob_music (cause) || unsmob_grob (cause))
-    e->set_grob_property ("cause", cause);
+    e->set_property ("cause", cause);
 
   Grob_info i;
   i.grob_ = e;
   if (!i.origin_trans_)
     i.origin_trans_ = this;
 
-
-
-  get_daddy_grav ()->announce_grob (i);
+  Engraver * g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
  
-void
-Engraver::typeset_grob (Grob*p)
-{
-  get_daddy_grav ()->typeset_grob (p);
-}
 
 
-Engraver_group_engraver*
-Engraver::get_daddy_grav () const
-{
-  return (daddy_trans_)
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_)
-       : 0;
-}
-
-void
-Engraver::process_music ()
-{
-  
-}
-
-Item*
-Engraver::internal_make_item (SCM x)
-{
-  SCM props = internal_get_property (x);
-  return new Item (props);
-}
-
-Spanner*
-Engraver::internal_make_spanner (SCM x)
-{
-  SCM props = internal_get_property (x);
-  return new Spanner (props);
-}
-
-Engraver::Engraver()
+Engraver::Engraver ()
 {
 }
 
 
 Score_engraver* 
-Engraver::top_engraver () const
+Engraver::get_score_engraver () const
 {
-  return dynamic_cast<Score_engraver*> (top_translator());
+  return dynamic_cast<Score_engraver*> (get_score_context ()->implementation ());
 }
 
-ENTER_DESCRIPTION(Engraver,
+
+ENTER_DESCRIPTION (Engraver,
                   "", "",
                  "",
                  "", "", "");