Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 97ada533fef7c0512e13e2d7e083d65846107ec3..22a45b279786e62e8fc0d5156d4b5647634fcc2e 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -46,7 +46,7 @@
 %lex-param {Lily_parser *parser}
 
 /* We use SCMs to do strings, because it saves us the trouble of
-deleting them.  Let's hope that a stack overflow doesnt trigger a move
+deleting them.  Let's hope that a stack overflow doesn't trigger a move
 of the parse stack onto the heap. */
 
 %left PREC_BOT
@@ -2149,8 +2149,10 @@ chord_body_element:
        {
                Music *m = unsmob_music ($1);
 
-               while (m && m->is_mus_type ("music-wrapper-music"))
-                       m = unsmob_music (m->get_property ("element"));
+               while (m && m->is_mus_type ("music-wrapper-music")) {
+                       $$ = m->get_property ("element");
+                       m = unsmob_music ($$);
+               }
 
                if (!(m && m->is_mus_type ("rhythmic-event"))) {
                        parser->parser_error (@$, _ ("not a rhythmic event"));