Issue 4630/1: Add location info override to some music expressions

This gives location information for #{ ... #} to music function callers
instead of the music function body.

diff --git a/lily/parser.yy b/lily/parser.yy
index a166aee8e538f87b5ac002ffec5f6b95e72f9cc2..ad10401441d8b6c5ca31e12db22bcfae45b938c8 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2811,8 +2811,8 @@ note_chord_element:
                  unsmob<Music> (scm_car (s))->set_property ("duration", dur);
                es = ly_append2 (es, postevs);
 
-               m-> set_property ("elements", es);
-               m->set_spot (@$);
+               m->set_property ("elements", es);
+               m->set_spot (parser->lexer_->override_input (@$));
                $$ = m->self_scm ();
        } %prec ':'
        ;
@@ -2919,7 +2919,7 @@ post_events:
                                        $$ = scm_cons (scm_car (p), $$);
                                }
                        } else {
-                               m->set_spot (@2);
+                               m->set_spot (parser->lexer_->override_input (@2));
                                $$ = scm_cons ($2, $$);
                        }
                }