* flower

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 03861f08fc88d41c3095c048d409ad8a57e9d01c..09fe51c2932e468bed19bc3bed435203a1ad133c 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -1,14 +1,12 @@
-/*   
-  lyric-combine-music-iterator.cc --  implement Lyric_combine_music_iterator
-  
+/*
+  lyric-combine-music-iterator.cc -- implement Lyric_combine_music_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "context.hh"
-#include "lyric-combine-music.hh"
 #include "event.hh"
 #include "note-head.hh"
 #include "grob.hh"
@@ -18,52 +16,51 @@ class Lyric_combine_music_iterator : public Music_iterator
 {
 public:
   Lyric_combine_music_iterator ();
-  Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
+  Lyric_combine_music_iterator (Lyric_combine_music_iterator const &src);
   DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual void construct_children ();
   virtual Moment pending_moment () const;
-  virtual void do_quit (); 
+  virtual void do_quit ();
   virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
 
   virtual bool ok () const;
   virtual void derived_mark () const;
-  virtual void derived_substitute (Context *,Context *) ;
+  virtual void derived_substitute (Context *, Context *);
 private:
-  bool get_busy_status ()const ;
-  bool melisma_busy (); 
+  bool get_busy_status ()const;
+  bool melisma_busy ();
+  Music *get_combine_lyrics () const;
+  Music *get_combine_music () const;
 
-  Music_iterator * music_iter_;
-  Music_iterator * lyric_iter_;
+  Music_iterator *music_iter_;
+  Music_iterator *lyric_iter_;
 };
 
-
 bool
-melisma_busy (Context* tr)
+melisma_busy (Context *tr)
 {
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
 
   for (; scm_is_pair (melisma_properties);
-       melisma_properties = ly_cdr (melisma_properties))
-    busy = busy || to_boolean (tr->internal_get_property (ly_car (melisma_properties)));
+       melisma_properties = scm_cdr (melisma_properties))
+    busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));
 
   return busy;
 }
 
-
-
 /*
   Ugh, why static?
- */
+*/
 Music *busy_req;
 Music *melisma_playing_req;
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
 {
-  music_iter_ =0;
-  lyric_iter_ =0;
+  music_iter_ = 0;
+  lyric_iter_ = 0;
 
   if (!busy_req)
     {
@@ -97,21 +94,40 @@ Lyric_combine_music_iterator::derived_mark ()const
 }
 
 void
-Lyric_combine_music_iterator::derived_substitute (Context *f,Context * t)
+Lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
 {
   if (music_iter_)
-    music_iter_->substitute_outlet (f,t);
+    music_iter_->substitute_outlet (f, t);
   if (lyric_iter_)
-    lyric_iter_->substitute_outlet (f,t);
+    lyric_iter_->substitute_outlet (f, t);
+}
+
+Music *
+Lyric_combine_music_iterator::get_combine_music () const
+{
+  SCM l = get_music ()->get_property ("elements");
+  if (!scm_is_pair (l))
+    return 0;
+  return unsmob_music (scm_car (l));
+}
+
+Music *
+Lyric_combine_music_iterator::get_combine_lyrics () const
+{
+  SCM l = get_music ()->get_property ("elements");
+  if (!scm_is_pair (l))
+    return 0;
+  l = scm_cdr (l);
+  if (!scm_is_pair (l))
+    return 0;
+  return unsmob_music (scm_car (l));
 }
 
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (get_music ());
-  
-  music_iter_ = unsmob_iterator (get_iterator (m->get_music ()));
-  lyric_iter_ = unsmob_iterator (get_iterator (m->get_lyrics ()));
+  music_iter_ = unsmob_iterator (get_iterator (get_combine_music ()));
+  lyric_iter_ = unsmob_iterator (get_iterator (get_combine_lyrics ()));
 }
 
 bool
@@ -123,17 +139,16 @@ Lyric_combine_music_iterator::get_busy_status () const
     instant.  */
   if (try_music (busy_req))
     return true;
-  
-  Context * tr = music_iter_->get_outlet ();
+
+  Context *tr = music_iter_->get_outlet ();
 
   SCM grobs = tr->get_property ("busyGrobs");
   Moment now = tr->now_mom ();
-  for (; scm_is_pair (grobs); grobs = ly_cdr (grobs))
+  for (; scm_is_pair (grobs); grobs = scm_cdr (grobs))
     {
-      SCM grob = ly_cdar (grobs);
-      Moment end  =*unsmob_moment (ly_caar (grobs));
+      SCM grob = scm_cdar (grobs);
+      Moment end =*unsmob_moment (scm_caar (grobs));
 
-      
       /*
        This is slightly ugh: we are now confunding the frontend
        (iterators) and the backend (note heads) */
@@ -145,7 +160,6 @@ Lyric_combine_music_iterator::get_busy_status () const
   return false;
 }
 
-
 bool
 Lyric_combine_music_iterator::melisma_busy ()
 {
@@ -153,7 +167,7 @@ Lyric_combine_music_iterator::melisma_busy ()
     We can not read the property, since music_iter_->get_outlet () might
     not be the context that sets the melisma properties, but rather a
     parent context.
-   */
+  */
   return music_iter_->try_music (melisma_playing_req);
 }
 
@@ -163,12 +177,12 @@ Lyric_combine_music_iterator::process (Moment m)
   Moment my_next = music_iter_->pending_moment ();
   if (my_next > m)
     return;
-  
+
   music_iter_->process (m);
 
   if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ())
     {
-      Moment m= lyric_iter_->pending_moment ();
+      Moment m = lyric_iter_->pending_moment ();
       lyric_iter_->process (m);
     }
 }
@@ -182,15 +196,14 @@ Lyric_combine_music_iterator::do_quit ()
     lyric_iter_->quit ();
 }
 
-Music_iterator*
+Music_iterator *
 Lyric_combine_music_iterator::try_music_in_children (Music *m) const
 {
-  Music_iterator * i =  music_iter_->try_music (m);
+  Music_iterator *i = music_iter_->try_music (m);
   if (i)
     return i;
   else
     return lyric_iter_->try_music (m);
 }
 
-
 IMPLEMENT_CTOR_CALLBACK (Lyric_combine_music_iterator);