* scripts/abc2ly.py (dump_slyrics): add ord().

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

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index dc4992e36c94517bead13de2e0761b7a0521ed1a..c5d917a330033807abd043ffc824eeed35f626b4 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -25,16 +25,22 @@ Context_specced_music_iterator::construct_children ()
 
   String c_id;
   SCM ci = get_music ()->get_property ("context-id");
-  if (gh_string_p (ci))
+  if (scm_is_string (ci))
     c_id = ly_scm2string (ci);
   SCM ops = get_music ()->get_property ("property-operations");
   
   Context * a
     = get_outlet ()->find_create_context (ct, c_id, ops);
 
+  if (a
+      && to_boolean (get_music ()->get_property ("descend-only"))
+      && !is_child_context (get_outlet (), a))
+    a = 0;
+  
   if (a)
-    set_translator (a);
+    set_context (a);
 
   Music_wrapper_iterator::construct_children ();
 }
+
 IMPLEMENT_CTOR_CALLBACK (Context_specced_music_iterator);