* lily/slur-scoring.cc (get_bound_info): robustness: substitute

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 87cb246d6f201f4564354e0612ebbe6ebbbf819e..88985792dc877ef119b6b27f0d8d63bc58e3cf20 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,24 +3,24 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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_group_engraver *
 Engraver::get_daddy_engraver () const
 {
-  return dynamic_cast<Engraver_group_engraver*> (get_daddy_translator ());
+  return dynamic_cast<Engraver_group_engraver *> (get_daddy_translator ());
 }
 
 void
@@ -29,55 +29,38 @@ Engraver::announce_grob (Grob_info inf)
   get_daddy_engraver ()->announce_grob (inf);
 }
 
-
 /*
   CAUSE is the object (typically a Music object)  that
   was the reason for making E.
- */
+*/
 void
-Engraver::announce_grob (Grob* e, SCM cause)
+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_engraver ()->announce_grob (i);
-}
-
-
- 
-void
-Engraver::typeset_grob (Grob*p)
-{
-  Engraver *dad = get_daddy_engraver ();
-  dad->typeset_grob (p);
+  Engraver *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
-
-
-Engraver::Engraver()
+Engraver::Engraver ()
 {
 }
 
-
-Score_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 ());
 }
 
-
-ENTER_DESCRIPTION(Engraver,
-                  "", "",
-                 "",
-                 "", "", "");
+ADD_TRANSLATOR (Engraver,
+               "", "",
+               "",
+               "", "", "");