X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=cf2eebbe9b5c4a65515ba6a1fd3974ea656659a3;hb=e21e3fd69d0204424e93983460926bc0b90f448c;hp=40d637ec04c6c212f70aead4fa2fdff6624e4c1c;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 40d637ec04..cf2eebbe9b 100644
--- 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "grob.hh"
+
+#include "context.hh"
+#include "item.hh"
+#include "lilypond-key.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 "stream-event.hh"
+#include "warn.hh"
 
-Engraver_group_engraver*
+Engraver_group *
 Engraver::get_daddy_engraver () const
 {
-  return dynamic_cast<Engraver_group_engraver*> (get_daddy_translator ());
+  return dynamic_cast<Engraver_group *> (get_daddy_translator ());
 }
 
 void
@@ -29,55 +29,69 @@ Engraver::announce_grob (Grob_info inf)
   get_daddy_engraver ()->announce_grob (inf);
 }
 
+void
+Engraver::announce_end_grob (Grob_info inf)
+{
+  get_daddy_engraver ()->announce_grob (inf);
+}
 
 /*
-  CAUSE is the object (typically a Music object)  that
+  CAUSE is the object (typically a Stream_event 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))
+  /* TODO: Remove Music code when it's no longer needed */
+  if (Music *m = unsmob_music (cause))
+    {
+      cause = m->to_event ()->unprotect ();
+    }
+  if (unsmob_stream_event (cause) || unsmob_grob (cause))
     e->set_property ("cause", cause);
 
-  Grob_info i;
-  i.grob_ = e;
-  if (!i.origin_trans_)
-    i.origin_trans_ = this;
+  Grob_info i (this, e);
 
-  get_daddy_engraver ()->announce_grob (i);
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
- 
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+*/
 void
-Engraver::typeset_grob (Grob*p)
+Engraver::announce_end_grob (Grob *e, SCM cause)
 {
-  Engraver *dad = get_daddy_engraver ();
-  dad->typeset_grob (p);
-}
-
+  /* TODO: Remove Music code when it's no longer needed */
+  if (Music *m = unsmob_music (cause))
+    {
+      cause = m->to_event ()->unprotect ();
+    }
+  if (unsmob_stream_event (cause) || unsmob_grob (cause))
+    e->set_property ("cause", cause);
 
+  Grob_info i (this, e);
 
-Engraver::Engraver()
-{
+  i.start_end_ = STOP;
+  Engraver_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
-Score_engraver* 
-Engraver::get_score_engraver () const
+Engraver::Engraver ()
 {
-  SCM t = get_score_context ()->implementation_;
-  return dynamic_cast<Score_engraver*> (unsmob_translator (t));
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION(Engraver,
-		   "", "",
-		  "",
-		  "", "", "");
+ADD_TRANSLATOR (Engraver,
+		"Base class for engravers. Does nothing, so it is not used.",
+		"",
+		"",
+		"",
+		"");