release: 1.5.4

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 157988a735a93de8defb7457c8dcb245cd8dfc46..b9f4793d2c50450cad3c7c9bd15b1d567ff385f2 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -806,7 +806,7 @@ Composite_music:
                chm->set_spot (*$3->origin ());
        }
        | GRACE Music {
-#if 1
+#if 0
        /*
                The other version is for easier debugging  of
                Sequential_music_iterator in combination with grace notes.
@@ -1825,10 +1825,11 @@ chord_step:
                $$ = gh_cons ($1, SCM_EOL);
        }
        | CHORDMODIFIER_PITCH {
-               $$ = gh_cons ($1, SCM_EOL);
+               $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
        }
        | CHORDMODIFIER_PITCH chord_note { /* Ugh. */
-               $$ = gh_list ($1, $2, SCM_UNDEFINED);
+               $$ = gh_list (unsmob_pitch ($1)->smobbed_copy (),
+                       $2, SCM_UNDEFINED);
        }
        ;