XY-extent: more accurate docstring

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 0b64957bf8fe2b017e08d653b1dba1a3c1672cd1..1c8e527b4e46ae56d1a26b418edcb530a6021838 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2814,11 +2814,18 @@ direction_reqd_event:
        }
        | script_abbreviation {
                SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
-               Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
-               if (scm_is_string (s))
+               if (scm_is_string (s)) {
+                       Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
                        a->set_property ("articulation-type", s);
-               else parser->parser_error (@1, _ ("expecting string as script definition"));
-               $$ = a->unprotect ();
+                       $$ = a->unprotect ();
+               } else if (ly_prob_type_p (s, ly_symbol2scm ("ArticulationEvent"))) {
+                       $$ = s;
+                       if (Music *original = unsmob_music (s)) {
+                               Music *a = original->clone ();
+                               a->set_spot (parser->lexer_->override_input (@$));
+                               $$ = a->unprotect ();
+                       }
+               } else parser->parser_error (@1, _ ("expecting string or ArticulationEvent as script definition"));
        }
        ;
 
@@ -3321,10 +3328,10 @@ step_number:
        ;
 
 tempo_range:
-       UNSIGNED {
+       unsigned_number {
                $$ = $1;
-       }
-       | UNSIGNED '-' UNSIGNED {
+       } %prec ':'
+       | unsigned_number '-' unsigned_number {
                $$ = scm_cons ($1, $3);
        }
        ;
@@ -3393,6 +3400,23 @@ bare_number_closed:
 unsigned_number:
        UNSIGNED
        | NUMBER_IDENTIFIER
+       {
+               if (!scm_is_integer ($1)
+                   || scm_is_true (scm_negative_p ($1)))
+               {
+                       parser->parser_error (@1, _("not an unsigned integer"));
+                       $$ = SCM_INUM0;
+               }
+       }
+       | embedded_scm
+       {
+               if (!scm_is_integer ($1)
+                   || scm_is_true (scm_negative_p ($1)))
+               {
+                       parser->parser_error (@1, _("not an unsigned integer"));
+                       $$ = SCM_INUM0;
+               }
+       }
        ;
 
 exclamations: