X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmelody-engraver.cc;h=2d982056d33d22f438fdb30a800e081bf6f8150f;hb=0b49f20966fb8b4e9c9d8ed5699efcff9f805564;hp=0ebd1324506ebf7b404a3ab640ba57e746cf4f91;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc index 0ebd132450..2d982056d3 100644 --- a/lily/melody-engraver.cc +++ b/lily/melody-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 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 @@ -33,6 +33,7 @@ protected: DECLARE_ACKNOWLEDGER (slur); TRANSLATOR_DECLARATIONS (Melody_engraver); void stop_translation_timestep (); + void process_acknowledged (); void process_music (); }; @@ -49,8 +50,12 @@ Melody_engraver::process_music () melody_item_ = 0; } +/* + Used to be in stop_translation_timestep, but grobs can't + be created here. +*/ void -Melody_engraver::stop_translation_timestep () +Melody_engraver::process_acknowledged () { if (stem_ && !is_direction (stem_->get_property_data ("neutral-direction"))) @@ -66,6 +71,11 @@ Melody_engraver::stop_translation_timestep () Melody_spanner::add_stem (melody_item_, stem_); } } +} + +void +Melody_engraver::stop_translation_timestep () +{ stem_ = 0; }