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

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index b771f9bb4b60be1eae88c8c7c63b364ad0b640cb..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;
@@ -424,7 +424,6 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <book> book_block
 %type <book> book_body
 
-%type <i> bare_int
 %type <i> bare_unsigned
 %type <i> bass_mod
 %type <i> dots
@@ -793,7 +792,7 @@ score_body:
                $$->set_spot (@$);
        }
        | SCORE_IDENTIFIER {
-               $$ = new Score ( *unsmob_score ($1));
+               $$ = unsmob_score ($1);
                $$->set_spot (@$);
        }
        | score_body object_id_setting {
@@ -1520,8 +1519,17 @@ scalar: string {
        | LYRICS_STRING {
                $$ = $1;
        }
-        | bare_int {
-               $$ = scm_int2num ($1);
+       | bare_number {
+               $$ = $1;
+/*             if (scm_integer_p ($1) == SCM_BOOL_T)
+               {
+                       int k = scm_to_int (scm_inexact_to_exact ($1));
+                       $$ = k;
+               } else
+               {
+                       THIS->parser_error (@1, _ ("need integer number arg"));
+                       $$ = 0;
+               }*/
        }
         | embedded_scm {
                $$ = $1;
@@ -2485,23 +2493,6 @@ bare_unsigned:
        }
        ;
 
-bare_int:
-       bare_number {
-               if (scm_integer_p ($1) == SCM_BOOL_T)
-               {
-                       int k = scm_to_int ($1);
-                       $$ = k;
-               } else
-               {
-                       THIS->parser_error (@1, _ ("need integer number arg"));
-                       $$ = 0;
-               }
-       }
-       | '-' bare_int {
-               $$ = -$2;
-       }
-       ;
-
 exclamations:
                { $$ = 0; }
        | exclamations '!'      { $$ ++; }