release: 1.1.54

[lilypond.git] / lily / music-list.cc

diff --git a/lily/music-list.cc b/lily/music-list.cc
index 36087d65c4cd31f2acbd9ecb4bab785dead207fb..3b9c830fbaac781242709085aa0b4244d0740ed0 100644 (file)
--- a/lily/music-list.cc
+++ b/lily/music-list.cc
@@ -7,9 +7,11 @@
 */
 
 #include "music-list.hh"
+#include "music-wrapper.hh"
 #include "musical-pitch.hh"
 #include "request.hh"
 #include "musical-request.hh"
+#include "music-iterator.hh"
 #include "main.hh"
 #include "killing-cons.tcc"
 
@@ -44,19 +46,30 @@ Sequential_music::length_mom () const
   return cumulative_length ();
 }
 
-
 Musical_pitch
 Simultaneous_music::to_relative_octave (Musical_pitch p)
 {
   return do_relative_octave (p, true);
 }
 
+Music_iterator*
+Simultaneous_music::to_rhythm (Music_iterator* r)
+{
+  return do_rhythm (r);
+}
+
 Musical_pitch
 Music_sequence::do_relative_octave (Musical_pitch p, bool b)
 {
   return music_p_list_p_->do_relative_octave (p, b);  
 }
 
+Music_iterator*
+Music_sequence::do_rhythm (Music_iterator* r)
+{
+  return music_p_list_p_->do_rhythm (r);
+}
+
 Musical_pitch 
 Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
 {
@@ -75,6 +88,15 @@ Music_list::do_relative_octave (Musical_pitch last, bool ret_first)
   return retval;
 }
 
+Music_iterator*
+Music_list::do_rhythm (Music_iterator* r)
+{
+  for (Cons<Music> *i = head_; i ; i = i->next_)
+    {
+      r = i->car_->to_rhythm (r);
+    }
+  return r;
+}
 
 Music_list::Music_list (Music_list const &s)
   : Cons_list<Music> (s)
@@ -114,6 +136,34 @@ Request_chord::to_relative_octave (Musical_pitch last)
   return last;
 }
 
+Music_iterator*
+Request_chord::to_rhythm (Music_iterator* it)
+{
+  for (Cons<Music>* i = music_p_list_p_->head_; i ; i = i->next_)
+    {
+      if (Rhythmic_req* r= dynamic_cast <Rhythmic_req*> (i->car_))
+       {
+         for (Music*m = it->next_music_l (); m; m = it->next_music_l ())
+           {
+#if 0
+             // is it sane to assume we don't want rests on lyrics/in rhythm?
+             if (dynamic_cast <Rest_req*> (r)
+                 || dynamic_cast <Multi_measure_rest_req*> (r)
+                 || dynamic_cast <Skip_req*> (r))
+                 {
+                   continue;
+                 }
+#endif
+             if (Rhythmic_req* d= dynamic_cast <Rhythmic_req*> (m))
+               {
+                 r->duration_ = d->duration_;
+                 return it;
+               }
+           }
+       }
+    }
+  return it;
+}
 
 Music_list::Music_list ()
 {