* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 886f3b199b2782728c7b98babfc546475862cd2c..e1d1ddf50b4707dddf081b1b23e3ad5a9dc7f7cc 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -6,16 +6,16 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "grob.hh"
+
+#include "music.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
 #include "spanner.hh"
 #include "item.hh"
 #include "context.hh"
 #include "score-context.hh"
+#include "lilypond-key.hh"
 
 Engraver_group_engraver*
 Engraver::get_daddy_engraver () const
@@ -37,10 +37,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);
 
@@ -49,18 +45,13 @@ Engraver::announce_grob (Grob* e, SCM cause)
   if (!i.origin_trans_)
     i.origin_trans_ = this;
 
-  get_daddy_engraver ()->announce_grob (i);
+  Engraver * g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
  
-void
-Engraver::typeset_grob (Grob*p)
-{
-  Engraver *dad = get_daddy_engraver ();
-  dad->typeset_grob (p);
-}
-
 
 
 Engraver::Engraver ()
@@ -71,8 +62,7 @@ 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 ());
 }