* lily/context.cc (Context): take key argument in ctor.

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 044908680ce58da9a0c7cc65d7ecba694cb1b237..c2854e0330af4af32782593f7a9ce9fa2a6d7841 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -16,6 +16,7 @@
 #include "item.hh"
 #include "context.hh"
 #include "score-context.hh"
+#include "lilypond-key.hh"
 
 Engraver_group_engraver*
 Engraver::get_daddy_engraver () const
@@ -37,10 +38,6 @@ 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_property ("cause", cause);
 
@@ -56,14 +53,6 @@ Engraver::announce_grob (Grob* e, SCM cause)
 
 
  
-void
-Engraver::typeset_grob (Grob*p)
-{
-  Engraver *dad = get_daddy_engraver ();
-  if (dad)
-    dad->typeset_grob (p);
-}
-
 
 
 Engraver::Engraver ()
@@ -74,8 +63,18 @@ Engraver::Engraver ()
 Score_engraver* 
 Engraver::get_score_engraver () const
 {
-  SCM t = get_score_context ()->implementation_;
-  return dynamic_cast<Score_engraver*> (unsmob_translator (t));
+  return dynamic_cast<Score_engraver*> (get_score_context ()->implementation ());
+}
+
+
+Object_key const*
+Engraver::get_grob_key (String name) const
+{
+  Object_key * k = new Lilypond_grob_key (context()->get_key(),
+                                         now_mom(),
+                                         name);
+
+  return k;                                      
 }