From: David Kastrup <dak@gnu.org>
Date: Wed, 21 Aug 2013 02:04:02 +0000 (+0200)
Subject: Issue 3489: Let \quoteDuring descend to bottom context for its output
X-Git-Tag: release/2.17.26-1~18^2~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=01710d68d8d642533fb3f72414ad0d0bc567c905;p=lilypond.git

Issue 3489: Let \quoteDuring descend to bottom context for its output

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.
---

diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index 86d01304a8..d35bb54b2c 100644
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -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");