Use scalar instead of embedded_scm for context mod overrides.

This allows for more flexible \override syntax in \context blocks, e.g.,

\override Foo #'bar = \markup { baz }

iso

\override Foo #'bar = #(markup "baz")

diff --git a/lily/parser.yy b/lily/parser.yy
index d93a1767e1502e294dd48abe215496e48fb8531a..48117a3a091a4fc9264b1c493066f06ebebd1d3a 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1277,7 +1277,7 @@ property_operation:
                $$ = scm_list_2 (ly_symbol2scm ("unset"),
                        scm_string_to_symbol ($2));
        }
-       | OVERRIDE simple_string property_path '=' embedded_scm {
+       | OVERRIDE simple_string property_path '=' scalar {
                $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
                                                        scm_string_to_symbol ($2), $5),
                                             $3));