Issue 2530: Use fractions rather than Scheme pairs for \scaleDuration, timeSignatureF...

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c2d8b6baeff1273520aa7a68eb32492ad286ec3e..bdbf1283141e643d28d2216b381cddd5184586a9 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -711,6 +711,11 @@ BOM_UTF8   \357\273\277
        }
 }
 
+{FRACTION}     {
+       yylval.scm =  scan_fraction (YYText ());
+       return FRACTION;
+}
+
 -{UNSIGNED}    | // backup rule
 {REAL}         {
        yylval.scm = scm_c_read_string (YYText ());
@@ -721,6 +726,7 @@ BOM_UTF8    \357\273\277
        return REAL;
 }
 
+{UNSIGNED}/\/  | // backup rule
 {UNSIGNED}     {
        yylval.scm = scm_c_read_string (YYText ());
        return UNSIGNED;
@@ -890,9 +896,9 @@ Lily_lexer::scan_scm_id (SCM sid)
        {
                int funtype = SCM_FUNCTION;
 
-               yylval.scm = get_music_function_transform (sid);
+               yylval.scm = sid;
 
-               SCM s = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature"));
+               SCM s = get_music_function_signature (sid);
                SCM cs = scm_car (s);
 
                if (scm_is_pair (cs))