(try_music): only return

something when is_first_ is true. Fixes lyrics with completion_heads.

diff --git a/ChangeLog b/ChangeLog
index ba8de2235e429a48100869783c5fc3875124d3be..9f862c44d20ab8e2a24c3f60f02f5c91394d8532 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 6f937cb6f71f133002cea4184b46a7a4023e70be..07a53b8bc3ae6c41314ceab87ec338fafae9b89c 100644 (file)
--- 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 9bd654b3fb39d1229f979bb2dca707dd1db5fd2e..9baa2af3e9251116c54d60b2773350339181facf 100644 (file)
--- 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 ();