Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1351)

Unified Diff: lily/parser.yy

Issue 582980043: Issue 5555: TimeScaledMusic should not be music-wrapper-music (Closed)
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scm/define-music-types.scm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lily/parser.yy
diff --git a/lily/parser.yy b/lily/parser.yy
index 9f113a5b98459c6e20aa0db117afab94c6d6d40f..8bb13f83c7a628f96b040e0e1b8ffec61d5a7350 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -4609,18 +4609,6 @@ add_post_events (Music *m, SCM events)
return false; // successfully added -- nothing
while (m) {
- if (m->is_mus_type ("music-wrapper-music")) {
- m = unsmob<Music> (m->get_property ("element"));
- continue;
- }
- if (m->is_mus_type ("sequential-music")) {
- SCM lp = scm_last_pair (m->get_property ("elements"));
- if (scm_is_pair (lp)) {
- m = unsmob<Music> (scm_car (lp));
- continue;
- }
- return true;
- }
if (m->is_mus_type ("rhythmic-event")) {
m->set_property
("articulations",
@@ -4637,6 +4625,19 @@ add_post_events (Music *m, SCM events)
events)));
return false;
}
+ if (m->is_mus_type ("sequential-music")) {
+ SCM lp = scm_last_pair (m->get_property ("elements"));
+ if (scm_is_pair (lp)) {
+ m = unsmob<Music> (scm_car (lp));
+ continue;
+ }
+ return true;
+ }
+ if (m->is_mus_type ("music-wrapper-music")
+ || m->is_mus_type ("time-scaled-music")) {
+ m = unsmob<Music> (m->get_property ("element"));
+ continue;
+ }
break;
}
return true;
« no previous file with comments | « no previous file | scm/define-music-types.scm » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b