* mf/feta-macros.mf (soft_start_penstroke, soft_end_penstroke): New

[lilypond.git] / lily / simultaneous-music-iterator.cc

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index e1403a12cacecfcf82c861ee97d71e8dd6fd6d8b..672c08bf73f6362bfe304d57f4d152a185781357 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -6,13 +6,12 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "simultaneous-music-iterator.hh"
+#include "music.hh"
 #include "context.hh"
 #include "warn.hh"
-#include "simultaneous-music-iterator.hh"
-#include "music-list.hh"
 #include "context-def.hh"
 
-
 Simultaneous_music_iterator::Simultaneous_music_iterator ()
 {
   create_separate_contexts_ = false;
@@ -29,8 +28,8 @@ Simultaneous_music_iterator::derived_mark () const
 void
 Simultaneous_music_iterator::derived_substitute (Context *f,Context *t)
 {
-  for (SCM s = children_list_; ly_pair_p (s); s = ly_cdr (s))
-    unsmob_iterator (ly_car (s))-> substitute_outlet (f,t);
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    unsmob_iterator (scm_car (s))-> substitute_outlet (f,t);
 }
 
 void
@@ -42,9 +41,9 @@ Simultaneous_music_iterator::construct_children ()
 
   children_list_ = SCM_EOL;
   SCM * tail = &children_list_;
-  for (; ly_pair_p (i); i = ly_cdr (i), j++)
+  for (; scm_is_pair (i); i = scm_cdr (i), j++)
     {
-      Music *mus = unsmob_music (ly_car (i));
+      Music *mus = unsmob_music (scm_car (i));
 
       SCM scm_iter = get_static_get_iterator (mus);
       Music_iterator * mi = unsmob_iterator (scm_iter);
@@ -52,7 +51,7 @@ Simultaneous_music_iterator::construct_children ()
       /* if create_separate_contexts_ is set, create a new context with the
         number number as name */
 
-      SCM name = unsmob_context_def (get_outlet ()->definition_)->get_context_name ();
+      SCM name = ly_symbol2scm (get_outlet ()->context_name ().to_str0 ());
       Context * t = (j && create_separate_contexts_)
        ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL)
        : get_outlet ();
@@ -69,7 +68,7 @@ Simultaneous_music_iterator::construct_children ()
          tail = SCM_CDRLOC (*tail);
        }
       else
-       mi->set_translator (0);
+       mi->set_context (0);
     }
 }
 
@@ -77,9 +76,9 @@ void
 Simultaneous_music_iterator::process (Moment until)
 {
   SCM *proc = &children_list_; 
-  while (ly_pair_p (*proc))
+  while (scm_is_pair (*proc))
     {
-      Music_iterator * i = unsmob_iterator (ly_car (*proc));
+      Music_iterator * i = unsmob_iterator (scm_car (*proc));
       if (i->run_always ()
          || i->pending_moment () == until) 
        {
@@ -88,7 +87,7 @@ Simultaneous_music_iterator::process (Moment until)
       if (!i->ok ())
        {
          i->quit ();
-         *proc = ly_cdr (*proc);
+         *proc = scm_cdr (*proc);
        }
       else
        {
@@ -103,9 +102,9 @@ Simultaneous_music_iterator::pending_moment () const
   Moment next;
   next.set_infinite (1);
   
-  for (SCM s = children_list_; ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music_iterator * it = unsmob_iterator (ly_car (s));
+      Music_iterator * it = unsmob_iterator (scm_car (s));
       next = next <? it->pending_moment ();
     }
   
@@ -116,9 +115,9 @@ bool
 Simultaneous_music_iterator::ok () const
 {
   bool run_always_ok = false; 
-  for (SCM s = children_list_; ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music_iterator * it = unsmob_iterator (ly_car (s));
+      Music_iterator * it = unsmob_iterator (scm_car (s));
       if (!it->run_always ())
        return true;
       else
@@ -130,9 +129,9 @@ Simultaneous_music_iterator::ok () const
 bool
 Simultaneous_music_iterator::run_always () const
 {
-  for (SCM s = children_list_; ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music_iterator * it = unsmob_iterator (ly_car (s));
+      Music_iterator * it = unsmob_iterator (scm_car (s));
       if (it->run_always ())
        return true;
     }
@@ -142,17 +141,17 @@ Simultaneous_music_iterator::run_always () const
 Music_iterator*
 Simultaneous_music_iterator::try_music_in_children (Music *m) const
 {
-  Music_iterator * b=0;
-  for (SCM s = children_list_; !b && ly_pair_p (s); s = ly_cdr (s))
-    b =unsmob_iterator (ly_car (s))->try_music (m);
+  Music_iterator * b = 0;
+  for (SCM s = children_list_; !b && scm_is_pair (s); s = scm_cdr (s))
+    b = unsmob_iterator (scm_car (s))->try_music (m);
   return b;
 }
 
 void
 Simultaneous_music_iterator::do_quit ()
 {
-  for (SCM s = children_list_; ly_pair_p (s); s = ly_cdr (s))
-    unsmob_iterator (ly_car (s))->quit ();
+  for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+    unsmob_iterator (scm_car (s))->quit ();
 }
 
 IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);