* flower/include/axis.hh: rename from axes.hh

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 8cf6b01a4008d769030dec029ae3a331aea4b914..9afd1e5be4f0cc2b8332fec6998bf84db1359e2c 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -43,7 +43,7 @@ FIXME:
 #include "scm-hash.hh"
 #include "scm-option.hh"
 #include "score.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "warn.hh"
 
 #define MY_MAKE_MUSIC(x)  make_music_by_name (ly_symbol2scm (x))
@@ -199,7 +199,7 @@ make_music_relative (Pitch start, Music *music)
 Music*
 make_lyric_combine_music (SCM name, Music *music)
 {
-       Music *combine = MY_MAKE_MUSIC ("NewLyricCombineMusic");
+       Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
        combine->set_property ("element", music->self_scm ());
        combine->set_property ("associated-context", name);
        return combine;
@@ -792,7 +792,7 @@ score_body:
                $$->set_spot (@$);
        }
        | SCORE_IDENTIFIER {
-               $$ = new Score ( *unsmob_score ($1));
+               $$ = unsmob_score ($1);
                $$->set_spot (@$);
        }
        | score_body object_id_setting {