release commit

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 90027d1309fa9a68472422174dc1a23cae29f804..044908680ce58da9a0c7cc65d7ecba694cb1b237 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,41 +3,55 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (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 "main.hh"
 #include "score-engraver.hh"
 #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)
 {
-  daddy_grav_l ()->announce_grob (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, Music *m)
+Engraver::announce_grob (Grob* e, SCM cause)
 {
   /*
     TODO: junk grob-info, and make a cause grob-property to store
     `causes' generically.
   */
-  
-  if (m && store_locations_global_b 
-      && m->origin ()->location_str ().length_i ())
-    {
-      e->set_grob_property ("origin", m->get_mus_property ("origin"));
-    }
-  
-  Grob_info i (e, m ? m->self_scm () : SCM_UNDEFINED);
-  if (!i.origin_trans_l_)
-    i.origin_trans_l_ = this;
-  daddy_grav_l ()->announce_grob (i);
+  if (unsmob_music (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
+
+  Grob_info i;
+  i.grob_ = e;
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
+
+  Engraver * g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
@@ -45,45 +59,28 @@ Engraver::announce_grob (Grob* e, Music *m)
 void
 Engraver::typeset_grob (Grob*p)
 {
-  daddy_grav_l ()->typeset_grob (p);
+  Engraver *dad = get_daddy_engraver ();
+  if (dad)
+    dad->typeset_grob (p);
 }
 
 
-Engraver_group_engraver*
-Engraver::daddy_grav_l () const
-{
-  return (daddy_trans_l_)
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
-       : 0;
-}
-
-void
-Engraver::process_music ()
-{
-  
-}
 
-Engraver::Engraver()
+Engraver::Engraver ()
 {
 }
 
 
 Score_engraver* 
-Engraver::top_engraver () const
+Engraver::get_score_engraver () const
 {
-  /*
-    ugh.
-   */
-  if (dynamic_cast<Score_engraver*>((Engraver*)this))
-    return dynamic_cast<Score_engraver*> ((Engraver*)this);
-
-  if (daddy_trans_l_)
-    return dynamic_cast<Engraver*> (daddy_trans_l_)->top_engraver ();
-
-  programming_error ("No score engraver!");
-  return 0;
+  SCM t = get_score_context ()->implementation_;
+  return dynamic_cast<Score_engraver*> (unsmob_translator (t));
 }
 
-ENTER_DESCRIPTION(Engraver,
-                  "", "", "", "", "");
+
+ENTER_DESCRIPTION (Engraver,
+                  "", "",
+                 "",
+                 "", "", "");