Ensure clearance between Dots and Flags; issue 1230

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index c4806d741c3b6021ec4d46864958ed8ae31a148b..ba6650acd08cab4b30aa3256384394aa7d5c4386 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2,7 +2,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -1277,7 +1277,7 @@ function_arglist_skip:
        {
                $$ = scm_cons ($1, $3);
        } %prec FUNCTION_ARGLIST
-       | EXPECT_SCM EXPECT_DURATION function_arglist_skip
+       | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip
        {
                $$ = scm_cons ($1, $3);
        } %prec FUNCTION_ARGLIST
@@ -2940,10 +2940,10 @@ number_factor:
 bare_number:
        bare_number_closed
        | UNSIGNED NUMBER_IDENTIFIER    {
-               $$ = scm_product ($1, $2)
+               $$ = scm_product ($1, $2);
        }
        | REAL NUMBER_IDENTIFIER        {
-               $$ = scm_product ($1, $2)
+               $$ = scm_product ($1, $2);
        }
        ;