patch::: 1.1.52.gp2

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 78815d1cd2af7aca5b5e289f379cc77e9e870d2d..5af4fb7ed8cebbde4307005d81bc6281f667b216 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -143,6 +143,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %token CADENZA
 %token CHORDMODIFIERS
 %token CHORDS
+%token HYPHEN
 %token CLEF
 %token CM_T
 %token CONSISTS
@@ -253,6 +254,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <request>        post_request 
 %type <request> command_req verbose_command_req
 %type <request>        extender_req
+%type <request> hyphen_req
 %type <string> string
 %type <score>  score_block score_body
 %type <intarr> shape_array
@@ -910,6 +912,9 @@ abbrev_command_req:
        extender_req {
                $$ = $1;
        }
+       | hyphen_req {
+               $$ = $1;
+       }
        | '|'                           {
                $$ = new Barcheck_req;
        }
@@ -1175,6 +1180,14 @@ extender_req:
        }
        ;
 
+hyphen_req:
+       HYPHEN {
+               if (!THIS->lexer_p_->lyric_state_b ())
+                       THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+               $$ = new Hyphen_req;
+       }
+       ;
+
 close_request:
        close_request_parens {
                $$ = $1;