From 15af6574b4ad5c382867f76cbd3938fde1cc10db Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 29 Oct 2004 23:30:13 +0000 Subject: [PATCH] (try_music): only return something when is_first_ is true. Fixes lyrics with completion_heads. --- ChangeLog | 3 +++ lily/completion-note-heads-engraver.cc | 2 +- lily/note-heads-engraver.cc | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba8de2235e..9f862c44d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-30 Han-Wen Nienhuys + * lily/completion-note-heads-engraver.cc (try_music): only return + something when is_first_ is true. Fixes lyrics with completion_heads. + * make/lilypond-vars.make: add scripts/out/ to PATH, to find ps2png. * scm/lily.scm (ly:system): new function. Catches uninstalled diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 6f937cb6f7..07a53b8bc3 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -97,7 +97,7 @@ Completion_heads_engraver::try_music (Music *m) } else if (m->is_mus_type ("busy-playing-event")) { - return note_reqs_.size (); + return note_reqs_.size() && is_first_; } return false; diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 9bd654b3fb..9baa2af3e9 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -91,7 +91,6 @@ Note_heads_engraver::process_music () void Note_heads_engraver::stop_translation_timestep () { - notes_.clear (); dots_.clear (); note_reqs_.clear (); -- 2.39.2