]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3489: Let \quoteDuring descend to bottom context for its output
authorDavid Kastrup <dak@gnu.org>
Wed, 21 Aug 2013 02:04:02 +0000 (04:04 +0200)
committerDavid Kastrup <dak@gnu.org>
Tue, 27 Aug 2013 09:07:01 +0000 (11:07 +0200)
Also regularizes interpretation of quoted-context-id.  This patch by
itself does not resolve the issue since a CueContext is created in
any case, serving as Bottom and Voice context.  A followup patch
fixes that.

lily/quote-iterator.cc

index 86d01304a878f28f8ffb1ad27658b3645b84a2b7..d35bb54b2c9d336cf668b60c0e42e0583e5a7f34 100644 (file)
@@ -128,15 +128,16 @@ Quote_iterator::construct_children ()
   SCM name = get_music ()->get_property ("quoted-context-type");
   SCM id = get_music ()->get_property ("quoted-context-id");
 
-  if (scm_is_string (id)
-      && scm_is_symbol (name))
+  if (scm_is_symbol (name))
     {
-      Context *cue_context = get_outlet ()->find_create_context (name,
-                                                                 ly_scm2string (id), SCM_EOL);
+      Context *cue_context =
+        get_outlet ()->find_create_context (name,
+                                            robust_scm2string (id, ""),
+                                            SCM_EOL);
       quote_outlet_.set_context (cue_context);
     }
   else
-    quote_outlet_.set_context (get_outlet ());
+    quote_outlet_.set_context (get_outlet ()->get_default_interpreter ());
 
   event_vector_ = get_music ()->get_property ("quoted-events");