From 206d238e0eca2c2253344acf04f1484897a1a87b Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Tue, 21 Jul 2015 12:02:56 +0200 Subject: [PATCH] Revert "Issue 4505: Add partial \override and \set commands" This reverts commit 47ce0f0eb601fd3d8fd38e9782e74e21c8b76205. --- lily/include/lily-imports.hh | 2 -- lily/lily-imports.cc | 2 -- lily/parser.yy | 16 ---------------- 3 files changed, 20 deletions(-) diff --git a/lily/include/lily-imports.hh b/lily/include/lily-imports.hh index 0887c22441..383896a021 100644 --- a/lily/include/lily-imports.hh +++ b/lily/include/lily-imports.hh @@ -87,8 +87,6 @@ namespace Lily { #endif extern Variable f_parser; extern Variable percussion_p; - extern Variable property_override; - extern Variable property_set; extern Variable pure_chain_offset_callback; extern Variable remove_stencil_warnings; extern Variable scale_layout; diff --git a/lily/lily-imports.cc b/lily/lily-imports.cc index 3d95c8c828..3a694f9d10 100644 --- a/lily/lily-imports.cc +++ b/lily/lily-imports.cc @@ -81,8 +81,6 @@ namespace Lily { #endif Variable f_parser ("%parser"); Variable percussion_p ("percussion?"); - Variable property_override ("propertyOverride"); - Variable property_set ("propertySet"); Variable pure_chain_offset_callback ("pure-chain-offset-callback"); Variable remove_stencil_warnings ("remove-stencil-warnings"); Variable scale_layout ("scale-layout"); diff --git a/lily/parser.yy b/lily/parser.yy index 23c024e9b7..48ada37566 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -717,14 +717,6 @@ partial_function: { $$ = scm_acons ($1, $2, SCM_EOL); } - | OVERRIDE grob_prop_path '=' - { - $$ = scm_acons (Lily::property_override, scm_list_1 ($2), SCM_EOL); - } - | SET context_prop_spec '=' - { - $$ = scm_acons (Lily::property_set, scm_list_1 ($2), SCM_EOL); - } | MUSIC_FUNCTION EXPECT_SCM function_arglist_optional partial_function { $$ = scm_acons ($1, $3, $4); @@ -737,14 +729,6 @@ partial_function: { $$ = scm_acons ($1, $3, $4); } - | OVERRIDE grob_prop_path '=' partial_function - { - $$ = scm_acons (Lily::property_override, scm_list_1 ($2), $4); - } - | SET context_prop_spec '=' partial_function - { - $$ = scm_acons (Lily::property_set, scm_list_1 ($2), $4); - } | MUSIC_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function { $$ = scm_acons ($1, $4, $5); -- 2.39.2