* input/regression/lyric-combine-polyphonic.ly: new file.

* ly/engraver-init.ly (VoiceContext): add Grob_pq_engraver to
Voice context.

diff --git a/ChangeLog b/ChangeLog
index 8308cdb37f31e306deed02fd187cecaaf87eb450..9b7e701ec769e068dcfe2f072549947847a86f9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-31  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/regression/lyric-combine-polyphonic.ly: new file.
+
+       * ly/engraver-init.ly (VoiceContext): add Grob_pq_engraver to
+       Voice context.
+
 2002-08-31 Graham Percival  <gperciva@sfu.ca>
 
         * Documentation/user/tutorial.itely:  editorial changes

diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
new file mode 100644 (file)
index 0000000..f59cc14
--- /dev/null
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -0,0 +1,39 @@
+\header {
+
+texidoc ="polyphonic rhythms and rests don't disturb
+@code{\addlyrics}."
+
+}
+
+\score {
+    \notes {
+       \clef violin
+       \time 8/8
+       \key des \major
+       < \context Voice = one {
+          \voiceOne
+          \addlyrics
+          \notes {
+             bes'4 bes'4
+             bes'4 bes'4
+          }
+          \context Lyrics \lyrics
+          {
+             Do __ mi __ nus ex
+          }
+         }
+         \context Voice = two {
+          \voiceTwo
+          \addlyrics
+          \notes {
+             ees'8 r8 r8 r8 ees' r8 r8 r8 
+          }
+          \context Lyrics \lyrics
+         {
+             Do __ na
+          }
+         }
+       >
+    }
+    \paper { linewidth=-1.0 }
+}

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 75a7d89e6875565e7847acdc4260d7102ab198f9..31439d12958fe532fcd9a14ada8e54da3e940411 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -102,21 +102,13 @@ Lyric_combine_music_iterator::process (Moment m)
   
   music_iter_->process (m);
 
-  if ( get_busy_status ())
+  if (get_busy_status ())
     {
       bool melisma_b = try_music (melisma_playing_req);
       if (!melisma_b)
        {
          if (lyric_iter_->ok ())
            {
-             // FIXME
-#if 0                          // devise a new way for this
-             if (melisma_b && !melisma_started_b_)
-               lyric_iter_->try_music (melisma_start_req);
-             else if (melisma_started_b_)
-               lyric_iter_->try_music (melisma_stop_req);
-#endif
-             
              Moment m= lyric_iter_->pending_moment ();
              lyric_iter_->process (m);
            }

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 6684c0bc523112bef65a795b380b1ce9b4025619..4bfc458c6900b7992b6738d224b9751dcec0f205 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -134,6 +134,7 @@ VoiceContext = \translator {
        \consists "Arpeggio_engraver"
        \consists "Multi_measure_rest_engraver"
        \consists "Text_spanner_engraver"
+       \consists "Grob_pq_engraver"
 
        \consists "Ligature_bracket_engraver"
        \consists "Breathing_sign_engraver"