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

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index d830cb4c57db08c9acf4e32aafbf03b234d4b587..49acd012d51ca0820db2b8cdf3a613aedbdcf901 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -459,6 +459,8 @@ If we give names, Bison complains.
 %type <scm> context_def_spec_block
 %type <scm> context_def_spec_body
 %type <scm> context_mod
+%type <scm> context_mod_arg
+%type <scm> context_mod_embedded
 %type <scm> context_mod_list
 %type <scm> context_prop_spec
 %type <scm> direction_less_char
@@ -784,6 +786,9 @@ identifier_init:
        | number_expression {
                $$ = $1;
        }
+       | FRACTION {
+               $$ = $1;
+       }
        | string {
                $$ = $1;
        }
@@ -808,6 +813,27 @@ context_def_spec_block:
        }
        ;
 
+context_mod_arg:
+       embedded_scm
+       | composite_music
+       ;
+
+context_mod_embedded:
+       context_mod_arg
+       {
+               if (unsmob_music ($1)) {
+                       SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
+                       $1 = scm_call_2 (proc, parser->self_scm (), $1);
+               }
+               if (unsmob_context_mod ($1))
+                       $$ = $1;
+               else {
+                       parser->parser_error (@1, _ ("not a context mod"));
+               }
+       }
+       ;
+
+
 context_def_spec_body:
        /**/ {
                $$ = Context_def::make_scm ();
@@ -817,18 +843,6 @@ context_def_spec_body:
                $$ = $1;
                unsmob_context_def ($$)->origin ()->set_spot (@$);
        }
-       | context_def_spec_body embedded_scm {
-               if (Context_mod *cm = unsmob_context_mod ($2)) {
-                       SCM p = cm->get_mods ();
-                       Context_def*td = unsmob_context_def ($$);
-
-                       for (; scm_is_pair (p); p = scm_cdr (p)) {
-                               td->add_context_mod (scm_car (p));
-                       }
-               } else {
-                       parser->parser_error (@2, _ ("not a context mod"));
-               }
-       }
        | context_def_spec_body context_mod {
                unsmob_context_def ($$)->add_context_mod ($2);
        }
@@ -839,6 +853,13 @@ context_def_spec_body:
                     td->add_context_mod (scm_car (m));
                 }
        }
+       | context_def_spec_body context_mod_embedded {
+                Context_def *td = unsmob_context_def ($$);
+                SCM new_mods = unsmob_context_mod ($2)->get_mods ();
+                for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
+                    td->add_context_mod (scm_car (m));
+                }
+       }
        ;
 
 
@@ -864,8 +885,6 @@ book_body:
                push_paper (parser, $$->paper_);
                $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader");
                parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
-               parser->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F);
-               parser->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F);
        }
        | BOOK_IDENTIFIER {
                $$ = unsmob_book ($1);
@@ -1082,6 +1101,10 @@ output_def_body:
        | output_def_body context_def_spec_block        {
                assign_context_def ($$, $2);
        }
+       | output_def_body music_arg {
+               SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler");
+               scm_call_3 (proc, parser->self_scm (), $1->self_scm (), $2);
+       }
        | output_def_body error {
 
        }
@@ -1234,12 +1257,9 @@ context_mod_list:
                  if (md)
                      unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
         }
-       | context_mod_list embedded_scm {
-               Context_mod *md = unsmob_context_mod ($2);
-               if (md)
-                       unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
-               else
-                       parser->parser_error (@2, _ ("not a context mod"));
+       | context_mod_list context_mod_embedded {
+               unsmob_context_mod ($1)->add_context_mods
+                       (unsmob_context_mod ($2)->get_mods ());
         }
         ;
 
@@ -1952,16 +1972,19 @@ context_mod:
        | context_def_mod STRING {
                $$ = scm_list_2 ($1, $2);
        }
-       | context_def_mod embedded_scm {
-          if (ly_symbol2scm ("consists") != $1)
-          {
-            $$ = SCM_EOL;
-             parser->parser_error (@1, _ ("only \\consists takes non-string argument."));
-          }
-          else
-          {
-            $$ = scm_list_2 ($1, $2);
-          }
+       | context_def_mod embedded_scm
+       {
+               if (!scm_is_string ($2)
+                   && ly_symbol2scm ("consists") != $1
+                   && ly_symbol2scm ("remove") != $1)
+               {
+                       $$ = SCM_EOL;
+                       parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument."));
+               }
+               else
+               {
+                       $$ = scm_list_2 ($1, $2);
+               }
        }
        ;
 
@@ -2040,12 +2063,14 @@ simple_string: STRING {
 scalar:
        embedded_scm_arg
        | bare_number
+       | FRACTION
        | lyric_element
        ;
 
 scalar_closed:
        embedded_scm_arg_closed
        | bare_number
+       | FRACTION
        | lyric_element
        ;