X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=5f83295e18e8135c77b7bb95540b6b080ff70e3f;hb=e504837b96a4a3d3f8353e0d28951de35832575a;hp=2ccf33506924ee75afc90f7ccff9c9f2ea6985e2;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 2ccf335069..5f83295e18 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,62 +1,73 @@
 /*
   engraver.cc -- implement Engraver
 
-  Sourcefile of GNU LilyPond musictypesetter
+  Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "music-list.hh"
-#include "musical-request.hh"
+#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group.hh"
-#include "debug.hh"
+#include "engraver-group-engraver.hh"
+#include "grob.hh"
+#include "score-engraver.hh"
+#include "warn.hh"
+#include "spanner.hh"
+#include "item.hh"
+#include "context.hh"
+#include "score-context.hh"
 
-void
-Engraver::fill_staff_info (Staff_info&)
+Engraver_group_engraver*
+Engraver::get_daddy_engraver () const
 {
-  
+  return dynamic_cast<Engraver_group_engraver*> (get_daddy_translator ());
 }
 
-
 void
-Engraver::announce_element (Score_elem_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);
 }
 
 
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+ */
 void
-Engraver::typeset_element (Score_elem*p)
+Engraver::announce_grob (Grob* e, SCM cause)
 {
-  daddy_grav_l()->typeset_element (p);
+  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);
 }
 
-Paper_def*
-Engraver::paper() const
+
+ 
+
+
+Engraver::Engraver ()
 {
-  return (Paper_def*)output_def_l_;
 }
 
 
-Staff_info
-Engraver::get_staff_info() const
+Score_engraver* 
+Engraver::get_score_engraver () const
 {
-  if (daddy_grav_l())
-    return daddy_grav_l()->get_staff_info();
-  Staff_info info;
-  return info;
+  return dynamic_cast<Score_engraver*> (get_score_context ()->implementation ());
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Engraver, Translator);
-
+ENTER_DESCRIPTION (Engraver,
+		   "", "",
+		  "",
+		  "", "", "");
 
-Engraver_group_engraver*
-Engraver::daddy_grav_l () const
-{
-  return (daddy_trans_l_ )
-       ? (Engraver_group_engraver*) daddy_trans_l_->engraver_l ()
-       : 0;
-}