* lily/font-select.cc (get_font_by_design_size): revert

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 9b4d540e0e74416a3716a645de672447017ae7d2..d4a0acc0cec2a6506374c2ce215d929a805a0a8c 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -3,44 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "grob.hh"
 #include "grob-info.hh"
+
+#include "grob.hh"
 #include "music.hh"
 #include "translator-group.hh"
-
-Grob_info::Grob_info (Grob*s_l)
-{
-  grob_l_ = s_l;
-  origin_trans_l_ = 0;  
-}
-
+#include "context.hh"
 
 Grob_info::Grob_info ()
 {
-  grob_l_ = 0;
-  origin_trans_l_ = 0;
+  grob_ = 0;
+  origin_trans_ = 0;
 }
 
 Music*
 Grob_info::music_cause ()
-  
 {
-  SCM cause = grob_l_->get_grob_property ("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;
+  Context * t = origin_trans_->context ();
+  Link_array<Context> r;
   do {
     r.push (t);
-    t = t->daddy_trans_l_;
-  } while (t && t != end->daddy_trans_l_);
+    t = t->get_parent_context ();
+  } while (t && t != end->context ());
   
   return r;
 }