X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=cf2eebbe9b5c4a65515ba6a1fd3974ea656659a3;hb=8a11decb30733f20ade0deb0c9890eb076f15052;hp=8a79b6034624437b24ed07b99626e2409683c4e7;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 8a79b60346..cf2eebbe9b 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,62 +1,97 @@
 /*
   engraver.cc -- implement Engraver
 
-  Sourcefile of GNU LilyPond musictypesetter
+  Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music-list.hh"
-#include "musical-request.hh"
 #include "engraver.hh"
-#include "engraver-group.hh"
-#include "debug.hh"
 
-void
-Engraver::fill_staff_info (Staff_info&)
+#include "context.hh"
+#include "item.hh"
+#include "lilypond-key.hh"
+#include "music.hh"
+#include "score-engraver.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+Engraver_group *
+Engraver::get_daddy_engraver () const
 {
-  
+  return dynamic_cast<Engraver_group *> (get_daddy_translator ());
 }
 
-
 void
-Engraver::announce_element (Score_element_info i)
+Engraver::announce_grob (Grob_info inf)
 {
-  i.origin_grav_l_arr_.push (this);
-  daddy_grav_l()->announce_element (i);
+  get_daddy_engraver ()->announce_grob (inf);
 }
 
 void
-Engraver::typeset_element (Score_element*p)
+Engraver::announce_end_grob (Grob_info inf)
 {
-  daddy_grav_l()->typeset_element (p);
+  get_daddy_engraver ()->announce_grob (inf);
 }
 
-
-Paper_def*
-Engraver::paper() const
+/*
+  CAUSE is the object (typically a Stream_event object)  that
+  was the reason for making E.
+*/
+void
+Engraver::announce_grob (Grob *e, SCM cause)
 {
-  return (Paper_def*)output_def_l_;
+  /* 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_group *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
-Staff_info
-Engraver::get_staff_info() const
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+*/
+void
+Engraver::announce_end_grob (Grob *e, SCM cause)
 {
-  if (daddy_grav_l())
-    return daddy_grav_l()->get_staff_info();
-  Staff_info info;
-  return info;
-}
+  /* 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);
 
-IMPLEMENT_IS_TYPE_B1(Engraver, Translator);
+  i.start_end_ = STOP;
+  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_ )
-       ? (Engraver_group_engraver*) dynamic_cast <Engraver *> (daddy_trans_l_)
-       : 0;
 }
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Engraver,
+		"Base class for engravers. Does nothing, so it is not used.",
+		"",
+		"",
+		"",
+		"");
+