2003 -> 2004

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 5e9df9c922a659cacc4a5d2d78b385ac67d8a1bf..2badb89cd66a5614f16752bf0b5a1a3857c5004a 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,33 +3,46 @@
 
   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 "score-engraver.hh"
+#include "warn.hh"
+#include "spanner.hh"
+#include "item.hh"
 
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  daddy_grav_l()->announce_grob (inf);
+  get_daddy_grav ()->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)
 {
-  if (m && 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);
+  /*
+    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);
+
+  Grob_info i;
+  i.grob_ = e;
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
+
+
+
+  get_daddy_grav ()->announce_grob (i);
 }
 
 
@@ -37,15 +50,15 @@ Engraver::announce_grob (Grob* e, Music *m)
 void
 Engraver::typeset_grob (Grob*p)
 {
-  daddy_grav_l()->typeset_grob (p);
+  get_daddy_grav ()->typeset_grob (p);
 }
 
 
 Engraver_group_engraver*
-Engraver::daddy_grav_l () const
+Engraver::get_daddy_grav () const
 {
-  return (daddy_trans_l_ )
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
+  return (daddy_trans_)
+       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_)
        : 0;
 }
 
@@ -54,3 +67,34 @@ Engraver::process_music ()
 {
   
 }
+
+Item*
+Engraver::internal_make_item (SCM x)
+{
+  SCM props = internal_get_property (x);
+  return new Item (props);
+}
+
+Spanner*
+Engraver::internal_make_spanner (SCM x)
+{
+  SCM props = internal_get_property (x);
+  return new Spanner (props);
+}
+
+Engraver::Engraver()
+{
+}
+
+
+Score_engraver* 
+Engraver::top_engraver () const
+{
+  return dynamic_cast<Score_engraver*> (top_translator());
+}
+
+ENTER_DESCRIPTION(Engraver,
+                  "", "",
+                 "",
+                 "", "", "");
+