* lily/text-spanner.cc (brew_molecule): don't do shorten-pair for

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index b875668ef74c1ce0c2bfd6387ed23c367452da0b..8e9eea1e94339877c238763b57595c33ae744c01 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -157,17 +157,33 @@ Simultaneous_music_iterator::pending_moment () const
       if (!it-> run_always ())
        next = next <? it->pending_moment ();
     }
+  
   return next;
 }
 
 bool
 Simultaneous_music_iterator::ok () const
 {
+  bool run_always_ok = false; 
   for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
     {
       Music_iterator * it = unsmob_iterator (gh_car (s));
       if (!it->run_always ())
        return true;
+      else
+       run_always_ok =  run_always_ok || it->ok ();
+    }
+  return run_always_ok;
+}
+
+bool
+Simultaneous_music_iterator::run_always () const
+{
+  for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
+    {
+      Music_iterator * it = unsmob_iterator (gh_car (s));
+      if (it->run_always ())
+       return true;
     }
   return false;
 }