X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-info.cc;h=bc6205a8dc5e3fcb9c6f1f1e5b0a20c22029735f;hb=754d360118e26e2e48ec080849d9c0f94d1c7416;hp=fff2596a9d0a1960cfdc3a7010a9a89662f93a9d;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/grob-info.cc b/lily/grob-info.cc index fff2596a9d..bc6205a8dc 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -3,20 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "grob.hh" #include "grob-info.hh" #include "music.hh" #include "translator-group.hh" - -Grob_info::Grob_info (Grob*s) -{ - grob_ = s; - origin_trans_ = 0; -} - +#include "context.hh" Grob_info::Grob_info () { @@ -26,21 +20,20 @@ Grob_info::Grob_info () Music* Grob_info::music_cause () - { - SCM cause = grob_->get_grob_property ("cause"); + SCM cause = grob_->get_property ("cause"); return unsmob_music (cause); } -Link_array -Grob_info::origin_transes (Translator* end) const +Link_array +Grob_info::origin_contexts (Translator* end) const { - Translator * t = origin_trans_; - Link_array r; + Context * t = origin_trans_->context (); + Link_array r; do { r.push (t); - t = t->daddy_trans_; - } while (t && t != end->daddy_trans_); + t = t->get_parent_context (); + } while (t && t != end->context ()); return r; }