X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-iterator.cc;h=4954dc914d2793c080967e235d8630605e321418;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=3c0e8bb3b44fbb4adfff21659675ce08794f9c37;hpb=38d7d319eabc906e82fb42002678c6d42a23b6f7;p=lilypond.git diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index 3c0e8bb3b4..4954dc914d 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -1,20 +1,40 @@ /* - grace-music.cc -- implement Grace_music + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1999--2015 Han-Wen Nienhuys - (c) 1999--2009 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "grace-iterator.hh" #include "global-context.hh" -#include "warn.hh" +#include "music.hh" void Grace_iterator::process (Moment m) { Moment main; main.main_part_ = -start_mom_.grace_part_ + m.grace_part_; + + // GraceChange is announced in order to make the Grace_engraver able + // to distinguish \stemNeutral \grace { ... and \grace { \stemNeutral ... + if (in_grace_ != bool (m.grace_part_) && child_iter_ && child_iter_->get_outlet ()) + { + send_stream_event (child_iter_->get_outlet (), "GraceChange", get_music ()->origin ()); + } + in_grace_ = m.grace_part_; + Music_wrapper_iterator::process (main); /* We can safely do this, since \grace should always be inside