X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fengraver.cc;h=b756d742dcad8c2d829729c84b55e297738e6c98;hb=2629d27674cdc52137a4fb0ce62200cfb7ce7e91;hp=9059624ce660f249c0ea9b2e6a1c860f65821161;hpb=19125bf158fe23501e40eef6da3bbf876c664f2a;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 9059624ce6..b756d742dc 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,56 +3,65 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "grob.hh"
-#include "main.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"
 
-void
-Engraver::announce_grob (Grob_info inf)
+Engraver_group *
+Engraver::get_daddy_engraver () const
 {
-  daddy_grav_l ()->announce_grob (inf);
+  return dynamic_cast<Engraver_group *> (get_daddy_translator ());
 }
 
 void
-Engraver::announce_grob (Grob* e, Music *m)
+Engraver::announce_grob (Grob_info inf)
 {
-  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);
-  if (!i.origin_trans_l_)
-    i.origin_trans_l_ = this;
-  daddy_grav_l ()->announce_grob (i);
+  get_daddy_engraver ()->announce_grob (inf);
 }
 
-
- 
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+*/
 void
-Engraver::typeset_grob (Grob*p)
+Engraver::announce_grob (Grob *e, SCM cause)
 {
-  daddy_grav_l ()->typeset_grob (p);
-}
+  if (unsmob_music (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
+
+  Grob_info i (this, e);
 
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
+}
 
-Engraver_group_engraver*
-Engraver::daddy_grav_l () const
+Engraver::Engraver ()
 {
-  return (daddy_trans_l_)
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
-       : 0;
 }
 
-void
-Engraver::process_music ()
+Score_engraver *
+Engraver::get_score_engraver () const
 {
-  
+  return dynamic_cast<Score_engraver *> (get_score_context ()->implementation ());
 }
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Engraver,
+		"Base class for engravers. Does nothing, so it is not used.",
+		"",
+		"",
+		"",
+		"");
+