X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=8f201a65c145e425be9d7c825945263999a99a77;hb=refs%2Fheads%2Fdon%2Ffix_configure_ac;hp=4a4735735556edb8bbb50c8258513a1fe20cb2ed;hpb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;p=lilypond.git diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index 4a47357355..8f201a65c1 100644 --- a/lily/music-wrapper-iterator.cc +++ b/lily/music-wrapper-iterator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Han-Wen Nienhuys + Copyright (C) 1998--2012 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 @@ -53,8 +53,8 @@ Music_wrapper_iterator::construct_children () Music *my_music = get_music (); Music *child = unsmob_music (my_music->get_property ("element")); child_iter_ = (child) - ? unsmob_iterator (get_iterator (child)) - : 0; + ? unsmob_iterator (get_iterator (child)) + : 0; } bool @@ -79,10 +79,26 @@ Music_wrapper_iterator::pending_moment () const return Music_iterator::pending_moment (); } +Context * +Music_wrapper_iterator::get_outlet () const +{ + if (child_iter_) + return child_iter_->get_outlet (); + return Music_iterator::get_outlet (); +} + +void +Music_wrapper_iterator::set_context (Context *trans) +{ + if (child_iter_) + child_iter_->set_context (trans); + Music_iterator::set_context (trans); +} + IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator); bool Music_wrapper_iterator::run_always () const { - return (child_iter_ && child_iter_->run_always ()); + return (child_iter_ && child_iter_->run_always ()); }