patch::: 1.3.96.jcn7

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index ecad05587023cc8ee2a188e9357a5bb31168b3d7..60a72fa594ff6a6dd7e6f484c290d9eac25d354f 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -1,62 +1,60 @@
 /*
   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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music-list.hh"
 #include "musical-request.hh"
 #include "engraver.hh"
-#include "engraver-group.hh"
+#include "engraver-group-engraver.hh"
 #include "debug.hh"
+#include "paper-def.hh"
+#include "score-element.hh"
+#include "group-interface.hh"
+
 
 void
-Engraver::fill_staff_info (Staff_info&)
+Engraver::announce_element (Score_element_info inf)
 {
-  
+  daddy_grav_l()->announce_element (inf);
 }
 
-
 void
-Engraver::announce_element (Score_element_info i)
+Engraver::announce_element (Score_element* e, Music *m)
 {
-  i.origin_grav_l_arr_.push (this);
+  if (m && m->origin ()->location_str ().length_i ())
+    {
+      e->set_elt_property ("origin", m->get_mus_property ("origin"));
+    }
+  
+  Score_element_info i (e, m);
+  if (!i.origin_trans_l_)
+    i.origin_trans_l_ = this;
   daddy_grav_l()->announce_element (i);
 }
 
 
+ 
 void
 Engraver::typeset_element (Score_element*p)
 {
   daddy_grav_l()->typeset_element (p);
 }
 
-Paper_def*
-Engraver::paper() const
-{
-  return (Paper_def*)output_def_l_;
-}
-
 
-Staff_info
-Engraver::get_staff_info() const
+Paper_def*
+Engraver::paper_l () const
 {
-  if (daddy_grav_l())
-    return daddy_grav_l()->get_staff_info();
-  Staff_info info;
-  return info;
+  return dynamic_cast<Paper_def*>(output_def_l_);
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Engraver, Translator);
-
-
 Engraver_group_engraver*
 Engraver::daddy_grav_l () const
 {
   return (daddy_trans_l_ )
-       ? (Engraver_group_engraver*) daddy_trans_l_->access_Engraver  ()
+       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
        : 0;
 }