From 8a0f3928518202c8fbdc0e06f12e3eb2b28b0456 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Wed, 24 Feb 2010 20:31:42 +0000 Subject: [PATCH] Improve handling of nested overrides using list syntax. * allow nested overrides using lists inside \context blocks. --- lily/context-property.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lily/context-property.cc b/lily/context-property.cc index eb05a1e9aa..7f09f0b94a 100644 --- a/lily/context-property.cc +++ b/lily/context-property.cc @@ -45,7 +45,7 @@ general_pushpop_property (Context *context, } sloppy_general_pushpop_property (context, context_property, - grob_property_path, new_value); + grob_property_path, new_value); } @@ -92,6 +92,13 @@ execute_override_property (Context *context, SCM target_alist = scm_car (current_context_val); + /* + If the car is a list, the property path comes from a nested override + using list syntax inside a \context block + */ + if (scm_is_pair (scm_car (grob_property_path))) + grob_property_path = scm_car (grob_property_path); + SCM symbol = scm_car (grob_property_path); if (scm_is_pair (scm_cdr (grob_property_path))) { -- 2.39.5