Rearranging, editing, clean-up.

[lilypond.git] / lily / grob-info.cc

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index edd020796e7f416f4123d032d96433647d7ea4ad..6b69bfeab63949037d0428a36601748927d02a28 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -3,40 +3,54 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "grob-info.hh"
-#include "request.hh"
-#include "translator.hh"
+#include "grob.hh"
+#include "music.hh"
 #include "translator-group.hh"
+#include "context.hh"
 
-Grob_info::Grob_info (Grob*s_l, Music *r_l)
+
+Grob_info::Grob_info (Translator *t, Grob *g)
 {
-  elem_l_ = s_l;
-  req_l_ = r_l;
-  origin_trans_l_ = 0;  
+  origin_trans_ = t;
+  grob_ = g;
 }
 
-
-Grob_info::Grob_info()
+Grob_info::Grob_info ()
 {
-  elem_l_ = 0;
-  req_l_ = 0;
-  origin_trans_l_ = 0;
+  grob_ = 0;
+  origin_trans_ = 0;
 }
 
+Music *
+Grob_info::music_cause ()
+{
+  SCM cause = grob_->get_property ("cause");
+  return unsmob_music (cause);
+}
 
-Link_array<Translator>
-Grob_info::origin_trans_l_arr (Translator* end) const
+Link_array<Context>
+Grob_info::origin_contexts (Translator *end) const
 {
-  Translator * t = origin_trans_l_;
-  Link_array<Translator> r;
-  do {
-    r.push (t);
-    t = t->daddy_trans_l_;
-  } while (t && t != end->daddy_trans_l_);
-  
+  Context *t = origin_trans_->context ();
+  Link_array<Context> r;
+  do
+    {
+      r.push (t);
+      t = t->get_parent_context ();
+    }
+  while (t && t != end->context ());
+
   return r;
 }
-  
+
+
+Context*
+Grob_info::context () const
+{
+  return origin_trans_->context ();
+}
+