From: Neil Puttock <n.puttock@gmail.com>
Date: Mon, 23 Nov 2009 23:39:49 +0000 (+0000)
Subject: Use scalar instead of embedded_scm for context mod overrides.
X-Git-Tag: release/2.13.9-1~87
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c37fe44e5c029d84193bf61b3d7913aac72f0bcd;p=lilypond.git

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 d93a1767e1..48117a3a09 100644
--- 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));