X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fgrob-info.cc;h=be6fd79e17a290f57ca4a206b018a1710f89d259;hb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;hp=4ffbcf9c15da408c9c95f406e8b67c490a92781b;hpb=77d72a6b9e7e551dc4a3b365099f9fea339f9c72;p=lilypond.git diff --git a/lily/grob-info.cc b/lily/grob-info.cc index 4ffbcf9c15..be6fd79e17 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -3,44 +3,51 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ +#include "context.hh" #include "grob-info.hh" -#include "grob.hh" +#include "item.hh" #include "music.hh" -#include "translator-group.hh" -#include "context.hh" #include "spanner.hh" -#include "item.hh" +#include "stream-event.hh" +#include "translator-group.hh" Grob_info::Grob_info (Translator *t, Grob *g) { origin_trans_ = t; grob_ = g; + start_end_ = START; + + /* + assert here, because this is easier to debug. + */ + assert (g); } Grob_info::Grob_info () { grob_ = 0; + start_end_ = START; origin_trans_ = 0; } -Music * -Grob_info::music_cause () const +Stream_event * +Grob_info::event_cause () const { SCM cause = grob_->get_property ("cause"); - return unsmob_music (cause); + return unsmob_stream_event (cause); } -Link_array +vector Grob_info::origin_contexts (Translator *end) const { Context *t = origin_trans_->context (); - Link_array r; + vector r; do { - r.push (t); + r.push_back (t); t = t->get_parent_context (); } while (t && t != end->context ()); @@ -66,15 +73,13 @@ Grob_info::item () const return dynamic_cast (grob_); } -Music * -Grob_info::ultimate_music_cause () const +Stream_event * +Grob_info::ultimate_event_cause () const { SCM cause = grob_->self_scm (); while (unsmob_grob (cause)) { cause = unsmob_grob (cause)->get_property ("cause"); } - - return unsmob_music (cause); + return unsmob_stream_event (cause); } -