typo

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ea15581fe9cbbd639f48cb0f24dfdf6d59cc6071..c4cf900dca52d6ea51c5fc2f16bebbf7afae0fcd 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -13,7 +13,7 @@
 
 #include "warn.hh"
 #include "music-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
@@ -26,7 +26,7 @@ Music_iterator::Music_iterator ()
   smobify_self ();
 }
 
-Music_iterator::Music_iterator (Music_iterator const& src)
+Music_iterator::Music_iterator (Music_iterator const& )
 {
   assert (false);
 }
@@ -35,14 +35,14 @@ Music_iterator::~Music_iterator ()
 {
 }
 
-Translator_group* 
+Context * 
 Music_iterator::get_outlet () const
 {
   return handle_.get_outlet ();
 }
 
 void
-Music_iterator::set_translator (Translator_group *trans)
+Music_iterator::set_translator (Context *trans)
 {
   handle_.set_translator (trans);
 }
@@ -76,11 +76,11 @@ Music_iterator::get_static_get_iterator (Music *m)
 {
   Music_iterator * p =0;
 
-  SCM ctor = m->get_mus_property ("iterator-ctor") ;
+  SCM ctor = m->get_property ("iterator-ctor") ;
   SCM iter = SCM_EOL;
-  if (gh_procedure_p (ctor))
+  if (ly_c_procedure_p (ctor))
     {
-      iter = gh_call0 (ctor);
+      iter = scm_call_0 (ctor);
       p = unsmob_iterator (iter);
     }
   else
@@ -90,7 +90,7 @@ Music_iterator::get_static_get_iterator (Music *m)
       else
        p = new Simple_music_iterator;
 
-      iter = p->self_scm();
+      iter = p->self_scm ();
       scm_gc_unprotect_object (iter);
     }
 
@@ -98,6 +98,7 @@ Music_iterator::get_static_get_iterator (Music *m)
   assert (m);
   p->music_length_ = m->get_length ();
   p->start_mom_ = m->start_mom ();
+  
   return iter;
 }
 
@@ -115,7 +116,7 @@ Music_iterator::music_start_mom ()const
 }
 
 void
-Music_iterator::init_translator (Music *m, Translator_group *report)
+Music_iterator::init_translator (Music *m, Context *report)
 {
   music_ = m;
   assert (m);
@@ -124,7 +125,7 @@ Music_iterator::init_translator (Music *m, Translator_group *report)
 }
 
 void
-Music_iterator::substitute_outlet (Translator_group*f, Translator_group *t)
+Music_iterator::substitute_outlet (Context *f, Context *t)
 {
   if (get_outlet () == f)
     set_translator (t);
@@ -132,7 +133,7 @@ Music_iterator::substitute_outlet (Translator_group*f, Translator_group *t)
 }
 
 void
-Music_iterator::derived_substitute (Translator_group*,Translator_group*)
+Music_iterator::derived_substitute (Context *,Context *)
 {
 }
 
@@ -149,7 +150,7 @@ Music_iterator::get_iterator (Music *m) const
 }
 
 /*
-  TODO: rename to prevent confusion between Translator::try_music and
+  TODO: rename to prevent confusion between Context::try_music and
   Iterator::try_music
   
  */
@@ -180,8 +181,8 @@ Music_iterator::get_music () const
 /****************************************************************/
 
 IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?");
-IMPLEMENT_SMOBS(Music_iterator);
-IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator);
+IMPLEMENT_SMOBS (Music_iterator);
+IMPLEMENT_DEFAULT_EQUAL_P (Music_iterator);
 
 SCM
 Music_iterator::mark_smob (SCM smob)
@@ -194,9 +195,9 @@ Music_iterator::mark_smob (SCM smob)
     only, we _must_ mark them.
    */
   if (mus->get_outlet ())
-    scm_gc_mark (mus->get_outlet ()->self_scm());
+    scm_gc_mark (mus->get_outlet ()->self_scm ());
   if (mus->music_)
-    scm_gc_mark (mus->music_->self_scm());
+    scm_gc_mark (mus->music_->self_scm ());
   
 
   return SCM_EOL;
@@ -214,7 +215,7 @@ Music_iterator::print_smob (SCM sm , SCM port, scm_print_state*)
 }
 
 void
-Music_iterator::derived_mark()const
+Music_iterator::derived_mark ()const
 {
 }
 
@@ -226,7 +227,7 @@ Music_iterator::quit ()
 }
 
 void
-Music_iterator::do_quit()
+Music_iterator::do_quit ()
 {
 }
 
@@ -235,3 +236,27 @@ Music_iterator::run_always ()const
 {
   return false;
 }
+
+
+bool
+is_child_context (Context *me, Context *child)
+{
+  while (child && child != me)
+    {
+      child = child->get_parent_context ();
+    }
+  
+  return child == me;
+}
+
+/*
+  move to context of child iterator if it is deeper down in the
+  hierarchy.
+  */
+void
+Music_iterator::descend_to_child (Context * child_report)
+{
+  Context * me_report = get_outlet ();
+  if (is_child_context (me_report, child_report))
+    set_translator (child_report);
+}