X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-info.cc;h=aab0d3cb8d61b352cf381969d479982d7300f08e;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=f02e836e75389b80d601e7ddb9c12981682fb46d;hpb=069bab10a0735111453d9b3b45b9aff26b1d750b;p=lilypond.git diff --git a/lily/grob-info.cc b/lily/grob-info.cc index f02e836e75..aab0d3cb8d 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,6 @@ Grob_info::Grob_info (Translator *t, Grob *g) { origin_trans_ = t; grob_ = g; - start_end_ = START; /* assert here, because this is easier to debug. @@ -40,7 +39,6 @@ Grob_info::Grob_info (Translator *t, Grob *g) Grob_info::Grob_info () { grob_ = 0; - start_end_ = START; origin_trans_ = 0; } @@ -48,14 +46,14 @@ Stream_event * Grob_info::event_cause () const { SCM cause = grob_->get_property ("cause"); - return unsmob_stream_event (cause); + return unsmob (cause); } -vector +vector Grob_info::origin_contexts (Translator *end) const { Context *t = origin_trans_->context (); - vector r; + vector r; do { r.push_back (t); @@ -88,11 +86,11 @@ Stream_event * Grob_info::ultimate_event_cause () const { SCM cause = grob_->self_scm (); - while (unsmob_grob (cause)) + while (unsmob (cause)) { - cause = unsmob_grob (cause)->get_property ("cause"); + cause = unsmob (cause)->get_property ("cause"); } - return unsmob_stream_event (cause); + return unsmob (cause); } bool