From 01710d68d8d642533fb3f72414ad0d0bc567c905 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 21 Aug 2013 04:04:02 +0200 Subject: [PATCH] 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. --- lily/quote-iterator.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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"); -- 2.39.5